diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-29 07:20:52 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-29 07:20:52 +0100 |
| commit | f0718d792b8a6d4b5ddc929e418ac57cc4897375 (patch) | |
| tree | 3dbaa824ce380e99709fae47c047383ca39c983a /security/commoncap.c | |
| parent | efe8eaf7b525f1be26fe20d723d2bfbfcd7455fd (diff) | |
| parent | b59dfdaef173677b0b7e10f375226c0a1114fd20 (diff) | |
| download | lwn-f0718d792b8a6d4b5ddc929e418ac57cc4897375.tar.gz lwn-f0718d792b8a6d4b5ddc929e418ac57cc4897375.zip | |
Merge branch 'linus' into perf/urgent, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'security/commoncap.c')
| -rw-r--r-- | security/commoncap.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/security/commoncap.c b/security/commoncap.c index 2e489d6a3ac8..18a4fdf6f6eb 100644 --- a/security/commoncap.c +++ b/security/commoncap.c @@ -684,9 +684,6 @@ static int get_file_caps(struct linux_binprm *bprm, bool *effective, bool *has_f } rc = bprm_caps_from_vfs_caps(&vcaps, bprm, effective, has_fcap); - if (rc == -EINVAL) - printk(KERN_NOTICE "%s: cap_from_disk returned %d for %s\n", - __func__, rc, bprm->filename); out: if (rc) |