diff options
| author | Eric Dumazet <edumazet@google.com> | 2017-02-03 09:03:26 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-05 01:44:22 +0100 |
| commit | d71b7896886345c53ef1d84bda2bc758554f5d61 (patch) | |
| tree | e89546d474872302fd1503e07f25bc48f6983039 /net/ipv4/cipso_ipv4.c | |
| parent | ipv4: keep skb->dst around in presence of IP options (diff) | |
| download | linux-d71b7896886345c53ef1d84bda2bc758554f5d61.tar.xz linux-d71b7896886345c53ef1d84bda2bc758554f5d61.zip | |
netlabel: out of bound access in cipso_v4_validate()
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>
Diffstat (limited to 'net/ipv4/cipso_ipv4.c')
| -rw-r--r-- | net/ipv4/cipso_ipv4.c | 4 |
1 files changed, 4 insertions, 0 deletions
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; |