mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mISDN: hfcmulti: don't call dev_kfree_skb/kfree_skb() under spin_lock_irqsave() 

[ Upstream commit 1232946cf5 ]

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

skb_queue_purge() is called under spin_lock_irqsave() in handle_dmsg()
and hfcm_l1callback(), kfree_skb() is called in them, to fix this, use
skb_queue_splice_init() to move the dch->squeue to a free queue, also
enqueue the tx_skb and rx_skb, at last calling __skb_queue_purge() to
free the SKBs afer unlock.

Fixes: af69fb3a8f ("Add mISDN HFC multiport driver")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Reviewed-by: Alexander Duyck <alexanderduyck@fb.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Yang Yingliang 2022-12-12 16:41:39 +08:00 committed by Greg Kroah-Hartman
parent 68dd82e57b
commit f07d1b0805
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/isdn/hardware/mISDN/hfcmulti.c
View File

@ -3217,6 +3217,7 @@ static int
hfcm_l1callback(struct dchannel *dch, u_int cmd) hfcm_l1callback(struct dchannel *dch, u_int cmd)
{ {
struct hfc_multi *hc = dch->hw; struct hfc_multi *hc = dch->hw;
struct sk_buff_head free_queue;
u_long flags; u_long flags;
switch (cmd) { switch (cmd) {
@ -3245,6 +3246,7 @@ hfcm_l1callback(struct dchannel *dch, u_int cmd)
l1_event(dch->l1, HW_POWERUP_IND); l1_event(dch->l1, HW_POWERUP_IND);
break; break;
case HW_DEACT_REQ: case HW_DEACT_REQ:
__skb_queue_head_init(&free_queue);
/* start deactivation */ /* start deactivation */
spin_lock_irqsave(&hc->lock, flags); spin_lock_irqsave(&hc->lock, flags);
if (hc->ctype == HFC_TYPE_E1) { if (hc->ctype == HFC_TYPE_E1) {
@ -3264,20 +3266,21 @@ hfcm_l1callback(struct dchannel *dch, u_int cmd)
plxsd_checksync(hc, 0); plxsd_checksync(hc, 0);
} }
} }
skb_queue_purge(&dch->squeue); skb_queue_splice_init(&dch->squeue, &free_queue);
if (dch->tx_skb) { if (dch->tx_skb) {
dev_kfree_skb(dch->tx_skb); __skb_queue_tail(&free_queue, dch->tx_skb);
dch->tx_skb = NULL; dch->tx_skb = NULL;
} }
dch->tx_idx = 0; dch->tx_idx = 0;
if (dch->rx_skb) { if (dch->rx_skb) {
dev_kfree_skb(dch->rx_skb); __skb_queue_tail(&free_queue, dch->rx_skb);
dch->rx_skb = NULL; dch->rx_skb = NULL;
} }
test_and_clear_bit(FLG_TX_BUSY, &dch->Flags); test_and_clear_bit(FLG_TX_BUSY, &dch->Flags);
if (test_and_clear_bit(FLG_BUSY_TIMER, &dch->Flags)) if (test_and_clear_bit(FLG_BUSY_TIMER, &dch->Flags))
del_timer(&dch->timer); del_timer(&dch->timer);
spin_unlock_irqrestore(&hc->lock, flags); spin_unlock_irqrestore(&hc->lock, flags);
__skb_queue_purge(&free_queue);
break; break;
case HW_POWERUP_REQ: case HW_POWERUP_REQ:
spin_lock_irqsave(&hc->lock, flags); spin_lock_irqsave(&hc->lock, flags);
@ -3384,6 +3387,9 @@ handle_dmsg(struct mISDNchannel *ch, struct sk_buff *skb)
case PH_DEACTIVATE_REQ: case PH_DEACTIVATE_REQ:
test_and_clear_bit(FLG_L2_ACTIVATED, &dch->Flags); test_and_clear_bit(FLG_L2_ACTIVATED, &dch->Flags);
if (dch->dev.D.protocol != ISDN_P_TE_S0) { if (dch->dev.D.protocol != ISDN_P_TE_S0) {
struct sk_buff_head free_queue;
__skb_queue_head_init(&free_queue);
spin_lock_irqsave(&hc->lock, flags); spin_lock_irqsave(&hc->lock, flags);
if (debug & DEBUG_HFCMULTI_MSG) if (debug & DEBUG_HFCMULTI_MSG)
printk(KERN_DEBUG printk(KERN_DEBUG
@ -3405,14 +3411,14 @@ handle_dmsg(struct mISDNchannel *ch, struct sk_buff *skb)
/* deactivate */ /* deactivate */
dch->state = 1; dch->state = 1;
} }
skb_queue_purge(&dch->squeue); skb_queue_splice_init(&dch->squeue, &free_queue);
if (dch->tx_skb) { if (dch->tx_skb) {
dev_kfree_skb(dch->tx_skb); __skb_queue_tail(&free_queue, dch->tx_skb);
dch->tx_skb = NULL; dch->tx_skb = NULL;
} }
dch->tx_idx = 0; dch->tx_idx = 0;
if (dch->rx_skb) { if (dch->rx_skb) {
dev_kfree_skb(dch->rx_skb); __skb_queue_tail(&free_queue, dch->rx_skb);
dch->rx_skb = NULL; dch->rx_skb = NULL;
} }
test_and_clear_bit(FLG_TX_BUSY, &dch->Flags); test_and_clear_bit(FLG_TX_BUSY, &dch->Flags);
@ -3424,6 +3430,7 @@ handle_dmsg(struct mISDNchannel *ch, struct sk_buff *skb)
#endif #endif
ret = 0; ret = 0;
spin_unlock_irqrestore(&hc->lock, flags); spin_unlock_irqrestore(&hc->lock, flags);
__skb_queue_purge(&free_queue);
} else } else
ret = l1_event(dch->l1, hh->prim); ret = l1_event(dch->l1, hh->prim);
break; break;