]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
userns: Fix posix_acl_file_xattr_userns gid conversion
authorEric W. Biederman <ebiederm@xmission.com>
Tue, 9 Oct 2012 22:11:55 +0000 (15:11 -0700)
committerEric W. Biederman <ebiederm@xmission.com>
Fri, 12 Oct 2012 20:16:48 +0000 (13:16 -0700)
The code needs to be from_kgid(make_kgid(...)...) not
from_kuid(make_kgid(...)...). Doh!

Reported-by: Jan Kara <jack@suse.cz>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
fs/xattr_acl.c

index 11efd830b5f5e4c078279846f335d1560eb35487..9fbea87fdb6ef268209652101ff0fd3094424aa9 100644 (file)
@@ -45,7 +45,7 @@ static void posix_acl_fix_xattr_userns(
                        break;
                case ACL_GROUP:
                        gid = make_kgid(from, le32_to_cpu(entry->e_id));
-                       entry->e_id = cpu_to_le32(from_kuid(to, uid));
+                       entry->e_id = cpu_to_le32(from_kgid(to, gid));
                        break;
                default:
                        break;