* [PATCH net] netlabel: out of bound access in cipso_v4_validate()
@ 2017-02-03 8:03 Eric Dumazet
2017-02-03 23:26 ` Paul Moore
2017-02-05 0:45 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Eric Dumazet @ 2017-02-03 8:03 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Paul Moore, Dmitry Vyukov
From: Eric Dumazet <edumazet@google.com>
syzkaller found another out of bound access in ip_options_compile(),
or more exactly in cipso_v4_validate()
Fixes: 20e2a8648596 ("cipso: handle CIPSO options correctly when NetLabel is disabled")
Fixes: 446fda4f2682 ("[NetLabel]: CIPSOv4 engine")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Dmitry Vyukov <dvyukov@google.com>
Cc: Paul Moore <paul@paul-moore.com>
---
include/net/cipso_ipv4.h | 4 ++++
net/ipv4/cipso_ipv4.c | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/include/net/cipso_ipv4.h b/include/net/cipso_ipv4.h
index 3ebb168b9afc68ad639b5d32f6182a845c83d759..a34b141f125f0032662f147b598c9fef4fb4bcef 100644
--- a/include/net/cipso_ipv4.h
+++ b/include/net/cipso_ipv4.h
@@ -309,6 +309,10 @@ static inline int cipso_v4_validate(const struct sk_buff *skb,
}
for (opt_iter = 6; opt_iter < opt_len;) {
+ if (opt_iter + 1 == opt_len) {
+ err_offset = opt_iter;
+ goto out;
+ }
tag_len = opt[opt_iter + 1];
if ((tag_len == 0) || (tag_len > (opt_len - opt_iter))) {
err_offset = opt_iter + 1;
diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c
index 72d6f056d863603c959e1d04b9f863909a37c758..ae206163c273381ba6e8bd8a24fa050619a4a6ae 100644
--- a/net/ipv4/cipso_ipv4.c
+++ b/net/ipv4/cipso_ipv4.c
@@ -1587,6 +1587,10 @@ int cipso_v4_validate(const struct sk_buff *skb, unsigned char **option)
goto validate_return_locked;
}
+ if (opt_iter + 1 == opt_len) {
+ err_offset = opt_iter;
+ goto validate_return_locked;
+ }
tag_len = tag[1];
if (tag_len > (opt_len - opt_iter)) {
err_offset = opt_iter + 1;
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net] netlabel: out of bound access in cipso_v4_validate()
2017-02-03 8:03 [PATCH net] netlabel: out of bound access in cipso_v4_validate() Eric Dumazet
@ 2017-02-03 23:26 ` Paul Moore
2017-02-05 0:45 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Paul Moore @ 2017-02-03 23:26 UTC (permalink / raw)
To: Eric Dumazet, David Miller, Dmitry Vyukov; +Cc: netdev
On Fri, Feb 3, 2017 at 3:03 AM, Eric Dumazet <eric.dumazet@gmail.com> wrote:
> From: Eric Dumazet <edumazet@google.com>
>
> syzkaller found another out of bound access in ip_options_compile(),
> or more exactly in cipso_v4_validate()
>
> Fixes: 20e2a8648596 ("cipso: handle CIPSO options correctly when NetLabel is disabled")
> Fixes: 446fda4f2682 ("[NetLabel]: CIPSOv4 engine")
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Reported-by: Dmitry Vyukov <dvyukov@google.com>
> Cc: Paul Moore <paul@paul-moore.com>
> ---
> include/net/cipso_ipv4.h | 4 ++++
> net/ipv4/cipso_ipv4.c | 4 ++++
> 2 files changed, 8 insertions(+)
Thanks guys.
Acked-by: Paul Moore <paul@paul-moore.com>
> diff --git a/include/net/cipso_ipv4.h b/include/net/cipso_ipv4.h
> index 3ebb168b9afc68ad639b5d32f6182a845c83d759..a34b141f125f0032662f147b598c9fef4fb4bcef 100644
> --- a/include/net/cipso_ipv4.h
> +++ b/include/net/cipso_ipv4.h
> @@ -309,6 +309,10 @@ static inline int cipso_v4_validate(const struct sk_buff *skb,
> }
>
> for (opt_iter = 6; opt_iter < opt_len;) {
> + if (opt_iter + 1 == opt_len) {
> + err_offset = opt_iter;
> + goto out;
> + }
> tag_len = opt[opt_iter + 1];
> if ((tag_len == 0) || (tag_len > (opt_len - opt_iter))) {
> err_offset = opt_iter + 1;
> diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c
> index 72d6f056d863603c959e1d04b9f863909a37c758..ae206163c273381ba6e8bd8a24fa050619a4a6ae 100644
> --- a/net/ipv4/cipso_ipv4.c
> +++ b/net/ipv4/cipso_ipv4.c
> @@ -1587,6 +1587,10 @@ int cipso_v4_validate(const struct sk_buff *skb, unsigned char **option)
> goto validate_return_locked;
> }
>
> + if (opt_iter + 1 == opt_len) {
> + err_offset = opt_iter;
> + goto validate_return_locked;
> + }
> tag_len = tag[1];
> if (tag_len > (opt_len - opt_iter)) {
> err_offset = opt_iter + 1;
>
>
--
paul moore
www.paul-moore.com
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net] netlabel: out of bound access in cipso_v4_validate()
2017-02-03 8:03 [PATCH net] netlabel: out of bound access in cipso_v4_validate() Eric Dumazet
2017-02-03 23:26 ` Paul Moore
@ 2017-02-05 0:45 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2017-02-05 0:45 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev, paul, dvyukov
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 03 Feb 2017 00:03:26 -0800
> From: Eric Dumazet <edumazet@google.com>
>
> syzkaller found another out of bound access in ip_options_compile(),
> or more exactly in cipso_v4_validate()
>
> Fixes: 20e2a8648596 ("cipso: handle CIPSO options correctly when NetLabel is disabled")
> Fixes: 446fda4f2682 ("[NetLabel]: CIPSOv4 engine")
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Reported-by: Dmitry Vyukov <dvyukov@google.com>
Applied and queued up for -stable.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-02-05 0:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-03 8:03 [PATCH net] netlabel: out of bound access in cipso_v4_validate() Eric Dumazet
2017-02-03 23:26 ` Paul Moore
2017-02-05 0:45 ` David Miller
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).