From: Mimi Zohar <zohar@linux.vnet.ibm.com>
To: linux-security-module@vger.kernel.org
Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
David Safford <safford@linux.vnet.ibm.com>,
Dmitry Kasatkin <dmitry.kasatkin@intel.com>,
Mimi Zohar <zohar@us.ibm.com>
Subject: [PATCH v2 07/11] ima: add inode_post_setattr call
Date: Thu, 1 Mar 2012 14:10:44 -0500 [thread overview]
Message-ID: <1330629048-5933-8-git-send-email-zohar@linux.vnet.ibm.com> (raw)
In-Reply-To: <1330629048-5933-1-git-send-email-zohar@linux.vnet.ibm.com>
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>
---
fs/attr.c | 2 ++
include/linux/ima.h | 10 ++++++++++
2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/fs/attr.c b/fs/attr.c
index d9bd7fc..f496bac 100644
--- a/fs/attr.c
+++ b/fs/attr.c
@@ -14,6 +14,7 @@
#include <linux/fcntl.h>
#include <linux/security.h>
#include <linux/evm.h>
+#include <linux/ima.h>
/**
* inode_change_ok - check if attribute changes to an inode are allowed
@@ -245,6 +246,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/include/linux/ima.h b/include/linux/ima.h
index 6ac8e50..e2bfbb1 100644
--- a/include/linux/ima.h
+++ b/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 */
--
1.7.6.5
next prev parent reply other threads:[~2012-03-01 19:10 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-01 19:10 [PATCH v2 00/11] ima: appraisal extension Mimi Zohar
2012-03-01 19:10 ` [PATCH v2 01/11] vfs: extend vfs_removexattr locking Mimi Zohar
2012-03-01 19:10 ` [PATCH v2 02/11] vfs: move ima_file_free before releasing the file Mimi Zohar
2012-03-01 19:10 ` [PATCH v2 03/11] ima: integrity appraisal extension Mimi Zohar
2012-03-01 19:10 ` [PATCH v2 04/11] ima: add appraise action keywords and default rules Mimi Zohar
2012-03-01 19:10 ` [PATCH v2 05/11] ima: allocating iint improvements Mimi Zohar
2012-03-01 19:10 ` [PATCH v2 06/11] ima: replace iint spinlock with rwlock/read_lock Mimi Zohar
2012-03-01 19:10 ` Mimi Zohar [this message]
2012-03-01 19:10 ` [PATCH v2 08/11] ima: add ima_inode_setxattr/removexattr function and calls Mimi Zohar
2012-03-01 19:10 ` [PATCH v2 09/11] ima: delay calling __fput() Mimi Zohar
2012-03-01 19:10 ` [PATCH v2 10/11] ima: add support for different security.ima data types Mimi Zohar
2012-03-01 19:10 ` [PATCH v2 11/11] ima: digital signature verification support Mimi Zohar
2012-03-07 10:08 ` [PATCH v2 00/11] ima: appraisal extension James Morris
2012-03-07 20:44 ` George Wilson
2012-03-13 9:42 ` Ryan Ware
2012-03-13 10:03 ` Kasatkin, Dmitry
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1330629048-5933-8-git-send-email-zohar@linux.vnet.ibm.com \
--to=zohar@linux.vnet.ibm.com \
--cc=dmitry.kasatkin@intel.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=safford@linux.vnet.ibm.com \
--cc=zohar@us.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).