check_unsafe_exec() doesn't care about signal handlers sharing
authorAl Viro <viro@zeniv.linux.org.uk>
Mon, 30 Mar 2009 11:35:18 +0000 (07:35 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Wed, 1 Apr 2009 03:00:26 +0000 (23:00 -0400)
... since we'll unshare sighand anyway

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/exec.c

index 07a059664b73084c59155ba5fe2ce69487e78210..614991bf0c8738c616e342a51251ad378ff790a3 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1060,23 +1060,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)