Commit ec9c4215 authored Apr 25, 2017 by Sabrina Dubroca Committed by David S. Miller Apr 25, 2017

ipv6: fix source routing



Commit a149e7c7 ("ipv6: sr: add support for SRH injection through
setsockopt") introduced handling of IPV6_SRCRT_TYPE_4, but at the same
time restricted it to only IPV6_SRCRT_TYPE_0 and
IPV6_SRCRT_TYPE_4. Previously, ipv6_push_exthdr() and fl6_update_dst()
would also handle other values (ie STRICT and TYPE_2).

Restore previous source routing behavior, by handling IPV6_SRCRT_STRICT
and IPV6_SRCRT_TYPE_2 the same way as IPV6_SRCRT_TYPE_0 in
ipv6_push_exthdr() and fl6_update_dst().

Fixes: a149e7c7 ("ipv6: sr: add support for SRH injection through setsockopt")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Reviewed-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent c8fcd133

net/ipv6/exthdrs.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -909,6 +909,8 @@ static void ipv6_push_rthdr(struct sk_buff skb, u8 proto,
		{
		switch (opt->type) {
		case IPV6_SRCRT_TYPE_0:
		case IPV6_SRCRT_STRICT:
		case IPV6_SRCRT_TYPE_2:
		ipv6_push_rthdr0(skb, proto, opt, addr_p, saddr);
		break;
		case IPV6_SRCRT_TYPE_4:
		@@ -1163,6 +1165,8 @@ struct in6_addr fl6_update_dst(struct flowi6 fl6,

		switch (opt->srcrt->type) {
		case IPV6_SRCRT_TYPE_0:
		case IPV6_SRCRT_STRICT:
		case IPV6_SRCRT_TYPE_2:
		fl6->daddr = ((struct rt0_hdr )opt->srcrt)->addr;
		break;
		case IPV6_SRCRT_TYPE_4:

Admin message