diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:45:41 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:45:41 -0400 |
| commit | 1c7da74c4aab595a994beb5fe728ebf0d0b41f59 (patch) | |
| tree | 64128abdf9550ebb51d8f3ee6732d7350b9c62f2 /kernel/capability.c | |
| parent | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (diff) | |
| parent | 1bdfd554be94def718323659173517c5d4a69d25 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'kernel/capability.c')
| -rw-r--r-- | kernel/capability.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/capability.c b/kernel/capability.c index c7685ad00a97..edb845a6e84a 100644 --- a/kernel/capability.c +++ b/kernel/capability.c | |||
| @@ -133,7 +133,7 @@ static inline int cap_set_all(kernel_cap_t *effective, | |||
| 133 | int found = 0; | 133 | int found = 0; |
| 134 | 134 | ||
| 135 | do_each_thread(g, target) { | 135 | do_each_thread(g, target) { |
| 136 | if (target == current || target->pid == 1) | 136 | if (target == current || is_init(target)) |
| 137 | continue; | 137 | continue; |
| 138 | found = 1; | 138 | found = 1; |
| 139 | if (security_capset_check(target, effective, inheritable, | 139 | if (security_capset_check(target, effective, inheritable, |