* [PATCH v2] hooks: fix a missing-check bug in selinux_sb_eat_lsm_opts()
@ 2019-05-31 1:33 Gen Zhang
2019-05-31 15:45 ` Paul Moore
0 siblings, 1 reply; 6+ messages in thread
From: Gen Zhang @ 2019-05-31 1:33 UTC (permalink / raw)
To: paul, sds, eparis; +Cc: selinux, linux-kernel, netdev, bpf, omosnace
In selinux_sb_eat_lsm_opts(), 'arg' is allocated by kmemdup_nul(). It
returns NULL when fails. So 'arg' should be checked.
Signed-off-by: Gen Zhang <blackgod016574@gmail.com>
Reviewed-by: Ondrej Mosnacek <omosnace@redhat.com>
Fixes: 99dbbb593fe6 ("selinux: rewrite selinux_sb_eat_lsm_opts()")
---
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 3ec702c..5a9e959 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2635,6 +2635,8 @@ static int selinux_sb_eat_lsm_opts(char *options, void **mnt_opts)
*q++ = c;
}
arg = kmemdup_nul(arg, q - arg, GFP_KERNEL);
+ if (!arg)
+ return -ENOMEM;
}
rc = selinux_add_opt(token, arg, mnt_opts);
if (unlikely(rc)) {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2] hooks: fix a missing-check bug in selinux_sb_eat_lsm_opts()
2019-05-31 1:33 [PATCH v2] hooks: fix a missing-check bug in selinux_sb_eat_lsm_opts() Gen Zhang
@ 2019-05-31 15:45 ` Paul Moore
2019-06-01 1:57 ` Gen Zhang
0 siblings, 1 reply; 6+ messages in thread
From: Paul Moore @ 2019-05-31 15:45 UTC (permalink / raw)
To: Gen Zhang
Cc: Stephen Smalley, Eric Paris, selinux, linux-kernel, netdev, bpf,
omosnace
On Thu, May 30, 2019 at 9:34 PM Gen Zhang <blackgod016574@gmail.com> wrote:
>
> In selinux_sb_eat_lsm_opts(), 'arg' is allocated by kmemdup_nul(). It
> returns NULL when fails. So 'arg' should be checked.
>
> Signed-off-by: Gen Zhang <blackgod016574@gmail.com>
> Reviewed-by: Ondrej Mosnacek <omosnace@redhat.com>
> Fixes: 99dbbb593fe6 ("selinux: rewrite selinux_sb_eat_lsm_opts()")
One quick note about the subject line, instead of using "hooks:" you
should use "selinux:" since this is specific to SELinux. If the patch
did apply to the LSM framework as a whole, I would suggest using
"lsm:" instead of "hooks:" as "hooks" is too ambiguous of a prefix.
> diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
> index 3ec702c..5a9e959 100644
> --- a/security/selinux/hooks.c
> +++ b/security/selinux/hooks.c
> @@ -2635,6 +2635,8 @@ static int selinux_sb_eat_lsm_opts(char *options, void **mnt_opts)
> *q++ = c;
> }
> arg = kmemdup_nul(arg, q - arg, GFP_KERNEL);
> + if (!arg)
> + return -ENOMEM;
It seems like we should also check for, and potentially free *mnt_opts
as the selinux_add_opt() error handling does just below this change,
yes? If that is the case we might want to move that error handling
code to the bottom of the function and jump there on error.
> }
> rc = selinux_add_opt(token, arg, mnt_opts);
> if (unlikely(rc)) {
--
paul moore
www.paul-moore.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] hooks: fix a missing-check bug in selinux_sb_eat_lsm_opts()
2019-05-31 15:45 ` Paul Moore
@ 2019-06-01 1:57 ` Gen Zhang
0 siblings, 0 replies; 6+ messages in thread
From: Gen Zhang @ 2019-06-01 1:57 UTC (permalink / raw)
To: Paul Moore
Cc: Stephen Smalley, Eric Paris, selinux, linux-kernel, netdev, bpf,
omosnace
On Fri, May 31, 2019 at 11:45:28AM -0400, Paul Moore wrote:
> On Thu, May 30, 2019 at 9:34 PM Gen Zhang <blackgod016574@gmail.com> wrote:
> >
> > In selinux_sb_eat_lsm_opts(), 'arg' is allocated by kmemdup_nul(). It
> > returns NULL when fails. So 'arg' should be checked.
> >
> > Signed-off-by: Gen Zhang <blackgod016574@gmail.com>
> > Reviewed-by: Ondrej Mosnacek <omosnace@redhat.com>
> > Fixes: 99dbbb593fe6 ("selinux: rewrite selinux_sb_eat_lsm_opts()")
>
> One quick note about the subject line, instead of using "hooks:" you
> should use "selinux:" since this is specific to SELinux. If the patch
> did apply to the LSM framework as a whole, I would suggest using
> "lsm:" instead of "hooks:" as "hooks" is too ambiguous of a prefix.
>
> > diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
> > index 3ec702c..5a9e959 100644
> > --- a/security/selinux/hooks.c
> > +++ b/security/selinux/hooks.c
> > @@ -2635,6 +2635,8 @@ static int selinux_sb_eat_lsm_opts(char *options, void **mnt_opts)
> > *q++ = c;
> > }
> > arg = kmemdup_nul(arg, q - arg, GFP_KERNEL);
> > + if (!arg)
> > + return -ENOMEM;
>
> It seems like we should also check for, and potentially free *mnt_opts
> as the selinux_add_opt() error handling does just below this change,
> yes? If that is the case we might want to move that error handling
> code to the bottom of the function and jump there on error.
>
> > }
> > rc = selinux_add_opt(token, arg, mnt_opts);
> > if (unlikely(rc)) {
>
> --
> paul moore
> www.paul-moore.com
Yes, I agree with that. And I will work on this to resubmit.
Thanks
Gen
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] hooks: fix a missing-check bug in selinux_sb_eat_lsm_opts()
2019-05-30 11:52 ` Ondrej Mosnacek
@ 2019-05-30 15:16 ` William Roberts
0 siblings, 0 replies; 6+ messages in thread
From: William Roberts @ 2019-05-30 15:16 UTC (permalink / raw)
To: Ondrej Mosnacek
Cc: Gen Zhang, Paul Moore, tony.luck, Stephen Smalley, Eric Paris,
selinux, Linux kernel mailing list, bpf
On Thu, May 30, 2019 at 4:52 AM Ondrej Mosnacek <omosnace@redhat.com> wrote:
>
> On Thu, May 30, 2019 at 10:51 AM Gen Zhang <blackgod016574@gmail.com> wrote:
> > In selinux_sb_eat_lsm_opts(), 'arg' is allocated by kmemdup_nul(). It
> > returns NULL when fails. So 'arg' should be checked.
> >
> > Signed-off-by: Gen Zhang <blackgod016574@gmail.com>
> > Fixes: 99dbbb593fe6 ("selinux: rewrite selinux_sb_eat_lsm_opts()")
> > ---
> > diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
> > index 3ec702c..5a9e959 100644
> > --- a/security/selinux/hooks.c
> > +++ b/security/selinux/hooks.c
> > @@ -2635,6 +2635,8 @@ static int selinux_sb_eat_lsm_opts(char *options, void **mnt_opts)
> > *q++ = c;
> > }
> > arg = kmemdup_nul(arg, q - arg, GFP_KERNEL);
> > + if (!arg)
> > + return -ENOMEM;
Yeah -ENOMEM is correct here. Ack by me.
> > }
> > rc = selinux_add_opt(token, arg, mnt_opts);
> > if (unlikely(rc)) {
>
> Looking at the callers of security_sb_eat_lsm_opts() (which is the
> function that eventually calls the selinux_sb_eat_lsm_opts() hook),
> -ENOMEM should be appropriate here.
>
> Reviewed-by: Ondrej Mosnacek <omosnace@redhat.com>
>
> --
> Ondrej Mosnacek <omosnace at redhat dot com>
> Software Engineer, Security Technologies
> Red Hat, Inc.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] hooks: fix a missing-check bug in selinux_sb_eat_lsm_opts()
2019-05-30 8:51 ` [PATCH v2] " Gen Zhang
@ 2019-05-30 11:52 ` Ondrej Mosnacek
2019-05-30 15:16 ` William Roberts
0 siblings, 1 reply; 6+ messages in thread
From: Ondrej Mosnacek @ 2019-05-30 11:52 UTC (permalink / raw)
To: Gen Zhang
Cc: Paul Moore, tony.luck, Stephen Smalley, Eric Paris, selinux,
Linux kernel mailing list, bpf
On Thu, May 30, 2019 at 10:51 AM Gen Zhang <blackgod016574@gmail.com> wrote:
> In selinux_sb_eat_lsm_opts(), 'arg' is allocated by kmemdup_nul(). It
> returns NULL when fails. So 'arg' should be checked.
>
> Signed-off-by: Gen Zhang <blackgod016574@gmail.com>
> Fixes: 99dbbb593fe6 ("selinux: rewrite selinux_sb_eat_lsm_opts()")
> ---
> diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
> index 3ec702c..5a9e959 100644
> --- a/security/selinux/hooks.c
> +++ b/security/selinux/hooks.c
> @@ -2635,6 +2635,8 @@ static int selinux_sb_eat_lsm_opts(char *options, void **mnt_opts)
> *q++ = c;
> }
> arg = kmemdup_nul(arg, q - arg, GFP_KERNEL);
> + if (!arg)
> + return -ENOMEM;
> }
> rc = selinux_add_opt(token, arg, mnt_opts);
> if (unlikely(rc)) {
Looking at the callers of security_sb_eat_lsm_opts() (which is the
function that eventually calls the selinux_sb_eat_lsm_opts() hook),
-ENOMEM should be appropriate here.
Reviewed-by: Ondrej Mosnacek <omosnace@redhat.com>
--
Ondrej Mosnacek <omosnace at redhat dot com>
Software Engineer, Security Technologies
Red Hat, Inc.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] hooks: fix a missing-check bug in selinux_sb_eat_lsm_opts()
2019-05-30 8:28 ` Ondrej Mosnacek
@ 2019-05-30 8:51 ` Gen Zhang
2019-05-30 11:52 ` Ondrej Mosnacek
0 siblings, 1 reply; 6+ messages in thread
From: Gen Zhang @ 2019-05-30 8:51 UTC (permalink / raw)
To: Ondrej Mosnacek
Cc: Paul Moore, tony.luck, Stephen Smalley, Eric Paris, selinux,
Linux kernel mailing list, bpf
In selinux_sb_eat_lsm_opts(), 'arg' is allocated by kmemdup_nul(). It
returns NULL when fails. So 'arg' should be checked.
Signed-off-by: Gen Zhang <blackgod016574@gmail.com>
Fixes: 99dbbb593fe6 ("selinux: rewrite selinux_sb_eat_lsm_opts()")
---
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 3ec702c..5a9e959 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2635,6 +2635,8 @@ static int selinux_sb_eat_lsm_opts(char *options, void **mnt_opts)
*q++ = c;
}
arg = kmemdup_nul(arg, q - arg, GFP_KERNEL);
+ if (!arg)
+ return -ENOMEM;
}
rc = selinux_add_opt(token, arg, mnt_opts);
if (unlikely(rc)) {
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-06-01 1:58 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-31 1:33 [PATCH v2] hooks: fix a missing-check bug in selinux_sb_eat_lsm_opts() Gen Zhang
2019-05-31 15:45 ` Paul Moore
2019-06-01 1:57 ` Gen Zhang
-- strict thread matches above, loose matches on Subject: below --
2019-05-30 3:53 [PATCH] " Gen Zhang
2019-05-30 8:28 ` Ondrej Mosnacek
2019-05-30 8:51 ` [PATCH v2] " Gen Zhang
2019-05-30 11:52 ` Ondrej Mosnacek
2019-05-30 15:16 ` William Roberts
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).