2018-08-22 12:21:49

by Christian Brauner

Subject: [PATCH v1] security/capabilities: remove check for -EINVAL

bprm_caps_from_vfs_caps() never returned -EINVAL so remove the
rc == -EINVAL check.

Signed-off-by: Christian Brauner <[email protected]>
---
v0 -> v1
- non-functional changes:
adapt commit message to reflect the fact that
bprm_caps_from_vfs_caps() never actuall returned -EINVAL.
---
security/commoncap.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/security/commoncap.c b/security/commoncap.c
index f4c33abd9959..6012f0cd8157 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)
--
2.17.1

2018-08-22 14:20:51

by Serge E. Hallyn

Subject: Re: [PATCH v1] security/capabilities: remove check for -EINVAL

Quoting Christian Brauner ([email protected]):
> bprm_caps_from_vfs_caps() never returned -EINVAL so remove the
> rc == -EINVAL check.
>
> Signed-off-by: Christian Brauner <[email protected]>

Thanks.

Reviewed-by: Serge Hallyn <[email protected]>

> ---
> v0 -> v1
> - non-functional changes:
> adapt commit message to reflect the fact that
> bprm_caps_from_vfs_caps() never actuall returned -EINVAL.
> ---
> security/commoncap.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/security/commoncap.c b/security/commoncap.c
> index f4c33abd9959..6012f0cd8157 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)
> --
> 2.17.1

2018-08-23 16:50:31

by James Morris

Subject: Re: [PATCH v1] security/capabilities: remove check for -EINVAL

On Wed, 22 Aug 2018, Serge E. Hallyn wrote:

> Quoting Christian Brauner ([email protected]):
> > bprm_caps_from_vfs_caps() never returned -EINVAL so remove the
> > rc == -EINVAL check.
> >
> > Signed-off-by: Christian Brauner <[email protected]>
>
> Thanks.
>
> Reviewed-by: Serge Hallyn <[email protected]>

Thanks, I'll queue this for post -rc1 next-general.


--
James Morris
<[email protected]>

2018-08-29 16:10:47

by James Morris

Subject: Re: [PATCH v1] security/capabilities: remove check for -EINVAL

On Wed, 22 Aug 2018, Christian Brauner wrote:

> bprm_caps_from_vfs_caps() never returned -EINVAL so remove the
> rc == -EINVAL check.
>
> Signed-off-by: Christian Brauner <[email protected]>

Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next-general


--
James Morris
<[email protected]>