security/capabilities: remove check for -EINVAL

brauner · James Morris · commit 4408e300a67a · 2018-08-29T09:05:28.000-07:00
bprm_caps_from_vfs_caps() never returned -EINVAL so remove the
rc == -EINVAL check.

Signed-off-by: Christian Brauner &lt;christian@brauner.io&gt;
Reviewed-by: Serge Hallyn &lt;serge@hallyn.com&gt;
Signed-off-by: James Morris &lt;james.morris@microsoft.com&gt;
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -684,9 +684,6 @@ static int get_file_caps(struct linux_binprm bprm, bool effective, bool *has_f`
`684`	`684`	`}`
`685`	`685`
`686`	`686`	`rc = bprm_caps_from_vfs_caps(&vcaps, bprm, effective, has_fcap);`
`687`		`- if (rc == -EINVAL)`
`688`		`- printk(KERN_NOTICE "%s: cap_from_disk returned %d for %s\n",`
`689`		`- __func__, rc, bprm->filename);`
`690`	`687`
`691`	`688`	`out:`
`692`	`689`	`if (rc)`