[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <4ACBC24F.2040005@linux.vnet.ibm.com>
Date: Tue, 06 Oct 2009 17:18:55 -0500
From: Tyler Hicks <tyhicks@...ux.vnet.ibm.com>
To: Mimi Zohar <zohar@...ux.vnet.ibm.com>
CC: linux-kernel@...r.kernel.org, Eric Paris <eparis@...hat.com>,
Dustin Kirkland <kirkland@...onical.com>,
James Morris <jmorris@...ei.org>,
David Safford <safford@...son.ibm.com>, stable@...nel.org,
Mimi Zohar <zohar@...ibm.com>
Subject: Re: [PATCH] ima: ecryptfs fix imbalance message (updated)
On 10/05/2009 01:25 PM, Mimi Zohar wrote:
> The unencrypted files are being measured. Update the counters to get
> rid of the ecryptfs imbalance message. (http://bugzilla.redhat.com/519737)
>
> Reported-by: Sachin Garg
> Cc: stable@...nel.org
> Signed-off-by: Mimi Zohar <zohar@...ibm.com>
> ---
> fs/ecryptfs/main.c | 7 ++++++-
> 1 files changed, 6 insertions(+), 1 deletions(-)
>
> diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
> index 101fe4c..c6ac85d 100644
> --- a/fs/ecryptfs/main.c
> +++ b/fs/ecryptfs/main.c
> @@ -35,6 +35,7 @@
> #include <linux/key.h>
> #include <linux/parser.h>
> #include <linux/fs_stack.h>
> +#include <linux/ima.h>
> #include "ecryptfs_kernel.h"
>
> /**
> @@ -118,6 +119,7 @@ int ecryptfs_init_persistent_file(struct dentry *ecryptfs_dentry)
> const struct cred *cred = current_cred();
> struct ecryptfs_inode_info *inode_info =
> ecryptfs_inode_to_private(ecryptfs_dentry->d_inode);
> + int opened_lower_file = 0;
> int rc = 0;
>
> mutex_lock(&inode_info->lower_file_mutex);
> @@ -134,9 +136,12 @@ int ecryptfs_init_persistent_file(struct dentry *ecryptfs_dentry)
> "for lower_dentry [0x%p] and lower_mnt [0x%p]; "
> "rc = [%d]\n", lower_dentry, lower_mnt, rc);
> inode_info->lower_file = NULL;
> - }
> + } else
> + opened_lower_file = 1;
> }
> mutex_unlock(&inode_info->lower_file_mutex);
> + if (opened_lower_file)
> + ima_counts_get(inode_info->lower_file);
> return rc;
> }
>
Hi Mimi - Thanks for the updated patch!
Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6.git#next
Tyler
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists