aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorDavid S. Miller <davem@kernel.bkbits.net>2003-02-08 10:48:18 -0800
committerDavid S. Miller <davem@kernel.bkbits.net>2003-02-08 10:48:18 -0800
commitfd7c713fd43e878d85a431bdf25ac573efc17b6d (patch)
treed775073f8d544b0d3e41fa5751b70503cbc0b2e0 /security
parentd5a9256003294d65d6cd9d162cf29fb852f6569a (diff)
parent28a59cb02a6b97cb27e914687c0346c608abd110 (diff)
downloadhistory-fd7c713fd43e878d85a431bdf25ac573efc17b6d.tar.gz
Merge davem@nuts.ninka.net:/home/davem/src/BK/net-2.5
into kernel.bkbits.net:/home/davem/net-2.5
Diffstat (limited to 'security')
-rw-r--r--security/capability.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/capability.c b/security/capability.c
index 221f185ca3809f..5909732acdfc2e 100644
--- a/security/capability.c
+++ b/security/capability.c
@@ -133,7 +133,7 @@ void cap_bprm_compute_creds (struct linux_binprm *bprm)
if (must_not_trace_exec (current)
|| atomic_read (&current->fs->count) > 1
|| atomic_read (&current->files->count) > 1
- || atomic_read (&current->sig->count) > 1) {
+ || atomic_read (&current->sighand->count) > 1) {
if (!capable (CAP_SETPCAP)) {
new_permitted = cap_intersect (new_permitted,
current->