gregkh at linuxfoundation.org
2020-May-07 16:39 UTC
[Bridge] Patch "net: bridge: don't increment tx_dropped in br_do_proxy_arp" has been added to the 4.4-stable tree
This is a note to let you know that I've just added the patch titled
net: bridge: don't increment tx_dropped in br_do_proxy_arp
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-bridge-don-t-increment-tx_dropped-in-br_do_proxy_arp.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable at vger.kernel.org> know about it.
>From 85a3d4a9356b595d5440c3f1bf07ee7cecca1567 Mon Sep 17 00:00:00 2001
From: Nikolay Aleksandrov <nikolay at cumulusnetworks.com>
Date: Tue, 30 Aug 2016 17:44:29 +0200
Subject: net: bridge: don't increment tx_dropped in br_do_proxy_arp
From: Nikolay Aleksandrov <nikolay at cumulusnetworks.com>
commit 85a3d4a9356b595d5440c3f1bf07ee7cecca1567 upstream.
pskb_may_pull may fail due to various reasons (e.g. alloc failure), but the
skb isn't changed/dropped and processing continues so we shouldn't
increment tx_dropped.
CC: Kyeyoon Park <kyeyoonp at codeaurora.org>
CC: Roopa Prabhu <roopa at cumulusnetworks.com>
CC: Stephen Hemminger <stephen at networkplumber.org>
CC: bridge at lists.linux-foundation.org
Fixes: 958501163ddd ("bridge: Add support for IEEE 802.11 Proxy ARP")
Signed-off-by: Nikolay Aleksandrov <nikolay at cumulusnetworks.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
net/bridge/br_input.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -78,13 +78,10 @@ static void br_do_proxy_arp(struct sk_bu
BR_INPUT_SKB_CB(skb)->proxyarp_replied = false;
- if (dev->flags & IFF_NOARP)
+ if ((dev->flags & IFF_NOARP) ||
+ !pskb_may_pull(skb, arp_hdr_len(dev)))
return;
- if (!pskb_may_pull(skb, arp_hdr_len(dev))) {
- dev->stats.tx_dropped++;
- return;
- }
parp = arp_hdr(skb);
if (parp->ar_pro != htons(ETH_P_IP) ||
Patches currently in stable-queue which might be from nikolay at
cumulusnetworks.com are
queue-4.4/bonding-prevent-out-of-bound-accesses.patch
queue-4.4/net-bridge-don-t-increment-tx_dropped-in-br_do_proxy_arp.patch