Commit 78a089d0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'lsm-pr-20221031' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm 

Pull LSM fix from Paul Moore:
 "A single patch to the capabilities code to fix a potential memory leak
  in the xattr allocation error handling"

* tag 'lsm-pr-20221031' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm:
  capabilities: fix potential memleak on error path from vfs_getxattr_alloc()
parents 30a0b95b 8cf0a1bc

security/commoncap.c

+4 −2
Original line number Diff line number Diff line
@@ -401,8 +401,10 @@ int cap_inode_getsecurity(struct user_namespace *mnt_userns, 
				      &tmpbuf, size, GFP_NOFS);

	dput(dentry);



	if (ret < 0 || !tmpbuf)

		return ret;

	if (ret < 0 || !tmpbuf) {

		size = ret;

		goto out_free;

	}



	fs_ns = inode->i_sb->s_user_ns;

	cap = (struct vfs_cap_data *) tmpbuf;