2019-03-29 14:12:17 +08:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-11-06 04:14:04 +08:00
|
|
|
From: Christian Brauner <christian@brauner.io>
|
|
|
|
Date: Wed, 22 Aug 2018 13:52:40 +0200
|
2019-03-29 14:12:17 +08:00
|
|
|
Subject: [PATCH] security/capabilities: remove check for -EINVAL
|
2018-11-06 04:14:04 +08:00
|
|
|
|
|
|
|
bprm_caps_from_vfs_caps() never returned -EINVAL so remove the
|
|
|
|
rc == -EINVAL check.
|
|
|
|
|
|
|
|
Signed-off-by: Christian Brauner <christian@brauner.io>
|
|
|
|
Reviewed-by: Serge Hallyn <serge@hallyn.com>
|
|
|
|
Signed-off-by: James Morris <james.morris@microsoft.com>
|
|
|
|
---
|
|
|
|
security/commoncap.c | 3 ---
|
|
|
|
1 file changed, 3 deletions(-)
|
|
|
|
|
|
|
|
diff --git a/security/commoncap.c b/security/commoncap.c
|
2019-03-29 14:12:17 +08:00
|
|
|
index 2e489d6..18a4fdf 100644
|
2018-11-06 04:14:04 +08:00
|
|
|
--- 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)
|
|
|
|
--
|
2019-04-08 18:08:36 +08:00
|
|
|
https://clearlinux.org
|
2018-11-06 04:14:04 +08:00
|
|
|
|