提交 02ebfae2 编写于 作者: Y YueHaibing 提交者: sanglipeng

net: hsr: Fix potential use-after-free

stable inclusion
from stable-v5.10.158
commit 7ca81a161e406834a1fdc405fc83a572bd14b8d9
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7NTXH

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7ca81a161e406834a1fdc405fc83a572bd14b8d9

--------------------------------

[ Upstream commit 7e177d32 ]

The skb is delivered to netif_rx() which may free it, after calling this,
dereferencing skb may trigger use-after-free.

Fixes: f421436a ("net/hsr: Add support for the High-availability Seamless Redundancy protocol (HSRv0)")
Signed-off-by: NYueHaibing <yuehaibing@huawei.com>
Link: https://lore.kernel.org/r/20221125075724.27912-1-yuehaibing@huawei.comSigned-off-by: NJakub Kicinski <kuba@kernel.org>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: Nsanglipeng <sanglipeng1@jd.com>
上级 a9cc77e0
...@@ -303,17 +303,18 @@ static void hsr_deliver_master(struct sk_buff *skb, struct net_device *dev, ...@@ -303,17 +303,18 @@ static void hsr_deliver_master(struct sk_buff *skb, struct net_device *dev,
struct hsr_node *node_src) struct hsr_node *node_src)
{ {
bool was_multicast_frame; bool was_multicast_frame;
int res; int res, recv_len;
was_multicast_frame = (skb->pkt_type == PACKET_MULTICAST); was_multicast_frame = (skb->pkt_type == PACKET_MULTICAST);
hsr_addr_subst_source(node_src, skb); hsr_addr_subst_source(node_src, skb);
skb_pull(skb, ETH_HLEN); skb_pull(skb, ETH_HLEN);
recv_len = skb->len;
res = netif_rx(skb); res = netif_rx(skb);
if (res == NET_RX_DROP) { if (res == NET_RX_DROP) {
dev->stats.rx_dropped++; dev->stats.rx_dropped++;
} else { } else {
dev->stats.rx_packets++; dev->stats.rx_packets++;
dev->stats.rx_bytes += skb->len; dev->stats.rx_bytes += recv_len;
if (was_multicast_frame) if (was_multicast_frame)
dev->stats.multicast++; dev->stats.multicast++;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册