Tiger Yang
2011-Jun-02 06:04 UTC
[Ocfs2-devel] [PATCH 1/1] ocfs2: free memory allocated by inode_init_security
The LSM security_inode_init_security() hook allocates memory
for xattr name and value, expecting the caller to release
the memory afterwards.
reported-by: Mimi Zohar <zohar at linux.vnet.ibm.com>
Signed-off-by: Tiger Yang <tiger.yang at oracle.com>
---
fs/ocfs2/xattr.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
index 81ecf9c..fcd77a0 100644
--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
@@ -7185,12 +7185,11 @@ int ocfs2_init_security_and_acl(struct inode *dir,
{
int ret = 0;
struct buffer_head *dir_bh = NULL;
- struct ocfs2_security_xattr_info si = {
- .enable = 1,
- };
+ struct ocfs2_security_xattr_info si = {0, };
ret = ocfs2_init_security_get(inode, dir, qstr, &si);
if (!ret) {
+ si.enable = 1;
ret = ocfs2_xattr_set(inode, OCFS2_XATTR_INDEX_SECURITY,
si.name, si.value, si.value_len,
XATTR_CREATE);
@@ -7216,6 +7215,10 @@ int ocfs2_init_security_and_acl(struct inode *dir,
ocfs2_inode_unlock(dir, 0);
brelse(dir_bh);
leave:
+ if (si.enable) {
+ kfree(si.name);
+ kfree(si.value);
+ }
return ret;
}
/*
--
1.7.4.4
Mark Fasheh
2011-Jun-06 21:57 UTC
[Ocfs2-devel] [PATCH 1/1] ocfs2: free memory allocated by inode_init_security
On Thu, Jun 02, 2011 at 02:04:36PM +0800, Tiger Yang wrote:> The LSM security_inode_init_security() hook allocates memory > for xattr name and value, expecting the caller to release > the memory afterwards. > > reported-by: Mimi Zohar <zohar at linux.vnet.ibm.com> > Signed-off-by: Tiger Yang <tiger.yang at oracle.com>Signed-off-by: Mark Fasheh <mfasheh at suse.com> -- Mark Fasheh
Joel Becker
2011-Aug-22 04:26 UTC
[Ocfs2-devel] [PATCH 1/1] ocfs2: free memory allocated by inode_init_security
This patch is now in the fixes branch of ocfs2.git. Joel On Thu, Jun 02, 2011 at 02:04:36PM +0800, Tiger Yang wrote:> The LSM security_inode_init_security() hook allocates memory > for xattr name and value, expecting the caller to release > the memory afterwards. > > reported-by: Mimi Zohar <zohar at linux.vnet.ibm.com> > Signed-off-by: Tiger Yang <tiger.yang at oracle.com> > --- > fs/ocfs2/xattr.c | 9 ++++++--- > 1 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c > index 81ecf9c..fcd77a0 100644 > --- a/fs/ocfs2/xattr.c > +++ b/fs/ocfs2/xattr.c > @@ -7185,12 +7185,11 @@ int ocfs2_init_security_and_acl(struct inode *dir, > { > int ret = 0; > struct buffer_head *dir_bh = NULL; > - struct ocfs2_security_xattr_info si = { > - .enable = 1, > - }; > + struct ocfs2_security_xattr_info si = {0, }; > > ret = ocfs2_init_security_get(inode, dir, qstr, &si); > if (!ret) { > + si.enable = 1; > ret = ocfs2_xattr_set(inode, OCFS2_XATTR_INDEX_SECURITY, > si.name, si.value, si.value_len, > XATTR_CREATE); > @@ -7216,6 +7215,10 @@ int ocfs2_init_security_and_acl(struct inode *dir, > ocfs2_inode_unlock(dir, 0); > brelse(dir_bh); > leave: > + if (si.enable) { > + kfree(si.name); > + kfree(si.value); > + } > return ret; > } > /* > -- > 1.7.4.4 >-- "Practice random acts of kindness and senseless acts of beauty." Oh, and don't forget where your towel is. http://www.jlbec.org/ jlbec at evilplan.org