diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-10-02 08:45:08 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-10-02 08:45:08 -0400 |
| commit | 59458f40e25915a355d8b1d701425fe9f4f9ea23 (patch) | |
| tree | f1c9a2934df686e36d75f759ab7313b6f0e0e5f9 /security/commoncap.c | |
| parent | 825f9075d74028d11d7f5932f04e1b5db3022b51 (diff) | |
| parent | d834c16516d1ebec4766fc58c059bf01311e6045 (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'security/commoncap.c')
| -rw-r--r-- | security/commoncap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/commoncap.c b/security/commoncap.c index f50fc298cf80..5a5ef5ca7ea9 100644 --- a/security/commoncap.c +++ b/security/commoncap.c | |||
| @@ -169,7 +169,7 @@ void cap_bprm_apply_creds (struct linux_binprm *bprm, int unsafe) | |||
| 169 | /* For init, we want to retain the capabilities set | 169 | /* For init, we want to retain the capabilities set |
| 170 | * in the init_task struct. Thus we skip the usual | 170 | * in the init_task struct. Thus we skip the usual |
| 171 | * capability rules */ | 171 | * capability rules */ |
| 172 | if (current->pid != 1) { | 172 | if (!is_init(current)) { |
| 173 | current->cap_permitted = new_permitted; | 173 | current->cap_permitted = new_permitted; |
| 174 | current->cap_effective = | 174 | current->cap_effective = |
| 175 | cap_intersect (new_permitted, bprm->cap_effective); | 175 | cap_intersect (new_permitted, bprm->cap_effective); |