diff --git a/[refs] b/[refs] index 766ebd0e3da7..97af140618cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a10bf26b2f53242836e9362c6c9c857b627b82a9 +refs/heads/master: 9957a5043e7b0b7361cdf48eea22b2900293e63a diff --git a/trunk/fs/attr.c b/trunk/fs/attr.c index 29e38a1f7f77..cce7df53b694 100644 --- a/trunk/fs/attr.c +++ b/trunk/fs/attr.c @@ -14,6 +14,7 @@ #include #include #include +#include /** * 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) { fsnotify_change(dentry, ia_valid); + ima_inode_post_setattr(dentry); evm_inode_post_setattr(dentry, ia_valid); } diff --git a/trunk/include/linux/ima.h b/trunk/include/linux/ima.h index 6ac8e50c6cf5..e2bfbb1e9af6 100644 --- a/trunk/include/linux/ima.h +++ b/trunk/include/linux/ima.h @@ -39,5 +39,15 @@ static inline int ima_file_mmap(struct file *file, unsigned long prot) { return 0; } + #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 */