Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d9c73f6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of... 

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  SELinux: fix memory leakage in /security/selinux/hooks.c
parents 651b1f12 314dabb8

security/selinux/hooks.c

+2 −1
Original line number Diff line number Diff line
@@ -1285,6 +1285,8 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent 
		rc = inode->i_op->getxattr(dentry, XATTR_NAME_SELINUX,

					   context, len);

		if (rc == -ERANGE) {

			kfree(context);



			/* Need a larger buffer.  Query for the right size. */

			rc = inode->i_op->getxattr(dentry, XATTR_NAME_SELINUX,

						   NULL, 0);
@@ -1292,7 +1294,6 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent 
				dput(dentry);

				goto out_unlock;

			}

			kfree(context);

			len = rc;

			context = kmalloc(len+1, GFP_NOFS);

			if (!context) {