Patch "ipv6: sr: fix TLVs not being copied using setsockopt" has been added to the 4.14-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
ipv6: sr: fix TLVs not being copied using setsockopt
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ipv6-sr-fix-tlvs-not-being-copied-using-setsockopt.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Sat Jan 13 10:51:05 CET 2018
From: Mathieu Xhonneux <[email protected]>
Date: Wed, 10 Jan 2018 13:35:49 +0000
Subject: ipv6: sr: fix TLVs not being copied using setsockopt
From: Mathieu Xhonneux <[email protected]>
[ Upstream commit ccc12b11c5332c84442ef120dcd631523be75089 ]
Function ipv6_push_rthdr4 allows to add an IPv6 Segment Routing Header to a socket through setsockopt, but the current implementation doesn't copy possible TLVs at the end of the SRH received from userspace.
Therefore, the execution of the following branch if (sr_has_hmac(sr_phdr)) { ... } will never complete since the len and type fields of a possible HMAC TLV are not copied, hence seg6_get_tlv_hmac will return an error, and the HMAC will not be computed.
This commit adds a memcpy in case TLVs have been appended to the SRH.
--- net/ipv6/exthdrs.c | 9 +++++++++ 1 file changed, 9 insertions(+)
net/ipv6/exthdrs.c +9 -0
@@ -884,6 +884,15 @@ static void ipv6_push_rthdr4(struct sk_b sr_phdr->segments[0 ] = **addr_p; *addr_p = &sr_ihdr->segments[sr_ihdr->segments_left]; +if (sr_ihdr->hdrlen > hops *2 ) { +int tlvs_offset, tlvs_length; + + tlvs_offset = (1 + hops *2 ) <<3 ; + tlvs_length = (sr_ihdr->hdrlen - hops *2 ) <<3 ; +memcpy ((char *)sr_phdr + tlvs_offset, + (char *)sr_ihdr + tlvs_offset, tlvs_length); + } +#ifdef CONFIG_IPV6_SEG6_HMAC if (sr_has_hmac (sr_phdr)) {struct net *net =NULL ;
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/ipv6-sr-fix-tlvs-not-being-copied-using-setsockopt.patch