joel16/android_kernel_sony_msm8994_rework
1
0
Fork 0
mirror of https://github.com/joel16/android_kernel_sony_msm8994_rework.git synced 2024-11-28 06:10:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ima: add inode_post_setattr call

Browse Source 
Changing an inode's metadata may result in our not needing to appraise
the file.  In such cases, we must remove 'security.ima'.

Changelog v1:
- use ima_inode_post_setattr() stub function, if IMA_APPRAISE not configured

Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Acked-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
This commit is contained in:
Mimi Zohar 2011-03-09 22:57:53 -05:00
parent a10bf26b2f
commit 9957a5043e
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/attr.c
View File

@ -14,6 +14,7 @@
#include <linux/fcntl.h> #include <linux/fcntl.h>
#include <linux/security.h> #include <linux/security.h>
#include <linux/evm.h> #include <linux/evm.h>
#include <linux/ima.h>
/** /**
* inode_change_ok - check if attribute changes to an inode are allowed * inode_change_ok - check if attribute changes to an inode are allowed
@ -247,6 +248,7 @@ int notify_change(struct dentry * dentry, struct iattr * attr)
if (!error) { if (!error) {
fsnotify_change(dentry, ia_valid); fsnotify_change(dentry, ia_valid);
ima_inode_post_setattr(dentry);
evm_inode_post_setattr(dentry, ia_valid); evm_inode_post_setattr(dentry, ia_valid);
} }

10
include/linux/ima.h
View File

@ -39,5 +39,15 @@ static inline int ima_file_mmap(struct file *file, unsigned long prot)
{ {
return 0; return 0;
} }
#endif /* CONFIG_IMA_H */ #endif /* CONFIG_IMA_H */
#ifdef CONFIG_IMA_APPRAISE
extern void ima_inode_post_setattr(struct dentry *dentry);
#else
static inline void ima_inode_post_setattr(struct dentry *dentry)
{
return;
}
#endif /* CONFIG_IMA_APPRAISE_H */
#endif /* _LINUX_IMA_H */ #endif /* _LINUX_IMA_H */