diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2009-03-30 07:35:18 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-03-31 23:00:26 -0400 |
commit | f1191b50ec11c8e2ca766d6d99eb5bb9d2c084a3 (patch) | |
tree | 7eae2387269bd3d2d4c6f334568f9fea6518c787 /fs | |
parent | 498052bba55ecaff58db6a1436b0e25bfd75a7ff (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>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/exec.c | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -1060,23 +1060,20 @@ int check_unsafe_exec(struct linux_binprm *bprm) | |||
1060 | { | 1060 | { |
1061 | struct task_struct *p = current, *t; | 1061 | struct task_struct *p = current, *t; |
1062 | unsigned long flags; | 1062 | unsigned long flags; |
1063 | unsigned n_fs, n_sighand; | 1063 | unsigned n_fs; |
1064 | int res = 0; | 1064 | int res = 0; |
1065 | 1065 | ||
1066 | bprm->unsafe = tracehook_unsafe_exec(p); | 1066 | bprm->unsafe = tracehook_unsafe_exec(p); |
1067 | 1067 | ||
1068 | n_fs = 1; | 1068 | n_fs = 1; |
1069 | n_sighand = 1; | ||
1070 | write_lock(&p->fs->lock); | 1069 | write_lock(&p->fs->lock); |
1071 | lock_task_sighand(p, &flags); | 1070 | lock_task_sighand(p, &flags); |
1072 | for (t = next_thread(p); t != p; t = next_thread(t)) { | 1071 | for (t = next_thread(p); t != p; t = next_thread(t)) { |
1073 | if (t->fs == p->fs) | 1072 | if (t->fs == p->fs) |
1074 | n_fs++; | 1073 | n_fs++; |
1075 | n_sighand++; | ||
1076 | } | 1074 | } |
1077 | 1075 | ||
1078 | if (p->fs->users > n_fs || | 1076 | if (p->fs->users > n_fs) { |
1079 | atomic_read(&p->sighand->count) > n_sighand) { | ||
1080 | bprm->unsafe |= LSM_UNSAFE_SHARE; | 1077 | bprm->unsafe |= LSM_UNSAFE_SHARE; |
1081 | } else { | 1078 | } else { |
1082 | if (p->fs->in_exec) | 1079 | if (p->fs->in_exec) |