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

Commit 2bf797a8 authored Jul 21, 2020 by Miaohe Lin Committed by Greg Kroah-Hartman Jul 31, 2020

net: udp: Fix wrong clean up for IS_UDPLITE macro



[ Upstream commit b0a422772fec29811e293c7c0e6f991c0fd9241d ]

We can't use IS_UDPLITE to replace udp_sk->pcflag when UDPLITE_RECV_CC is
checked.

Fixes: b2bf1e26 ("[UDP]: Clean up for IS_UDPLITE macro")
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 274b40b6

net/ipv4/udp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2045,7 +2045,7 @@ static int udp_queue_rcv_one_skb(struct sock sk, struct sk_buff skb)
		/*
		* UDP-Lite specific tests, ignored on UDP sockets
		*/
		if ((is_udplite & UDPLITE_RECV_CC) && UDP_SKB_CB(skb)->partial_cov) {
		if ((up->pcflag & UDPLITE_RECV_CC) && UDP_SKB_CB(skb)->partial_cov) {

		/*
		* MIB statistics other than incrementing the error count are

net/ipv6/udp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -643,7 +643,7 @@ static int udpv6_queue_rcv_one_skb(struct sock sk, struct sk_buff skb)
		/*
		* UDP-Lite specific tests, ignored on UDP sockets (see net/ipv4/udp.c).
		*/
		if ((is_udplite & UDPLITE_RECV_CC) && UDP_SKB_CB(skb)->partial_cov) {
		if ((up->pcflag & UDPLITE_RECV_CC) && UDP_SKB_CB(skb)->partial_cov) {

		if (up->pcrlen == 0) { /* full coverage was set */
		net_dbg_ratelimited("UDPLITE6: partial coverage %d while full coverage %d requested\n",