lkml.org 
[lkml]   [2012]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH v3 02/12] vfs: move ima_file_free before releasing the file
From
On Wed, Mar 21, 2012 at 8:54 PM, Mimi Zohar <zohar@linux.vnet.ibm.com> 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@us.ibm.com>
> Acked-by: Serge Hallyn <serge.hallyn@ubuntu.com>

Acked-by: Dmitry Kasatkin <dmitry.kasatkin@intel.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 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@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2012-03-22 15:25    [W:0.309 / U:0.276 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site