userns: Convert stat to return values mapped from kuids and kgids

- Store uids and gids with kuid_t and kgid_t in struct kstat
- Convert uid and gids to userspace usable values with
  from_kuid and from_kgid

Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c
index f0273ed760ef..65426525d9f2 100644
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@@ -547,8 +547,8 @@ static int cp_stat64(struct stat64_emu31 __user *ubuf, struct kstat *stat)
         tmp.__st_ino = (u32)stat->ino;
         tmp.st_mode = stat->mode;
         tmp.st_nlink = (unsigned int)stat->nlink;
-        tmp.st_uid = stat->uid;
-        tmp.st_gid = stat->gid;
+        tmp.st_uid = from_kuid_munged(current_user_ns(), stat->uid);
+        tmp.st_gid = from_kgid_munged(current_user_ns(), stat->gid);
         tmp.st_rdev = huge_encode_dev(stat->rdev);
         tmp.st_size = stat->size;
         tmp.st_blksize = (u32)stat->blksize;