Commit 3bd674f7 authored by Yang Yingliang's avatar Yang Yingliang Committed by sanglipeng
Browse files

net: plip: don't call kfree_skb/dev_kfree_skb() under spin_lock_irq() 

stable inclusion
from stable-v5.10.159
commit 3d59adad126d0f22e06506449f530fcc16277e61
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=3d59adad126d0f22e06506449f530fcc16277e61



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

[ Upstream commit 7d8c19bf ]

It is not allowed to call kfree_skb() or consume_skb() from
hardware interrupt context or with interrupts being disabled.
So replace kfree_skb/dev_kfree_skb() with dev_kfree_skb_irq()
and dev_consume_skb_irq() under spin_lock_irq().

Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Link: https://lore.kernel.org/r/20221207015310.2984909-1-yangyingliang@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent c3862675

drivers/net/plip/plip.c

+2 −2
Original line number Diff line number Diff line
@@ -444,12 +444,12 @@ plip_bh_timeout_error(struct net_device *dev, struct net_local *nl, 
	}

	rcv->state = PLIP_PK_DONE;

	if (rcv->skb) {

		kfree_skb(rcv->skb);

		dev_kfree_skb_irq(rcv->skb);

		rcv->skb = NULL;

	}

	snd->state = PLIP_PK_DONE;

	if (snd->skb) {

		dev_kfree_skb(snd->skb);

		dev_consume_skb_irq(snd->skb);

		snd->skb = NULL;

	}

	spin_unlock_irq(&nl->lock);