Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...

[cascardo/linux.git] / arch / alpha / kernel / osf_sys.c

diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index bc1acdd..9503a4b 100644 (file)
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -278,8 +278,8 @@ linux_to_osf_stat(struct kstat *lstat, struct osf_stat __user *osf_stat)
        tmp.st_dev      = lstat->dev;
        tmp.st_mode     = lstat->mode;
        tmp.st_nlink    = lstat->nlink;
-       tmp.st_uid      = lstat->uid;
-       tmp.st_gid      = lstat->gid;
+       tmp.st_uid      = from_kuid_munged(current_user_ns(), lstat->uid);
+       tmp.st_gid      = from_kgid_munged(current_user_ns(), lstat->gid);
        tmp.st_rdev     = lstat->rdev;
        tmp.st_ldev     = lstat->rdev;
        tmp.st_size     = lstat->size;