Re: [PATCH v3 02/12] vfs: move ima_file_free before releasing the file

[Kasatkin, Dmitry]

On Wed, Mar 21, 2012 at 8:54 PM, Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx> wrote:
> ima_file_free(), called on __fput(), currently flags files that have
> changed, so that the file is re-measured. ÂFor appraising a files's
> integrity, the file's hash must be re-calculated and stored in the
> 'security.ima' xattr to reflect any changes.
>
> This patch moves the ima_file_free() call to before releasing the file
> in preparation of ima-appraisal measuring the file and updating the
> 'security.ima' xattr.
>
> Signed-off-by: Mimi Zohar <zohar@xxxxxxxxxx>
> Acked-by: Serge Hallyn <serge.hallyn@xxxxxxxxxx>

Acked-by: Dmitry Kasatkin <dmitry.kasatkin@xxxxxxxxx>

> ---
> Â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 20002e3..554161a 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.6.5
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/