[PATCH] ipv6: record frag_max_size in atomic fragments in input path

[PATCH] ipv6: record frag_max_size in atomic fragments in input path

[Francesco Ruggeri]

Commit dbd1759e6a9c ("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: dbd1759e6a9c ('ipv6: on reassembly, record frag_max_size')
Signed-off-by: Francesco Ruggeri <fruggeri@arista.com>
---
 net/ipv6/reassembly.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index 47a0dc46cbdb..28e44782c94d 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -343,7 +343,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,
@@ -351,6 +351,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;
 	}
 
-- 
2.28.0

Re: [PATCH] ipv6: record frag_max_size in atomic fragments in input path

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net.git (refs/heads/master):

On Fri, 21 May 2021 13:21:14 -0700 you wrote:
> Commit dbd1759e6a9c ("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: dbd1759e6a9c ('ipv6: on reassembly, record frag_max_size')
> Signed-off-by: Francesco Ruggeri <fruggeri@arista.com>
> 
> [...]

Here is the summary with links:
  - ipv6: record frag_max_size in atomic fragments in input path
    https://git.kernel.org/netdev/net/c/e29f011e8fc0

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html