aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorTomas Olsson <tol@stacken.kth.se>2004-06-17 17:59:25 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-06-17 17:59:25 -0700
commit8783a1ce3c3c13c990644b6229d0e4fafba8057a (patch)
tree94a6c626b8997d1d2fd3cbe5a10fbfbe12a9ff38 /kernel
parent406e1707d0cc3b051cae22b07b25c406155ae9e7 (diff)
downloadhistory-8783a1ce3c3c13c990644b6229d0e4fafba8057a.tar.gz
[PATCH] getgroups16() fix
sys_getgroups16 (or rather groups16_to_user()) returns large gids truncated. Needs to be fixed, one way or another. Don't know why the other similar casts are still there. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/uid16.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/uid16.c b/kernel/uid16.c
index 5ebaa3d6bc8fc4..f669941e8b26d8 100644
--- a/kernel/uid16.c
+++ b/kernel/uid16.c
@@ -39,7 +39,7 @@ asmlinkage long sys_setregid16(old_gid_t rgid, old_gid_t egid)
asmlinkage long sys_setgid16(old_gid_t gid)
{
- return sys_setgid((gid_t)gid);
+ return sys_setgid(low2highgid(gid));
}
asmlinkage long sys_setreuid16(old_uid_t ruid, old_uid_t euid)
@@ -49,7 +49,7 @@ asmlinkage long sys_setreuid16(old_uid_t ruid, old_uid_t euid)
asmlinkage long sys_setuid16(old_uid_t uid)
{
- return sys_setuid((uid_t)uid);
+ return sys_setuid(low2highuid(uid));
}
asmlinkage long sys_setresuid16(old_uid_t ruid, old_uid_t euid, old_uid_t suid)
@@ -88,12 +88,12 @@ asmlinkage long sys_getresgid16(old_gid_t __user *rgid, old_gid_t __user *egid,
asmlinkage long sys_setfsuid16(old_uid_t uid)
{
- return sys_setfsuid((uid_t)uid);
+ return sys_setfsuid(low2highuid(uid));
}
asmlinkage long sys_setfsgid16(old_gid_t gid)
{
- return sys_setfsgid((gid_t)gid);
+ return sys_setfsgid(low2highgid(gid));
}
static int groups16_to_user(old_gid_t __user *grouplist,
@@ -103,7 +103,7 @@ static int groups16_to_user(old_gid_t __user *grouplist,
old_gid_t group;
for (i = 0; i < group_info->ngroups; i++) {
- group = (old_gid_t)GROUP_AT(group_info, i);
+ group = high2lowgid(GROUP_AT(group_info, i));
if (put_user(group, grouplist+i))
return -EFAULT;
}
@@ -120,7 +120,7 @@ static int groups16_from_user(struct group_info *group_info,
for (i = 0; i < group_info->ngroups; i++) {
if (get_user(group, grouplist+i))
return -EFAULT;
- GROUP_AT(group_info, i) = (gid_t)group;
+ GROUP_AT(group_info, i) = low2highgid(group);
}
return 0;