| From f8dae38f620aecd1b19502004dcb1793e88dea95 Mon Sep 17 00:00:00 2001 |
| From: Eric Dumazet <edumazet@google.com> |
| Date: Fri, 3 Feb 2017 00:03:26 -0800 |
| Subject: [PATCH] netlabel: out of bound access in cipso_v4_validate() |
| |
| commit d71b7896886345c53ef1d84bda2bc758554f5d61 upstream. |
| |
| 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> |
| Acked-by: Paul Moore <paul@paul-moore.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/include/net/cipso_ipv4.h b/include/net/cipso_ipv4.h |
| index 3ebb168b9afc..a34b141f125f 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 72d6f056d863..ae206163c273 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; |
| -- |
| 2.12.0 |
| |
