diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
| commit | 21b4e736922f546e0f1aa7b9d6c442f309a2444a (patch) | |
| tree | e1be8645297f8ebe87445251743ebcc52081a20d /kernel/sys.c | |
| parent | 34161db6b14d984fb9b06c735b7b42f8803f6851 (diff) | |
| parent | 68380b581383c028830f79ec2670f4a193854aa6 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
Diffstat (limited to 'kernel/sys.c')
| -rw-r--r-- | kernel/sys.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index c87b461de38d..a0c1a29a507f 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
| @@ -1102,14 +1102,14 @@ asmlinkage long sys_setreuid(uid_t ruid, uid_t euid) | |||
| 1102 | asmlinkage long sys_setuid(uid_t uid) | 1102 | asmlinkage long sys_setuid(uid_t uid) |
| 1103 | { | 1103 | { |
| 1104 | int old_euid = current->euid; | 1104 | int old_euid = current->euid; |
| 1105 | int old_ruid, old_suid, new_ruid, new_suid; | 1105 | int old_ruid, old_suid, new_suid; |
| 1106 | int retval; | 1106 | int retval; |
| 1107 | 1107 | ||
| 1108 | retval = security_task_setuid(uid, (uid_t)-1, (uid_t)-1, LSM_SETID_ID); | 1108 | retval = security_task_setuid(uid, (uid_t)-1, (uid_t)-1, LSM_SETID_ID); |
| 1109 | if (retval) | 1109 | if (retval) |
| 1110 | return retval; | 1110 | return retval; |
| 1111 | 1111 | ||
| 1112 | old_ruid = new_ruid = current->uid; | 1112 | old_ruid = current->uid; |
| 1113 | old_suid = current->suid; | 1113 | old_suid = current->suid; |
| 1114 | new_suid = old_suid; | 1114 | new_suid = old_suid; |
| 1115 | 1115 | ||