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

Commit 925615ce authored by David Lebrun's avatar David Lebrun Committed by David S. Miller
Browse files

ipv6: sr: allow SRH insertion with arbitrary segments_left value 



The seg6_validate_srh() function only allows SRHs whose active segment is
the first segment of the path. However, an application may insert an SRH
whose active segment is not the first one. Such an application might be
for example an SR-aware Virtual Network Function.

This patch enables to insert SRHs with an arbitrary active segment.

Signed-off-by: default avatarDavid Lebrun <david.lebrun@uclouvain.be>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4cc7b954

net/ipv6/exthdrs.c

+2 −2
Original line number Diff line number Diff line
@@ -882,7 +882,7 @@ static void ipv6_push_rthdr4(struct sk_buff *skb, u8 *proto, 
	       (hops - 1) * sizeof(struct in6_addr));



	sr_phdr->segments[0] = **addr_p;

	*addr_p = &sr_ihdr->segments[hops - 1];

	*addr_p = &sr_ihdr->segments[sr_ihdr->segments_left];



#ifdef CONFIG_IPV6_SEG6_HMAC

	if (sr_has_hmac(sr_phdr)) {
@@ -1174,7 +1174,7 @@ struct in6_addr *fl6_update_dst(struct flowi6 *fl6, 
	{

		struct ipv6_sr_hdr *srh = (struct ipv6_sr_hdr *)opt->srcrt;



		fl6->daddr = srh->segments[srh->first_segment];

		fl6->daddr = srh->segments[srh->segments_left];

		break;

	}

	default:

net/ipv6/seg6.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ bool seg6_validate_srh(struct ipv6_sr_hdr *srh, int len) 
	if (((srh->hdrlen + 1) << 3) != len)

		return false;



	if (srh->segments_left != srh->first_segment)

	if (srh->segments_left > srh->first_segment)

		return false;



	tlv_offset = sizeof(*srh) + ((srh->first_segment + 1) << 4);