diff mbox series

net: udp: Fix wrong clean up for IS_UDPLITE macro

Message ID 1595322704-31548-1-git-send-email-linmiaohe@huawei.com
State Accepted
Delegated to: David Miller
Headers show
Series net: udp: Fix wrong clean up for IS_UDPLITE macro | expand

Commit Message

Miaohe Lin July 21, 2020, 9:11 a.m. UTC 
From: Miaohe Lin <linmiaohe@huawei.com>

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

Fixes: b2bf1e2659b1 ("[UDP]: Clean up for IS_UDPLITE macro")
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
---
 net/ipv4/udp.c | 2 +-
 net/ipv6/udp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

David Miller July 21, 2020, 10:42 p.m. UTC | #1 
From: linmiaohe <linmiaohe@huawei.com>
Date: Tue, 21 Jul 2020 17:11:44 +0800

> From: Miaohe Lin <linmiaohe@huawei.com>
> 
> We can't use IS_UDPLITE to replace udp_sk->pcflag when UDPLITE_RECV_CC is
> checked.
> 
> Fixes: b2bf1e2659b1 ("[UDP]: Clean up for IS_UDPLITE macro")
> Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>

Applied and queued up for -stable, thanks.
diff mbox series

Patch

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 1b7ebbcae497..c7d61db1fb38 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -2051,7 +2051,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
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 7d4151747340..1164dfe53bb3 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -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",