aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2009-03-30 07:35:18 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2009-03-31 23:00:26 -0400
commitf1191b50ec11c8e2ca766d6d99eb5bb9d2c084a3 (patch)
tree7eae2387269bd3d2d4c6f334568f9fea6518c787
parent498052bba55ecaff58db6a1436b0e25bfd75a7ff (diff)
check_unsafe_exec() doesn't care about signal handlers sharing
... since we'll unshare sighand anyway Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/exec.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/exec.c b/fs/exec.c
index 07a059664b7..614991bf0c8 100644
--- 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)