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

Commit 168de409 authored by Willem de Bruijn's avatar Willem de Bruijn Committed by Greg Kroah-Hartman
Browse files

packet: do not set TP_STATUS_CSUM_VALID on CHECKSUM_COMPLETE 



[ Upstream commit b85f628aa158a653c006e9c1405a117baef8c868 ]

CHECKSUM_COMPLETE signals that skb->csum stores the sum over the
entire packet. It does not imply that an embedded l4 checksum
field has been validated.

Fixes: 682f048b ("af_packet: pass checksum validation status to the user")
Signed-off-by: default avatarWillem de Bruijn <willemb@google.com>
Link: https://lore.kernel.org/r/20221128161812.640098-1-willemdebruijn.kernel@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 16c244bc

net/packet/af_packet.c

+2 −4
Original line number Diff line number Diff line
@@ -2222,8 +2222,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, 
	if (skb->ip_summed == CHECKSUM_PARTIAL)

		status |= TP_STATUS_CSUMNOTREADY;

	else if (skb->pkt_type != PACKET_OUTGOING &&

		 (skb->ip_summed == CHECKSUM_COMPLETE ||

		  skb_csum_unnecessary(skb)))

		 skb_csum_unnecessary(skb))

		status |= TP_STATUS_CSUM_VALID;



	if (snaplen > res)
@@ -3451,8 +3450,7 @@ static int packet_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, 
		if (skb->ip_summed == CHECKSUM_PARTIAL)

			aux.tp_status |= TP_STATUS_CSUMNOTREADY;

		else if (skb->pkt_type != PACKET_OUTGOING &&

			 (skb->ip_summed == CHECKSUM_COMPLETE ||

			  skb_csum_unnecessary(skb)))

			 skb_csum_unnecessary(skb))

			aux.tp_status |= TP_STATUS_CSUM_VALID;



		aux.tp_len = origlen;