Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d71b7896 authored Feb 03, 2017 by Eric Dumazet Committed by David S. Miller Feb 04, 2017

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: 20e2a864 ("cipso: handle CIPSO options correctly when NetLabel is disabled")
Fixes: 446fda4f ("[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>

parent 34b2cef2

include/net/cipso_ipv4.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -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;

net/ipv4/cipso_ipv4.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -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;