From: James Morris <jamorris@linux.microsoft.com>
Date: Fri, 9 Apr 2021 01:39:45 +0000 (-0700)
Subject: Merge branch 'fixes-v5.12' into next-testing
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=237f61b788d3cff546216f53cc7d8a296994b2f1;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'fixes-v5.12' into next-testing
---

237f61b788d3cff546216f53cc7d8a296994b2f1
diff --cc security/commoncap.c
index 1c519c8752176,2bdeacd32e3fc..5cdeb73ca8fa9
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@@ -396,11 -387,11 +396,11 @@@ int cap_inode_getsecurity(struct user_n
  		return -EINVAL;
  
  	size = sizeof(struct vfs_ns_cap_data);
 -	ret = (int) vfs_getxattr_alloc(dentry, XATTR_NAME_CAPS,
 -				 &tmpbuf, size, GFP_NOFS);
 +	ret = (int)vfs_getxattr_alloc(mnt_userns, dentry, XATTR_NAME_CAPS,
 +				      &tmpbuf, size, GFP_NOFS);
  	dput(dentry);
  
- 	if (ret < 0)
+ 	if (ret < 0 || !tmpbuf)
  		return ret;
  
  	fs_ns = inode->i_sb->s_user_ns;