public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
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,
	Al Viro <viro@ZenIV.linux.org.uk>,
	David Safford <safford@linux.vnet.ibm.com>,
	Dmitry Kasatkin <dmitry.kasatkin@intel.com>,
	Mimi Zohar <zohar@us.ibm.com>
Subject: [PATCH v4 08/12] ima: add inode_post_setattr call
Date: Thu, 29 Mar 2012 10:41:36 -0400	[thread overview]
Message-ID: <1333032100-4159-9-git-send-email-zohar@linux.vnet.ibm.com> (raw)
In-Reply-To: <1333032100-4159-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>
Acked-by: Dmitry Kasatkin <dmitry.kasatkin@intel.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


  parent reply	other threads:[~2012-03-29 14:44 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-29 14:41 [PATCH v4 00/12] ima: appraisal extension Mimi Zohar
2012-03-29 14:41 ` [PATCH v4 01/12] vfs: extend vfs_removexattr locking Mimi Zohar
2012-03-29 14:41 ` [PATCH v4 02/12] vfs: move ima_file_free before releasing the file Mimi Zohar
2012-03-29 14:41 ` [PATCH v4 03/12] ima: free securityfs violations file Mimi Zohar
2012-03-29 14:41 ` [PATCH v4 04/12] ima: integrity appraisal extension Mimi Zohar
2012-04-02  7:20   ` Kasatkin, Dmitry
2012-04-02 11:18     ` Mimi Zohar
2012-03-29 14:41 ` [PATCH v4 05/12] ima: add appraise action keywords and default rules Mimi Zohar
2012-03-29 14:41 ` [PATCH v4 06/12] ima: allocating iint improvements Mimi Zohar
2012-03-29 14:41 ` [PATCH v4 07/12] ima: replace iint spinlock with rwlock/read_lock Mimi Zohar
2012-03-29 14:41 ` Mimi Zohar [this message]
2012-03-29 14:41 ` [PATCH v4 09/12] ima: add ima_inode_setxattr/removexattr function and calls Mimi Zohar
2012-03-29 14:41 ` [PATCH v4 10/12] ima: defer calling __fput() Mimi Zohar
2012-04-04  8:52   ` Kasatkin, Dmitry
2012-03-29 14:41 ` [PATCH v4 11/12] ima: add support for different security.ima data types Mimi Zohar
2012-03-29 14:41 ` [PATCH v4 12/12] ima: digital signature verification support 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=1333032100-4159-9-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=viro@ZenIV.linux.org.uk \
    --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