Merge tag 'imx-clk-common-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into...

[karo-tx-linux.git] / arch / sparc / kernel / sys_sparc32.c

diff --git a/arch/sparc/kernel/sys_sparc32.c b/arch/sparc/kernel/sys_sparc32.c
index 29c478ffed9154f3e4207e8cbb9d325803025a5d..f7392336961f84a956d3d693c72df3a8674b5d97 100644 (file)
--- a/arch/sparc/kernel/sys_sparc32.c
+++ b/arch/sparc/kernel/sys_sparc32.c
@@ -139,8 +139,8 @@ static int cp_compat_stat64(struct kstat *stat,
        err |= put_user(stat->ino, &statbuf->st_ino);
        err |= put_user(stat->mode, &statbuf->st_mode);
        err |= put_user(stat->nlink, &statbuf->st_nlink);
-       err |= put_user(stat->uid, &statbuf->st_uid);
-       err |= put_user(stat->gid, &statbuf->st_gid);
+       err |= put_user(from_kuid_munged(current_user_ns(), stat->uid), &statbuf->st_uid);
+       err |= put_user(from_kgid_munged(current_user_ns(), stat->gid), &statbuf->st_gid);
        err |= put_user(huge_encode_dev(stat->rdev), &statbuf->st_rdev);
        err |= put_user(0, (unsigned long __user *) &statbuf->__pad3[0]);
        err |= put_user(stat->size, &statbuf->st_size);