]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: ethernet: dnet: don't call dev_kfree_skb() under spin_lock_irqsave()
authorYang Yingliang <yangyingliang@huawei.com>
Thu, 8 Dec 2022 14:21:45 +0000 (22:21 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 7 Jan 2023 11:07:22 +0000 (12:07 +0100)
[ Upstream commit f07fadcbee2a5e84caa67c7c445424200bffb60b ]

It is not allowed to call kfree_skb() or consume_skb() from hardware
interrupt context or with hardware interrupts being disabled.

In this case, the lock is used to protected 'bp', so we can move
dev_kfree_skb() after the spin_unlock_irqrestore().

Fixes: 4796417417a6 ("dnet: Dave DNET ethernet controller driver (updated)")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/dnet.c

index c3b64cdd0decb76f7da6551f3ed95cb9f576318a..62fcedd6f732b70e9f5537b95e7648fc6d3636db 100644 (file)
@@ -558,11 +558,11 @@ static netdev_tx_t dnet_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
        skb_tx_timestamp(skb);
 
+       spin_unlock_irqrestore(&bp->lock, flags);
+
        /* free the buffer */
        dev_kfree_skb(skb);
 
-       spin_unlock_irqrestore(&bp->lock, flags);
-
        return NETDEV_TX_OK;
 }