diff options
author | Eric Dumazet <edumazet@google.com> | 2017-02-03 11:03:26 +0300 |
---|---|---|
committer | Jiri Slaby <jslaby@suse.cz> | 2017-03-01 11:59:47 +0300 |
commit | 0bccd6e118c3613c9addaa053b4a6e8670f3940c (patch) | |
tree | aa0c04e316777593bee4e651deafb8ec106e7f13 /include | |
parent | e5a82d662d35933e5511c0280e8513d38d9d4fa0 (diff) | |
download | linux-0bccd6e118c3613c9addaa053b4a6e8670f3940c.tar.xz |
netlabel: out of bound access in cipso_v4_validate()
[ Upstream commit d71b7896886345c53ef1d84bda2bc758554f5d61 ]
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: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'include')
-rw-r--r-- | include/net/cipso_ipv4.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/net/cipso_ipv4.h b/include/net/cipso_ipv4.h index a8c2ef6d3b93..9078b31d336f 100644 --- a/include/net/cipso_ipv4.h +++ b/include/net/cipso_ipv4.h @@ -303,6 +303,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) || (opt[opt_iter + 1] > (opt_len - opt_iter))) { err_offset = opt_iter + 1; |