* [PATCH net] selinux: add the missing walk_size + len check in selinux_sctp_bind_connect
@ 2019-03-08 16:07 ` Xin Long
0 siblings, 0 replies; 10+ messages in thread
From: Xin Long @ 2019-03-08 16:07 UTC (permalink / raw)
To: selinux, network dev, linux-sctp
Cc: Marcelo Ricardo Leitner, Neil Horman, Paul Moore, Richard Haines
As does in __sctp_connect(), when checking addrs in a while loop, after
get the addr len according to sa_family, it's necessary to do the check
walk_size + af->sockaddr_len > addrs_size to make sure it won't access
an out-of-bounds addr.
The same thing is needed in selinux_sctp_bind_connect(), otherwise an
out-of-bounds issue can be triggered:
[14548.772313] BUG: KASAN: slab-out-of-bounds in selinux_sctp_bind_connect+0x1aa/0x1f0
[14548.927083] Call Trace:
[14548.938072] dump_stack+0x9a/0xe9
[14548.953015] print_address_description+0x65/0x22e
[14548.996524] kasan_report.cold.6+0x92/0x1a6
[14549.015335] selinux_sctp_bind_connect+0x1aa/0x1f0
[14549.036947] security_sctp_bind_connect+0x58/0x90
[14549.058142] __sctp_setsockopt_connectx+0x5a/0x150 [sctp]
[14549.081650] sctp_setsockopt.part.24+0x1322/0x3ce0 [sctp]
Fixes: d452930fd3b9 ("selinux: Add SCTP support")
Reported-by: Chunyu Hu <chuhu@redhat.com>
Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
security/selinux/hooks.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index f0e36c3..dac9bdb 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -5120,6 +5120,9 @@ static int selinux_sctp_bind_connect(struct sock *sk, int optname,
return -EINVAL;
}
+ if (walk_size + len > addrlen)
+ return -EINVAL;
+
err = -EINVAL;
switch (optname) {
/* Bind checks */
--
2.1.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH net] selinux: add the missing walk_size + len check in selinux_sctp_bind_connect
@ 2019-03-08 16:07 ` Xin Long
0 siblings, 0 replies; 10+ messages in thread
From: Xin Long @ 2019-03-08 16:07 UTC (permalink / raw)
To: selinux, network dev, linux-sctp
Cc: Marcelo Ricardo Leitner, Neil Horman, Paul Moore, Richard Haines
As does in __sctp_connect(), when checking addrs in a while loop, after
get the addr len according to sa_family, it's necessary to do the check
walk_size + af->sockaddr_len > addrs_size to make sure it won't access
an out-of-bounds addr.
The same thing is needed in selinux_sctp_bind_connect(), otherwise an
out-of-bounds issue can be triggered:
[14548.772313] BUG: KASAN: slab-out-of-bounds in selinux_sctp_bind_connect+0x1aa/0x1f0
[14548.927083] Call Trace:
[14548.938072] dump_stack+0x9a/0xe9
[14548.953015] print_address_description+0x65/0x22e
[14548.996524] kasan_report.cold.6+0x92/0x1a6
[14549.015335] selinux_sctp_bind_connect+0x1aa/0x1f0
[14549.036947] security_sctp_bind_connect+0x58/0x90
[14549.058142] __sctp_setsockopt_connectx+0x5a/0x150 [sctp]
[14549.081650] sctp_setsockopt.part.24+0x1322/0x3ce0 [sctp]
Fixes: d452930fd3b9 ("selinux: Add SCTP support")
Reported-by: Chunyu Hu <chuhu@redhat.com>
Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
security/selinux/hooks.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index f0e36c3..dac9bdb 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -5120,6 +5120,9 @@ static int selinux_sctp_bind_connect(struct sock *sk, int optname,
return -EINVAL;
}
+ if (walk_size + len > addrlen)
+ return -EINVAL;
+
err = -EINVAL;
switch (optname) {
/* Bind checks */
--
2.1.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH net] selinux: add the missing walk_size + len check in selinux_sctp_bind_connect
2019-03-08 16:07 ` Xin Long
@ 2019-03-08 17:08 ` Marcelo Ricardo Leitner
-1 siblings, 0 replies; 10+ messages in thread
From: Marcelo Ricardo Leitner @ 2019-03-08 17:08 UTC (permalink / raw)
To: Xin Long
Cc: selinux, network dev, linux-sctp, Neil Horman, Paul Moore,
Richard Haines
On Sat, Mar 09, 2019 at 12:07:34AM +0800, Xin Long wrote:
> As does in __sctp_connect(), when checking addrs in a while loop, after
> get the addr len according to sa_family, it's necessary to do the check
> walk_size + af->sockaddr_len > addrs_size to make sure it won't access
> an out-of-bounds addr.
>
> The same thing is needed in selinux_sctp_bind_connect(), otherwise an
> out-of-bounds issue can be triggered:
>
> [14548.772313] BUG: KASAN: slab-out-of-bounds in selinux_sctp_bind_connect+0x1aa/0x1f0
> [14548.927083] Call Trace:
> [14548.938072] dump_stack+0x9a/0xe9
> [14548.953015] print_address_description+0x65/0x22e
> [14548.996524] kasan_report.cold.6+0x92/0x1a6
> [14549.015335] selinux_sctp_bind_connect+0x1aa/0x1f0
> [14549.036947] security_sctp_bind_connect+0x58/0x90
> [14549.058142] __sctp_setsockopt_connectx+0x5a/0x150 [sctp]
> [14549.081650] sctp_setsockopt.part.24+0x1322/0x3ce0 [sctp]
>
> Fixes: d452930fd3b9 ("selinux: Add SCTP support")
> Reported-by: Chunyu Hu <chuhu@redhat.com>
> Signed-off-by: Xin Long <lucien.xin@gmail.com>
Reviewed-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Paul, how can we get this into -stable trees? SELinux process may be
different from -net trees.
> ---
> security/selinux/hooks.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
> index f0e36c3..dac9bdb 100644
> --- a/security/selinux/hooks.c
> +++ b/security/selinux/hooks.c
> @@ -5120,6 +5120,9 @@ static int selinux_sctp_bind_connect(struct sock *sk, int optname,
> return -EINVAL;
> }
>
> + if (walk_size + len > addrlen)
> + return -EINVAL;
> +
> err = -EINVAL;
> switch (optname) {
> /* Bind checks */
> --
> 2.1.0
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH net] selinux: add the missing walk_size + len check in selinux_sctp_bind_connect
@ 2019-03-08 17:08 ` Marcelo Ricardo Leitner
0 siblings, 0 replies; 10+ messages in thread
From: Marcelo Ricardo Leitner @ 2019-03-08 17:08 UTC (permalink / raw)
To: Xin Long
Cc: selinux, network dev, linux-sctp, Neil Horman, Paul Moore,
Richard Haines
On Sat, Mar 09, 2019 at 12:07:34AM +0800, Xin Long wrote:
> As does in __sctp_connect(), when checking addrs in a while loop, after
> get the addr len according to sa_family, it's necessary to do the check
> walk_size + af->sockaddr_len > addrs_size to make sure it won't access
> an out-of-bounds addr.
>
> The same thing is needed in selinux_sctp_bind_connect(), otherwise an
> out-of-bounds issue can be triggered:
>
> [14548.772313] BUG: KASAN: slab-out-of-bounds in selinux_sctp_bind_connect+0x1aa/0x1f0
> [14548.927083] Call Trace:
> [14548.938072] dump_stack+0x9a/0xe9
> [14548.953015] print_address_description+0x65/0x22e
> [14548.996524] kasan_report.cold.6+0x92/0x1a6
> [14549.015335] selinux_sctp_bind_connect+0x1aa/0x1f0
> [14549.036947] security_sctp_bind_connect+0x58/0x90
> [14549.058142] __sctp_setsockopt_connectx+0x5a/0x150 [sctp]
> [14549.081650] sctp_setsockopt.part.24+0x1322/0x3ce0 [sctp]
>
> Fixes: d452930fd3b9 ("selinux: Add SCTP support")
> Reported-by: Chunyu Hu <chuhu@redhat.com>
> Signed-off-by: Xin Long <lucien.xin@gmail.com>
Reviewed-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Paul, how can we get this into -stable trees? SELinux process may be
different from -net trees.
> ---
> security/selinux/hooks.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
> index f0e36c3..dac9bdb 100644
> --- a/security/selinux/hooks.c
> +++ b/security/selinux/hooks.c
> @@ -5120,6 +5120,9 @@ static int selinux_sctp_bind_connect(struct sock *sk, int optname,
> return -EINVAL;
> }
>
> + if (walk_size + len > addrlen)
> + return -EINVAL;
> +
> err = -EINVAL;
> switch (optname) {
> /* Bind checks */
> --
> 2.1.0
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH net] selinux: add the missing walk_size + len check in selinux_sctp_bind_connect
2019-03-08 17:08 ` Marcelo Ricardo Leitner
@ 2019-03-09 2:47 ` Paul Moore
-1 siblings, 0 replies; 10+ messages in thread
From: Paul Moore @ 2019-03-09 2:47 UTC (permalink / raw)
To: Marcelo Ricardo Leitner, Xin Long
Cc: selinux, network dev, linux-sctp, Neil Horman, Richard Haines
On Fri, Mar 8, 2019 at 12:08 PM Marcelo Ricardo Leitner
<marcelo.leitner@gmail.com> wrote:
> On Sat, Mar 09, 2019 at 12:07:34AM +0800, Xin Long wrote:
> > As does in __sctp_connect(), when checking addrs in a while loop, after
> > get the addr len according to sa_family, it's necessary to do the check
> > walk_size + af->sockaddr_len > addrs_size to make sure it won't access
> > an out-of-bounds addr.
> >
> > The same thing is needed in selinux_sctp_bind_connect(), otherwise an
> > out-of-bounds issue can be triggered:
> >
> > [14548.772313] BUG: KASAN: slab-out-of-bounds in selinux_sctp_bind_connect+0x1aa/0x1f0
> > [14548.927083] Call Trace:
> > [14548.938072] dump_stack+0x9a/0xe9
> > [14548.953015] print_address_description+0x65/0x22e
> > [14548.996524] kasan_report.cold.6+0x92/0x1a6
> > [14549.015335] selinux_sctp_bind_connect+0x1aa/0x1f0
> > [14549.036947] security_sctp_bind_connect+0x58/0x90
> > [14549.058142] __sctp_setsockopt_connectx+0x5a/0x150 [sctp]
> > [14549.081650] sctp_setsockopt.part.24+0x1322/0x3ce0 [sctp]
> >
> > Fixes: d452930fd3b9 ("selinux: Add SCTP support")
> > Reported-by: Chunyu Hu <chuhu@redhat.com>
> > Signed-off-by: Xin Long <lucien.xin@gmail.com>
>
> Reviewed-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Thanks, this patch looks good to me.
> Paul, how can we get this into -stable trees? SELinux process may be
> different from -net trees.
For patches that warrant inclusion in -stable, I merge them into the
current selinux/stable-X.Y and send it up to Linus once it passes some
basic sanity tests. Since we're still only half-way through the merge
window, and this is an obvious bug fix, I think this qualifies as
-stable material.
I'm traveling at the moment with not-so-great connectivity, but I'll
get this merged and verified early next week.
--
paul moore
www.paul-moore.com
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH net] selinux: add the missing walk_size + len check in selinux_sctp_bind_connect
@ 2019-03-09 2:47 ` Paul Moore
0 siblings, 0 replies; 10+ messages in thread
From: Paul Moore @ 2019-03-09 2:47 UTC (permalink / raw)
To: Marcelo Ricardo Leitner, Xin Long
Cc: selinux, network dev, linux-sctp, Neil Horman, Richard Haines
On Fri, Mar 8, 2019 at 12:08 PM Marcelo Ricardo Leitner
<marcelo.leitner@gmail.com> wrote:
> On Sat, Mar 09, 2019 at 12:07:34AM +0800, Xin Long wrote:
> > As does in __sctp_connect(), when checking addrs in a while loop, after
> > get the addr len according to sa_family, it's necessary to do the check
> > walk_size + af->sockaddr_len > addrs_size to make sure it won't access
> > an out-of-bounds addr.
> >
> > The same thing is needed in selinux_sctp_bind_connect(), otherwise an
> > out-of-bounds issue can be triggered:
> >
> > [14548.772313] BUG: KASAN: slab-out-of-bounds in selinux_sctp_bind_connect+0x1aa/0x1f0
> > [14548.927083] Call Trace:
> > [14548.938072] dump_stack+0x9a/0xe9
> > [14548.953015] print_address_description+0x65/0x22e
> > [14548.996524] kasan_report.cold.6+0x92/0x1a6
> > [14549.015335] selinux_sctp_bind_connect+0x1aa/0x1f0
> > [14549.036947] security_sctp_bind_connect+0x58/0x90
> > [14549.058142] __sctp_setsockopt_connectx+0x5a/0x150 [sctp]
> > [14549.081650] sctp_setsockopt.part.24+0x1322/0x3ce0 [sctp]
> >
> > Fixes: d452930fd3b9 ("selinux: Add SCTP support")
> > Reported-by: Chunyu Hu <chuhu@redhat.com>
> > Signed-off-by: Xin Long <lucien.xin@gmail.com>
>
> Reviewed-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Thanks, this patch looks good to me.
> Paul, how can we get this into -stable trees? SELinux process may be
> different from -net trees.
For patches that warrant inclusion in -stable, I merge them into the
current selinux/stable-X.Y and send it up to Linus once it passes some
basic sanity tests. Since we're still only half-way through the merge
window, and this is an obvious bug fix, I think this qualifies as
-stable material.
I'm traveling at the moment with not-so-great connectivity, but I'll
get this merged and verified early next week.
--
paul moore
www.paul-moore.com
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH net] selinux: add the missing walk_size + len check in selinux_sctp_bind_connect
2019-03-09 2:47 ` Paul Moore
@ 2019-03-11 20:11 ` Paul Moore
-1 siblings, 0 replies; 10+ messages in thread
From: Paul Moore @ 2019-03-11 20:11 UTC (permalink / raw)
To: Marcelo Ricardo Leitner, Xin Long
Cc: selinux, network dev, linux-sctp, Neil Horman, Richard Haines
On Fri, Mar 8, 2019 at 9:47 PM Paul Moore <paul@paul-moore.com> wrote:
> On Fri, Mar 8, 2019 at 12:08 PM Marcelo Ricardo Leitner
> <marcelo.leitner@gmail.com> wrote:
> > On Sat, Mar 09, 2019 at 12:07:34AM +0800, Xin Long wrote:
> > > As does in __sctp_connect(), when checking addrs in a while loop, after
> > > get the addr len according to sa_family, it's necessary to do the check
> > > walk_size + af->sockaddr_len > addrs_size to make sure it won't access
> > > an out-of-bounds addr.
> > >
> > > The same thing is needed in selinux_sctp_bind_connect(), otherwise an
> > > out-of-bounds issue can be triggered:
> > >
> > > [14548.772313] BUG: KASAN: slab-out-of-bounds in selinux_sctp_bind_connect+0x1aa/0x1f0
> > > [14548.927083] Call Trace:
> > > [14548.938072] dump_stack+0x9a/0xe9
> > > [14548.953015] print_address_description+0x65/0x22e
> > > [14548.996524] kasan_report.cold.6+0x92/0x1a6
> > > [14549.015335] selinux_sctp_bind_connect+0x1aa/0x1f0
> > > [14549.036947] security_sctp_bind_connect+0x58/0x90
> > > [14549.058142] __sctp_setsockopt_connectx+0x5a/0x150 [sctp]
> > > [14549.081650] sctp_setsockopt.part.24+0x1322/0x3ce0 [sctp]
> > >
> > > Fixes: d452930fd3b9 ("selinux: Add SCTP support")
> > > Reported-by: Chunyu Hu <chuhu@redhat.com>
> > > Signed-off-by: Xin Long <lucien.xin@gmail.com>
> >
> > Reviewed-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
>
> Thanks, this patch looks good to me.
>
> > Paul, how can we get this into -stable trees? SELinux process may be
> > different from -net trees.
>
> For patches that warrant inclusion in -stable, I merge them into the
> current selinux/stable-X.Y and send it up to Linus once it passes some
> basic sanity tests. Since we're still only half-way through the merge
> window, and this is an obvious bug fix, I think this qualifies as
> -stable material.
>
> I'm traveling at the moment with not-so-great connectivity, but I'll
> get this merged and verified early next week.
FYI, I just merged this into selinux/stable-5.1. Assuming it tests
okay (and I can't imagine it would cause a regression), I'll send it
to Linus tomorrow.
--
paul moore
www.paul-moore.com
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH net] selinux: add the missing walk_size + len check in selinux_sctp_bind_connect
@ 2019-03-11 20:11 ` Paul Moore
0 siblings, 0 replies; 10+ messages in thread
From: Paul Moore @ 2019-03-11 20:11 UTC (permalink / raw)
To: Marcelo Ricardo Leitner, Xin Long
Cc: selinux, network dev, linux-sctp, Neil Horman, Richard Haines
On Fri, Mar 8, 2019 at 9:47 PM Paul Moore <paul@paul-moore.com> wrote:
> On Fri, Mar 8, 2019 at 12:08 PM Marcelo Ricardo Leitner
> <marcelo.leitner@gmail.com> wrote:
> > On Sat, Mar 09, 2019 at 12:07:34AM +0800, Xin Long wrote:
> > > As does in __sctp_connect(), when checking addrs in a while loop, after
> > > get the addr len according to sa_family, it's necessary to do the check
> > > walk_size + af->sockaddr_len > addrs_size to make sure it won't access
> > > an out-of-bounds addr.
> > >
> > > The same thing is needed in selinux_sctp_bind_connect(), otherwise an
> > > out-of-bounds issue can be triggered:
> > >
> > > [14548.772313] BUG: KASAN: slab-out-of-bounds in selinux_sctp_bind_connect+0x1aa/0x1f0
> > > [14548.927083] Call Trace:
> > > [14548.938072] dump_stack+0x9a/0xe9
> > > [14548.953015] print_address_description+0x65/0x22e
> > > [14548.996524] kasan_report.cold.6+0x92/0x1a6
> > > [14549.015335] selinux_sctp_bind_connect+0x1aa/0x1f0
> > > [14549.036947] security_sctp_bind_connect+0x58/0x90
> > > [14549.058142] __sctp_setsockopt_connectx+0x5a/0x150 [sctp]
> > > [14549.081650] sctp_setsockopt.part.24+0x1322/0x3ce0 [sctp]
> > >
> > > Fixes: d452930fd3b9 ("selinux: Add SCTP support")
> > > Reported-by: Chunyu Hu <chuhu@redhat.com>
> > > Signed-off-by: Xin Long <lucien.xin@gmail.com>
> >
> > Reviewed-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
>
> Thanks, this patch looks good to me.
>
> > Paul, how can we get this into -stable trees? SELinux process may be
> > different from -net trees.
>
> For patches that warrant inclusion in -stable, I merge them into the
> current selinux/stable-X.Y and send it up to Linus once it passes some
> basic sanity tests. Since we're still only half-way through the merge
> window, and this is an obvious bug fix, I think this qualifies as
> -stable material.
>
> I'm traveling at the moment with not-so-great connectivity, but I'll
> get this merged and verified early next week.
FYI, I just merged this into selinux/stable-5.1. Assuming it tests
okay (and I can't imagine it would cause a regression), I'll send it
to Linus tomorrow.
--
paul moore
www.paul-moore.com
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH net] selinux: add the missing walk_size + len check in selinux_sctp_bind_connect
2019-03-11 20:11 ` Paul Moore
@ 2019-03-11 23:49 ` Marcelo Ricardo Leitner
-1 siblings, 0 replies; 10+ messages in thread
From: Marcelo Ricardo Leitner @ 2019-03-11 23:49 UTC (permalink / raw)
To: Paul Moore
Cc: Xin Long, selinux, network dev, linux-sctp, Neil Horman, Richard Haines
On Mon, Mar 11, 2019 at 04:11:32PM -0400, Paul Moore wrote:
> On Fri, Mar 8, 2019 at 9:47 PM Paul Moore <paul@paul-moore.com> wrote:
> > On Fri, Mar 8, 2019 at 12:08 PM Marcelo Ricardo Leitner
> > <marcelo.leitner@gmail.com> wrote:
> > > On Sat, Mar 09, 2019 at 12:07:34AM +0800, Xin Long wrote:
> > > > As does in __sctp_connect(), when checking addrs in a while loop, after
> > > > get the addr len according to sa_family, it's necessary to do the check
> > > > walk_size + af->sockaddr_len > addrs_size to make sure it won't access
> > > > an out-of-bounds addr.
> > > >
> > > > The same thing is needed in selinux_sctp_bind_connect(), otherwise an
> > > > out-of-bounds issue can be triggered:
> > > >
> > > > [14548.772313] BUG: KASAN: slab-out-of-bounds in selinux_sctp_bind_connect+0x1aa/0x1f0
> > > > [14548.927083] Call Trace:
> > > > [14548.938072] dump_stack+0x9a/0xe9
> > > > [14548.953015] print_address_description+0x65/0x22e
> > > > [14548.996524] kasan_report.cold.6+0x92/0x1a6
> > > > [14549.015335] selinux_sctp_bind_connect+0x1aa/0x1f0
> > > > [14549.036947] security_sctp_bind_connect+0x58/0x90
> > > > [14549.058142] __sctp_setsockopt_connectx+0x5a/0x150 [sctp]
> > > > [14549.081650] sctp_setsockopt.part.24+0x1322/0x3ce0 [sctp]
> > > >
> > > > Fixes: d452930fd3b9 ("selinux: Add SCTP support")
> > > > Reported-by: Chunyu Hu <chuhu@redhat.com>
> > > > Signed-off-by: Xin Long <lucien.xin@gmail.com>
> > >
> > > Reviewed-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
> >
> > Thanks, this patch looks good to me.
> >
> > > Paul, how can we get this into -stable trees? SELinux process may be
> > > different from -net trees.
> >
> > For patches that warrant inclusion in -stable, I merge them into the
> > current selinux/stable-X.Y and send it up to Linus once it passes some
> > basic sanity tests. Since we're still only half-way through the merge
> > window, and this is an obvious bug fix, I think this qualifies as
> > -stable material.
> >
> > I'm traveling at the moment with not-so-great connectivity, but I'll
> > get this merged and verified early next week.
>
> FYI, I just merged this into selinux/stable-5.1. Assuming it tests
> okay (and I can't imagine it would cause a regression), I'll send it
> to Linus tomorrow.
Thanks Paul.
Marcelo
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH net] selinux: add the missing walk_size + len check in selinux_sctp_bind_connect
@ 2019-03-11 23:49 ` Marcelo Ricardo Leitner
0 siblings, 0 replies; 10+ messages in thread
From: Marcelo Ricardo Leitner @ 2019-03-11 23:49 UTC (permalink / raw)
To: Paul Moore
Cc: Xin Long, selinux, network dev, linux-sctp, Neil Horman, Richard Haines
On Mon, Mar 11, 2019 at 04:11:32PM -0400, Paul Moore wrote:
> On Fri, Mar 8, 2019 at 9:47 PM Paul Moore <paul@paul-moore.com> wrote:
> > On Fri, Mar 8, 2019 at 12:08 PM Marcelo Ricardo Leitner
> > <marcelo.leitner@gmail.com> wrote:
> > > On Sat, Mar 09, 2019 at 12:07:34AM +0800, Xin Long wrote:
> > > > As does in __sctp_connect(), when checking addrs in a while loop, after
> > > > get the addr len according to sa_family, it's necessary to do the check
> > > > walk_size + af->sockaddr_len > addrs_size to make sure it won't access
> > > > an out-of-bounds addr.
> > > >
> > > > The same thing is needed in selinux_sctp_bind_connect(), otherwise an
> > > > out-of-bounds issue can be triggered:
> > > >
> > > > [14548.772313] BUG: KASAN: slab-out-of-bounds in selinux_sctp_bind_connect+0x1aa/0x1f0
> > > > [14548.927083] Call Trace:
> > > > [14548.938072] dump_stack+0x9a/0xe9
> > > > [14548.953015] print_address_description+0x65/0x22e
> > > > [14548.996524] kasan_report.cold.6+0x92/0x1a6
> > > > [14549.015335] selinux_sctp_bind_connect+0x1aa/0x1f0
> > > > [14549.036947] security_sctp_bind_connect+0x58/0x90
> > > > [14549.058142] __sctp_setsockopt_connectx+0x5a/0x150 [sctp]
> > > > [14549.081650] sctp_setsockopt.part.24+0x1322/0x3ce0 [sctp]
> > > >
> > > > Fixes: d452930fd3b9 ("selinux: Add SCTP support")
> > > > Reported-by: Chunyu Hu <chuhu@redhat.com>
> > > > Signed-off-by: Xin Long <lucien.xin@gmail.com>
> > >
> > > Reviewed-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
> >
> > Thanks, this patch looks good to me.
> >
> > > Paul, how can we get this into -stable trees? SELinux process may be
> > > different from -net trees.
> >
> > For patches that warrant inclusion in -stable, I merge them into the
> > current selinux/stable-X.Y and send it up to Linus once it passes some
> > basic sanity tests. Since we're still only half-way through the merge
> > window, and this is an obvious bug fix, I think this qualifies as
> > -stable material.
> >
> > I'm traveling at the moment with not-so-great connectivity, but I'll
> > get this merged and verified early next week.
>
> FYI, I just merged this into selinux/stable-5.1. Assuming it tests
> okay (and I can't imagine it would cause a regression), I'll send it
> to Linus tomorrow.
Thanks Paul.
Marcelo
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2019-03-11 23:49 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-08 16:07 [PATCH net] selinux: add the missing walk_size + len check in selinux_sctp_bind_connect Xin Long
2019-03-08 16:07 ` Xin Long
2019-03-08 17:08 ` Marcelo Ricardo Leitner
2019-03-08 17:08 ` Marcelo Ricardo Leitner
2019-03-09 2:47 ` Paul Moore
2019-03-09 2:47 ` Paul Moore
2019-03-11 20:11 ` Paul Moore
2019-03-11 20:11 ` Paul Moore
2019-03-11 23:49 ` Marcelo Ricardo Leitner
2019-03-11 23:49 ` Marcelo Ricardo Leitner
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.