From 7b4d3039dfd2cbfa15127c29dcb557f314d13db1 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 4 Feb 2002 19:12:19 -0800 Subject: v2.4.6.8 -> v2.4.6.9 - Dan Quinlan: cramfs update - Ben Collins: IEEE 1394 update - David Miller: network update (pppoe, routing cache stats), sparc32 update - me: only dump core once per threaded app (first one wins) - me: use new completion handlers for block device requests (same race as with vfork, see -pre7) --- kernel/sys.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'kernel') diff --git a/kernel/sys.c b/kernel/sys.c index ecd26b90c34b..3bbfb2b68896 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -399,7 +399,7 @@ asmlinkage long sys_setregid(gid_t rgid, gid_t egid) } if (new_egid != old_egid) { - current->dumpable = 0; + current->mm->dumpable = 0; wmb(); } if (rgid != (gid_t) -1 || @@ -424,7 +424,7 @@ asmlinkage long sys_setgid(gid_t gid) { if(old_egid != gid) { - current->dumpable=0; + current->mm->dumpable=0; wmb(); } current->gid = current->egid = current->sgid = current->fsgid = gid; @@ -433,7 +433,7 @@ asmlinkage long sys_setgid(gid_t gid) { if(old_egid != gid) { - current->dumpable=0; + current->mm->dumpable=0; wmb(); } current->egid = current->fsgid = gid; @@ -507,7 +507,7 @@ static int set_user(uid_t new_ruid, int dumpclear) if(dumpclear) { - current->dumpable = 0; + current->mm->dumpable = 0; wmb(); } current->uid = new_ruid; @@ -561,7 +561,7 @@ asmlinkage long sys_setreuid(uid_t ruid, uid_t euid) if (new_euid != old_euid) { - current->dumpable=0; + current->mm->dumpable=0; wmb(); } current->fsuid = current->euid = new_euid; @@ -608,7 +608,7 @@ asmlinkage long sys_setuid(uid_t uid) if (old_euid != uid) { - current->dumpable = 0; + current->mm->dumpable = 0; wmb(); } current->fsuid = current->euid = uid; @@ -650,7 +650,7 @@ asmlinkage long sys_setresuid(uid_t ruid, uid_t euid, uid_t suid) if (euid != (uid_t) -1) { if (euid != current->euid) { - current->dumpable = 0; + current->mm->dumpable = 0; wmb(); } current->euid = euid; @@ -696,7 +696,7 @@ asmlinkage long sys_setresgid(gid_t rgid, gid_t egid, gid_t sgid) if (egid != (gid_t) -1) { if (egid != current->egid) { - current->dumpable = 0; + current->mm->dumpable = 0; wmb(); } current->egid = egid; @@ -738,7 +738,7 @@ asmlinkage long sys_setfsuid(uid_t uid) { if (uid != old_fsuid) { - current->dumpable = 0; + current->mm->dumpable = 0; wmb(); } current->fsuid = uid; @@ -780,7 +780,7 @@ asmlinkage long sys_setfsgid(gid_t gid) { if (gid != old_fsgid) { - current->dumpable = 0; + current->mm->dumpable = 0; wmb(); } current->fsgid = gid; @@ -1218,7 +1218,7 @@ asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3, error = put_user(current->pdeath_signal, (int *)arg2); break; case PR_GET_DUMPABLE: - if (current->dumpable) + if (current->mm->dumpable) error = 1; break; case PR_SET_DUMPABLE: @@ -1226,7 +1226,7 @@ asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3, error = -EINVAL; break; } - current->dumpable = arg2; + current->mm->dumpable = arg2; break; case PR_SET_UNALIGN: #ifdef SET_UNALIGN_CTL -- cgit v1.2.3