From c351a95b778ad79dd011bec661c7dfcaec099924 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 17 Aug 2007 21:47:58 +0200 Subject: [PATCH] --- yaml --- r: 64030 b: refs/heads/master c: d2d56c5f51028cb9f3d800882eb6f4cbd3f9099f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/exec.c | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6b809adb7a6c..3d1fbdbb655b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28e8351ac22de25034e048c680014ad824323c65 +refs/heads/master: d2d56c5f51028cb9f3d800882eb6f4cbd3f9099f diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c index 7bdea7937ee8..ce62f7b65f17 100644 --- a/trunk/fs/exec.c +++ b/trunk/fs/exec.c @@ -1084,9 +1084,12 @@ int flush_old_exec(struct linux_binprm * bprm) */ current->mm->task_size = TASK_SIZE; - if (bprm->e_uid != current->euid || bprm->e_gid != current->egid || - file_permission(bprm->file, MAY_READ) || - (bprm->interp_flags & BINPRM_FLAGS_ENFORCE_NONDUMP)) { + if (bprm->e_uid != current->euid || bprm->e_gid != current->egid) { + suid_keys(current); + set_dumpable(current->mm, suid_dumpable); + current->pdeath_signal = 0; + } else if (file_permission(bprm->file, MAY_READ) || + (bprm->interp_flags & BINPRM_FLAGS_ENFORCE_NONDUMP)) { suid_keys(current); set_dumpable(current->mm, suid_dumpable); } @@ -1177,8 +1180,10 @@ void compute_creds(struct linux_binprm *bprm) { int unsafe; - if (bprm->e_uid != current->uid) + if (bprm->e_uid != current->uid) { suid_keys(current); + current->pdeath_signal = 0; + } exec_keys(current); task_lock(current);