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

Commit ea9ef822 authored by Francesco Ruggeri's avatar Francesco Ruggeri Committed by Greg Kroah-Hartman
Browse files

ipv6: record frag_max_size in atomic fragments in input path 



[ Upstream commit e29f011e8fc04b2cdc742a2b9bbfa1b62518381a ]

Commit dbd1759e ("ipv6: on reassembly, record frag_max_size")
filled the frag_max_size field in IP6CB in the input path.
The field should also be filled in case of atomic fragments.

Fixes: dbd1759e ('ipv6: on reassembly, record frag_max_size')
Signed-off-by: default avatarFrancesco Ruggeri <fruggeri@arista.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 94e27016

net/ipv6/reassembly.c

+3 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ static int ipv6_frag_rcv(struct sk_buff *skb) 
	hdr = ipv6_hdr(skb);

	fhdr = (struct frag_hdr *)skb_transport_header(skb);



	if (!(fhdr->frag_off & htons(0xFFF9))) {

	if (!(fhdr->frag_off & htons(IP6_OFFSET | IP6_MF))) {

		/* It is not a fragmented frame */

		skb->transport_header += sizeof(struct frag_hdr);

		__IP6_INC_STATS(net,
@@ -355,6 +355,8 @@ static int ipv6_frag_rcv(struct sk_buff *skb) 


		IP6CB(skb)->nhoff = (u8 *)fhdr - skb_network_header(skb);

		IP6CB(skb)->flags |= IP6SKB_FRAGMENTED;

		IP6CB(skb)->frag_max_size = ntohs(hdr->payload_len) +

					    sizeof(struct ipv6hdr);

		return 1;

	}