[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Sat, 12 Dec 2015 12:05:26 -0800
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: linux-kernel@...r.kernel.org
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
stable@...r.kernel.org, Francois Romieu <romieu@...zoreil.com>,
Dave Jones <davej@...emonkey.org.uk>,
Eric Dumazet <edumazet@...gle.com>,
Corinna Vinschen <vinschen@...hat.com>,
"David S. Miller" <davem@...emloft.net>
Subject: [PATCH 4.3 02/71] r8169: fix kasan reported skb use-after-free.
4.3-stable review patch. If anyone has any objections, please let me know.
------------------
From: =?UTF-8?q?fran=C3=A7ois=20romieu?= <romieu@...zoreil.com>
[ Upstream commit 39174291d8e8acfd1113214a943263aaa03c57c8 ]
Signed-off-by: Francois Romieu <romieu@...zoreil.com>
Reported-by: Dave Jones <davej@...emonkey.org.uk>
Fixes: d7d2d89d4b0af ("r8169: Add software counter for multicast packages")
Acked-by: Eric Dumazet <edumazet@...gle.com>
Acked-by: Corinna Vinschen <vinschen@...hat.com>
Signed-off-by: David S. Miller <davem@...emloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
drivers/net/ethernet/realtek/r8169.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -7429,15 +7429,15 @@ process_pkt:
rtl8169_rx_vlan_tag(desc, skb);
+ if (skb->pkt_type == PACKET_MULTICAST)
+ dev->stats.multicast++;
+
napi_gro_receive(&tp->napi, skb);
u64_stats_update_begin(&tp->rx_stats.syncp);
tp->rx_stats.packets++;
tp->rx_stats.bytes += pkt_size;
u64_stats_update_end(&tp->rx_stats.syncp);
-
- if (skb->pkt_type == PACKET_MULTICAST)
- dev->stats.multicast++;
}
release_descriptor:
desc->opts2 = 0;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists