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

Commit ae30bd0a authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: udp: fix handling of CHECKSUM_COMPLETE packets"

parents 80e1574b f9fff569

net/core/datagram.c

+3 −2
Original line number Diff line number Diff line
@@ -810,8 +810,9 @@ int skb_copy_and_csum_datagram_msg(struct sk_buff *skb, 
			return -EINVAL;

		}



		if (unlikely(skb->ip_summed == CHECKSUM_COMPLETE))

			netdev_rx_csum_fault(skb->dev);

		if (unlikely(skb->ip_summed == CHECKSUM_COMPLETE) &&

		    !skb->csum_complete_sw)

			netdev_rx_csum_fault(NULL);

	}

	return 0;

fault:

net/ipv4/udp.c

+18 −2
Original line number Diff line number Diff line
@@ -2108,8 +2108,24 @@ static inline int udp4_csum_init(struct sk_buff *skb, struct udphdr *uh, 
	/* Note, we are only interested in != 0 or == 0, thus the

	 * force to int.

	 */

	return (__force int)skb_checksum_init_zero_check(skb, proto, uh->check,

	err = (__force int)skb_checksum_init_zero_check(skb, proto, uh->check,

							inet_compute_pseudo);

	if (err)

		return err;



	if (skb->ip_summed == CHECKSUM_COMPLETE && !skb->csum_valid) {

		/* If SW calculated the value, we know it's bad */

		if (skb->csum_complete_sw)

			return 1;



		/* HW says the value is bad. Let's validate that.

		 * skb->csum is no longer the full packet checksum,

		 * so don't treat it as such.

		 */

		skb_checksum_complete_unset(skb);

	}



	return 0;

}



/* wrapper for udp_queue_rcv_skb tacking care of csum conversion and

net/ipv6/ip6_checksum.c

+18 −2
Original line number Diff line number Diff line
@@ -88,8 +88,24 @@ int udp6_csum_init(struct sk_buff *skb, struct udphdr *uh, int proto) 
	 * Note, we are only interested in != 0 or == 0, thus the

	 * force to int.

	 */

	return (__force int)skb_checksum_init_zero_check(skb, proto, uh->check,

	err = (__force int)skb_checksum_init_zero_check(skb, proto, uh->check,

							ip6_compute_pseudo);

	if (err)

		return err;



	if (skb->ip_summed == CHECKSUM_COMPLETE && !skb->csum_valid) {

		/* If SW calculated the value, we know it's bad */

		if (skb->csum_complete_sw)

			return 1;



		/* HW says the value is bad. Let's validate that.

		 * skb->csum is no longer the full packet checksum,

		 * so don't treat is as such.

		 */

		skb_checksum_complete_unset(skb);

	}



	return 0;

}

EXPORT_SYMBOL(udp6_csum_init);