git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'please-pull-mce' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
[pandora-kernel.git]
/
kernel
/
timer.c
diff --git
a/kernel/timer.c
b/kernel/timer.c
index
09de9a9
..
6ec7e7e
100644
(file)
--- a/
kernel/timer.c
+++ b/
kernel/timer.c
@@
-1435,25
+1435,25
@@
SYSCALL_DEFINE0(getppid)
SYSCALL_DEFINE0(getuid)
{
/* Only we change this so SMP safe */
SYSCALL_DEFINE0(getuid)
{
/* Only we change this so SMP safe */
- return
current_uid(
);
+ return
from_kuid_munged(current_user_ns(), current_uid()
);
}
SYSCALL_DEFINE0(geteuid)
{
/* Only we change this so SMP safe */
}
SYSCALL_DEFINE0(geteuid)
{
/* Only we change this so SMP safe */
- return
current_euid(
);
+ return
from_kuid_munged(current_user_ns(), current_euid()
);
}
SYSCALL_DEFINE0(getgid)
{
/* Only we change this so SMP safe */
}
SYSCALL_DEFINE0(getgid)
{
/* Only we change this so SMP safe */
- return
current_gid(
);
+ return
from_kgid_munged(current_user_ns(), current_gid()
);
}
SYSCALL_DEFINE0(getegid)
{
/* Only we change this so SMP safe */
}
SYSCALL_DEFINE0(getegid)
{
/* Only we change this so SMP safe */
- return
current_egid(
);
+ return
from_kgid_munged(current_user_ns(), current_egid()
);
}
#endif
}
#endif