diff options
author | Oleg Nesterov <oleg@redhat.com> | 2009-04-23 19:02:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-24 10:39:45 -0400 |
commit | 437f7fdb607f32b737e4da9f14bebcfdac2c90c3 (patch) | |
tree | 2064149ad4406774bd3b1ade60782980206f2e82 /fs | |
parent | 8c652f96d3852b97a49c331cd0bb02d22f3cb31b (diff) |
check_unsafe_exec: s/lock_task_sighand/rcu_read_lock/
write_lock(¤t->fs->lock) guarantees we can't wrongly miss
LSM_UNSAFE_SHARE, this is what we care about. Use rcu_read_lock()
instead of ->siglock to iterate over the sub-threads. We must see
all CLONE_THREAD|CLONE_FS threads which didn't pass exit_fs(), it
takes fs->lock too.
With or without this patch we can miss the freshly cloned thread
and set LSM_UNSAFE_SHARE, we don't care.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Roland McGrath <roland@redhat.com>
[ Fixed lock/unlock typo - Hugh ]
Acked-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/exec.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -1060,7 +1060,6 @@ EXPORT_SYMBOL(install_exec_creds); | |||
1060 | int check_unsafe_exec(struct linux_binprm *bprm) | 1060 | int check_unsafe_exec(struct linux_binprm *bprm) |
1061 | { | 1061 | { |
1062 | struct task_struct *p = current, *t; | 1062 | struct task_struct *p = current, *t; |
1063 | unsigned long flags; | ||
1064 | unsigned n_fs; | 1063 | unsigned n_fs; |
1065 | int res = 0; | 1064 | int res = 0; |
1066 | 1065 | ||
@@ -1068,11 +1067,12 @@ int check_unsafe_exec(struct linux_binprm *bprm) | |||
1068 | 1067 | ||
1069 | n_fs = 1; | 1068 | n_fs = 1; |
1070 | write_lock(&p->fs->lock); | 1069 | write_lock(&p->fs->lock); |
1071 | lock_task_sighand(p, &flags); | 1070 | rcu_read_lock(); |
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 | } | 1074 | } |
1075 | rcu_read_unlock(); | ||
1076 | 1076 | ||
1077 | if (p->fs->users > n_fs) { | 1077 | if (p->fs->users > n_fs) { |
1078 | bprm->unsafe |= LSM_UNSAFE_SHARE; | 1078 | bprm->unsafe |= LSM_UNSAFE_SHARE; |
@@ -1083,8 +1083,6 @@ int check_unsafe_exec(struct linux_binprm *bprm) | |||
1083 | res = 1; | 1083 | res = 1; |
1084 | } | 1084 | } |
1085 | } | 1085 | } |
1086 | |||
1087 | unlock_task_sighand(p, &flags); | ||
1088 | write_unlock(&p->fs->lock); | 1086 | write_unlock(&p->fs->lock); |
1089 | 1087 | ||
1090 | return res; | 1088 | return res; |