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 v3 04/15] ima: move ima_file_free before releasing the file
Date: Fri, 30 Jul 2010 11:45:35 -0400	[thread overview]
Message-ID: <1280504746-20256-5-git-send-email-zohar@linux.vnet.ibm.com> (raw)
In-Reply-To: <1280504746-20256-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 <serue@us.ibm.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 5c7d10e..6bcb299 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -241,10 +241,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))
 		cdev_put(inode->i_cdev);
 	fops_put(file->f_op);
-- 
1.7.1.1

  parent reply	other threads:[~2010-07-30 15:45 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-30 15:45 [PATCH v3 00/15] EVM Mimi Zohar
2010-07-30 15:45 ` [PATCH v3 01/15] integrity: move ima inode integrity data management Mimi Zohar
2010-07-30 15:45 ` [PATCH v3 02/15] xattr: define vfs_getxattr_alloc and vfs_xattr_cmp Mimi Zohar
2010-07-30 15:45 ` [PATCH v3 03/15] evm: re-release Mimi Zohar
2010-07-30 15:45 ` Mimi Zohar [this message]
2010-07-30 15:45 ` [PATCH v3 05/15] security: imbed evm calls in security hooks Mimi Zohar
2010-07-30 15:45 ` [PATCH v3 06/15] evm: inode post removexattr Mimi Zohar
2010-07-30 15:45 ` [PATCH v3 07/15] evm: imbed evm_inode_post_setattr Mimi Zohar
2010-07-30 15:45 ` [PATCH v3 08/15] evm: inode_post_init Mimi Zohar
2010-07-30 15:45 ` [PATCH v3 09/15] fs: add evm_inode_post_init calls Mimi Zohar
2010-07-30 15:45 ` [PATCH v3 10/15] ima: integrity appraisal extension Mimi Zohar
2010-07-30 15:45 ` [PATCH v3 11/15] ima: appraise default rules Mimi Zohar
2010-07-30 15:45 ` [PATCH v3 12/15] ima: inode post_setattr Mimi Zohar
2010-07-30 15:45 ` [PATCH v3 13/15] ima: add ima_inode_setxattr and ima_inode_removexattr Mimi Zohar
2010-07-30 15:45 ` [PATCH v3 14/15] ima: appraise measurement required Mimi Zohar
2010-07-30 15:45 ` [PATCH v3 15/15] ima: extend policy language to support owner 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=1280504746-20256-5-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).