linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mimi Zohar <zohar@linux.vnet.ibm.com>
To: linux-kernel@vger.kernel.org
Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>,
	linux-security-module@vger.kernel.org,
	linux-fsdevel@vger.kernel.org, James Morris <jmorris@namei.org>,
	David Safford <safford@watson.ibm.com>,
	Dave Hansen <dave@linux.vnet.ibm.com>,
	Mimi Zohar <zohar@us.ibm.com>
Subject: [PATCH 13/15] ima: inode post_setattr
Date: Thu, 24 Jun 2010 14:10:29 -0400	[thread overview]
Message-ID: <1277403031-3080-14-git-send-email-zohar@linux.vnet.ibm.com> (raw)
In-Reply-To: <1277403031-3080-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'.

Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Acked-by: Serge Hallyn <serue@us.ibm.com>
---
 fs/attr.c           |    2 ++
 include/linux/ima.h |    6 ++++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/fs/attr.c b/fs/attr.c
index 9293710..f410bde 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>
 
 /* Taken over from the old code... */
 
@@ -251,6 +252,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 4dce900..ce82e29 100644
--- a/include/linux/ima.h
+++ b/include/linux/ima.h
@@ -19,6 +19,7 @@ extern int ima_file_check(struct file *file, int mask);
 extern void ima_file_free(struct file *file);
 extern int ima_file_mmap(struct file *file, unsigned long prot);
 extern void ima_counts_get(struct file *file);
+extern void ima_inode_post_setattr(struct dentry *dentry);
 
 #else
 static inline int ima_bprm_check(struct linux_binprm *bprm)
@@ -46,5 +47,10 @@ static inline void ima_counts_get(struct file *file)
 	return;
 }
 
+static inline void ima_inode_post_setattr(struct dentry *dentry)
+{
+	return;
+}
+
 #endif /* CONFIG_IMA_H */
 #endif /* _LINUX_IMA_H */
-- 
1.6.6.1


  parent reply	other threads:[~2010-06-24 18:10 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-24 18:10 [PATCH 00/15] EVM Mimi Zohar
2010-06-24 18:10 ` [PATCH 01/15] integrity: move ima inode integrity data management Mimi Zohar
2010-06-24 18:10 ` [PATCH 02/15] security: move LSM xattrnames to xattr.h Mimi Zohar
2010-06-25  3:49   ` Casey Schaufler
2010-06-25 11:15     ` Mimi Zohar
2010-06-27 16:54       ` Casey Schaufler
2010-06-28  1:35         ` Mimi Zohar
2010-06-24 18:10 ` [PATCH 03/15] xattr: define vfs_getxattr_alloc and vfs_xattr_cmp Mimi Zohar
2010-06-24 18:10 ` [PATCH 04/15] evm: re-release Mimi Zohar
2010-06-24 18:10 ` [PATCH 05/15] ima: move ima_file_free before releasing the file Mimi Zohar
2010-06-24 18:10 ` [PATCH 06/15] security: imbed evm calls in security hooks Mimi Zohar
2010-06-24 18:10 ` [PATCH 07/15] evm: inode post removexattr Mimi Zohar
2010-06-24 18:10 ` [PATCH 08/15] evm: imbed evm_inode_post_setattr Mimi Zohar
2010-06-24 18:10 ` [PATCH 09/15] evm: inode_post_init Mimi Zohar
2010-06-24 18:10 ` [PATCH 10/15] fs: add evm_inode_post_init calls Mimi Zohar
2010-06-24 18:10 ` [PATCH 11/15] ima: integrity appraisal extension Mimi Zohar
2010-06-24 18:10 ` [PATCH 12/15] ima: appraise default rules Mimi Zohar
2010-06-24 18:10 ` Mimi Zohar [this message]
2010-06-24 18:10 ` [PATCH 14/15] ima: add ima_inode_setxattr and ima_inode_removexattr Mimi Zohar
2010-06-24 18:10 ` [PATCH 15/15] ima: appraise measurement required Mimi Zohar

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=1277403031-3080-14-git-send-email-zohar@linux.vnet.ibm.com \
    --to=zohar@linux.vnet.ibm.com \
    --cc=dave@linux.vnet.ibm.com \
    --cc=jmorris@namei.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=safford@watson.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).