| From foo@baz Wed 29 Jul 2020 11:19:56 AM CEST |
| From: Miaohe Lin <linmiaohe@huawei.com> |
| Date: Tue, 21 Jul 2020 17:11:44 +0800 |
| Subject: net: udp: Fix wrong clean up for IS_UDPLITE macro |
| |
| From: Miaohe Lin <linmiaohe@huawei.com> |
| |
| [ Upstream commit b0a422772fec29811e293c7c0e6f991c0fd9241d ] |
| |
| 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> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/ipv4/udp.c | 2 +- |
| net/ipv6/udp.c | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/net/ipv4/udp.c |
| +++ b/net/ipv4/udp.c |
| @@ -2045,7 +2045,7 @@ static int udp_queue_rcv_one_skb(struct |
| /* |
| * 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 |
| --- a/net/ipv6/udp.c |
| +++ b/net/ipv6/udp.c |
| @@ -643,7 +643,7 @@ static int udpv6_queue_rcv_one_skb(struc |
| /* |
| * 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", |
