]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'fixes-v5.12' into next-testing
authorJames Morris <jamorris@linux.microsoft.com>
Fri, 9 Apr 2021 01:39:45 +0000 (18:39 -0700)
committerJames Morris <jamorris@linux.microsoft.com>
Fri, 9 Apr 2021 01:39:45 +0000 (18:39 -0700)
1  2 
security/commoncap.c

index 1c519c87521765a0a474100a8b4309c44f44c3c5,2bdeacd32e3fc646962b6594056b5e7e0b5d0522..5cdeb73ca8fa91baf8742a6cce4b9c8f9d4f6488
@@@ -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;