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,
James Morris <jmorris@namei.org>,
David Safford <safford@watson.ibm.com>,
Mimi Zohar <zohar@us.ibm.com>
Subject: [PATCH v4 05/11] ima: move ima_file_free before releasing the file
Date: Mon, 28 Mar 2011 12:39:36 -0400 [thread overview]
Message-ID: <1301330382-17745-6-git-send-email-zohar@linux.vnet.ibm.com> (raw)
In-Reply-To: <1301330382-17745-1-git-send-email-zohar@linux.vnet.ibm.com>
Integrity appraisal measures files on file_free and stores the file
measurement as an xattr. Measure the file before releasing it.
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Acked-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---
fs/file_table.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/file_table.c b/fs/file_table.c
index 01e4c1e..33f54a1 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -243,10 +243,10 @@ static void __fput(struct file *file)
if (file->f_op && file->f_op->fasync)
file->f_op->fasync(-1, file, 0);
}
+ ima_file_free(file);
if (file->f_op && file->f_op->release)
file->f_op->release(inode, file);
security_file_free(file);
- ima_file_free(file);
if (unlikely(S_ISCHR(inode->i_mode) && inode->i_cdev != NULL &&
!(file->f_mode & FMODE_PATH))) {
cdev_put(inode->i_cdev);
--
1.7.3.4
next prev parent reply other threads:[~2011-03-28 16:41 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-28 16:39 [PATCH v4 00/11] EVM Mimi Zohar
2011-03-28 16:39 ` [PATCH v4 01/11] integrity: move ima inode integrity data management Mimi Zohar
2011-03-28 16:39 ` [PATCH v4 02/11] xattr: define vfs_getxattr_alloc and vfs_xattr_cmp Mimi Zohar
2011-03-28 16:39 ` [PATCH v4 03/11] evm: re-release Mimi Zohar
2011-03-28 16:39 ` [PATCH v4 04/11] evm: add support for different security.evm data types Mimi Zohar
2011-03-28 16:39 ` Mimi Zohar [this message]
2011-03-28 16:39 ` [PATCH v4 06/11] security: imbed evm calls in security hooks Mimi Zohar
2011-03-28 16:39 ` [PATCH v4 07/11] evm: inode post removexattr Mimi Zohar
2011-03-28 16:39 ` [PATCH v4 08/11] evm: imbed evm_inode_post_setattr Mimi Zohar
2011-03-28 16:39 ` [PATCH v4 09/11] evm: inode_post_init Mimi Zohar
2011-03-28 16:39 ` [PATCH v4 10/11] fs: add evm_inode_post_init calls Mimi Zohar
2011-03-28 16:39 ` [PATCH v4 11/11] evm: crypto hash replaced by shash 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=1301330382-17745-6-git-send-email-zohar@linux.vnet.ibm.com \
--to=zohar@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).