aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2009-03-30 07:35:18 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-05-08 15:45:08 -0700
commite5d1b9adb4dbee27ffa857c645efe00d6dea6eff (patch)
tree864949ee6961482b73c6772303f75e5e06c1d5ed
parentd093166dbab62418c468481891cdfbc70e3c73f9 (diff)
check_unsafe_exec() doesn't care about signal handlers sharing
commit f1191b50ec11c8e2ca766d6d99eb5bb9d2c084a3 upstream. ... since we'll unshare sighand anyway Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--fs/exec.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/exec.c b/fs/exec.c
index b55a1f8195dc..d1d2b8da3fc0 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1053,23 +1053,20 @@ int check_unsafe_exec(struct linux_binprm *bprm)
{
struct task_struct *p = current, *t;
unsigned long flags;
- unsigned n_fs, n_sighand;
+ unsigned n_fs;
int res = 0;
bprm->unsafe = tracehook_unsafe_exec(p);
n_fs = 1;
- n_sighand = 1;
write_lock(&p->fs->lock);
lock_task_sighand(p, &flags);
for (t = next_thread(p); t != p; t = next_thread(t)) {
if (t->fs == p->fs)
n_fs++;
- n_sighand++;
}
- if (p->fs->users > n_fs ||
- atomic_read(&p->sighand->count) > n_sighand) {
+ if (p->fs->users > n_fs) {
bprm->unsafe |= LSM_UNSAFE_SHARE;
} else {
if (p->fs->in_exec)