aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-10-09 15:11:55 -0700
committerEric W. Biederman <ebiederm@xmission.com>2012-10-12 13:16:48 -0700
commitea1fd7776e7ed41ee4ddcff32104db5c7b372309 (patch)
treea8ca47d6d95e55a2a0b1eb0a947b6a0d4064dbb4 /fs
parent1bbb3095a5912be4b9c90397ef2182a5a328865b (diff)
userns: Fix posix_acl_file_xattr_userns gid conversion
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/xattr_acl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xattr_acl.c b/fs/xattr_acl.c
index 11efd830b5f..9fbea87fdb6 100644
--- a/fs/xattr_acl.c
+++ b/fs/xattr_acl.c
@@ -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;