Netdev Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH v2] ethernet:enic: Fix a use after free bug in enic_hard_start_xmit
@ 2021-05-02 11:58 Lv Yunlong
  2021-05-03  7:21 ` Govindarajulu Varadarajan (gvaradar)
  2021-05-03 20:30 ` patchwork-bot+netdevbpf
  0 siblings, 2 replies; 3+ messages in thread
From: Lv Yunlong @ 2021-05-02 11:58 UTC (permalink / raw)
  To: benve, _govind, davem, kuba; +Cc: netdev, linux-kernel, Lv Yunlong

In enic_hard_start_xmit, it calls enic_queue_wq_skb(). Inside
enic_queue_wq_skb, if some error happens, the skb will be freed
by dev_kfree_skb(skb). But the freed skb is still used in
skb_tx_timestamp(skb).

My patch makes enic_queue_wq_skb() return error and goto spin_unlock()
incase of error. The solution is provided by Govind.
See https://lkml.org/lkml/2021/4/30/961.

Fixes: fb7516d42478e ("enic: add sw timestamp support")
Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
---
 drivers/net/ethernet/cisco/enic/enic_main.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index f04ec53544ae..b1443ff439de 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -768,7 +768,7 @@ static inline int enic_queue_wq_skb_encap(struct enic *enic, struct vnic_wq *wq,
 	return err;
 }
 
-static inline void enic_queue_wq_skb(struct enic *enic,
+static inline int enic_queue_wq_skb(struct enic *enic,
 	struct vnic_wq *wq, struct sk_buff *skb)
 {
 	unsigned int mss = skb_shinfo(skb)->gso_size;
@@ -814,6 +814,7 @@ static inline void enic_queue_wq_skb(struct enic *enic,
 		wq->to_use = buf->next;
 		dev_kfree_skb(skb);
 	}
+	return err;
 }
 
 /* netif_tx_lock held, process context with BHs disabled, or BH */
@@ -857,7 +858,8 @@ static netdev_tx_t enic_hard_start_xmit(struct sk_buff *skb,
 		return NETDEV_TX_BUSY;
 	}
 
-	enic_queue_wq_skb(enic, wq, skb);
+	if (enic_queue_wq_skb(enic, wq, skb))
+		goto error;
 
 	if (vnic_wq_desc_avail(wq) < MAX_SKB_FRAGS + ENIC_DESC_MAX_SPLITS)
 		netif_tx_stop_queue(txq);
@@ -865,6 +867,7 @@ static netdev_tx_t enic_hard_start_xmit(struct sk_buff *skb,
 	if (!netdev_xmit_more() || netif_xmit_stopped(txq))
 		vnic_wq_doorbell(wq);
 
+error:
 	spin_unlock(&enic->wq_lock[txq_map]);
 
 	return NETDEV_TX_OK;
-- 
2.25.1



^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] ethernet:enic: Fix a use after free bug in enic_hard_start_xmit
  2021-05-02 11:58 [PATCH v2] ethernet:enic: Fix a use after free bug in enic_hard_start_xmit Lv Yunlong
@ 2021-05-03  7:21 ` Govindarajulu Varadarajan (gvaradar)
  2021-05-03 20:30 ` patchwork-bot+netdevbpf
  1 sibling, 0 replies; 3+ messages in thread
From: Govindarajulu Varadarajan (gvaradar) @ 2021-05-03  7:21 UTC (permalink / raw)
  To: Christian Benvenuti (benve),
	davem, kuba, lyl2019, Govindarajulu Varadarajan (gvaradar)
  Cc: netdev, linux-kernel

On Sun, 2021-05-02 at 04:58 -0700, Lv Yunlong wrote:
> In enic_hard_start_xmit, it calls enic_queue_wq_skb(). Inside
> enic_queue_wq_skb, if some error happens, the skb will be freed
> by dev_kfree_skb(skb). But the freed skb is still used in
> skb_tx_timestamp(skb).
> 
> My patch makes enic_queue_wq_skb() return error and goto spin_unlock()
> incase of error. The solution is provided by Govind.
> See https://lkml.org/lkml/2021/4/30/961.
> 
> Fixes: fb7516d42478e ("enic: add sw timestamp support")
> Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>

Thanks,

Acked-by: Govindarajulu Varadarajan <gvaradar@cisco.com>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] ethernet:enic: Fix a use after free bug in enic_hard_start_xmit
  2021-05-02 11:58 [PATCH v2] ethernet:enic: Fix a use after free bug in enic_hard_start_xmit Lv Yunlong
  2021-05-03  7:21 ` Govindarajulu Varadarajan (gvaradar)
@ 2021-05-03 20:30 ` patchwork-bot+netdevbpf
  1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-05-03 20:30 UTC (permalink / raw)
  To: Lv Yunlong; +Cc: benve, _govind, davem, kuba, netdev, linux-kernel

Hello:

This patch was applied to netdev/net.git (refs/heads/master):

On Sun,  2 May 2021 04:58:18 -0700 you wrote:
> In enic_hard_start_xmit, it calls enic_queue_wq_skb(). Inside
> enic_queue_wq_skb, if some error happens, the skb will be freed
> by dev_kfree_skb(skb). But the freed skb is still used in
> skb_tx_timestamp(skb).
> 
> My patch makes enic_queue_wq_skb() return error and goto spin_unlock()
> incase of error. The solution is provided by Govind.
> See https://lkml.org/lkml/2021/4/30/961.
> 
> [...]

Here is the summary with links:
  - [v2] ethernet:enic: Fix a use after free bug in enic_hard_start_xmit
    https://git.kernel.org/netdev/net/c/643001b47adc

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-02 11:58 [PATCH v2] ethernet:enic: Fix a use after free bug in enic_hard_start_xmit Lv Yunlong
2021-05-03  7:21 ` Govindarajulu Varadarajan (gvaradar)
2021-05-03 20:30 ` patchwork-bot+netdevbpf

Netdev Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/netdev/0 netdev/git/0.git
	git clone --mirror https://lore.kernel.org/netdev/1 netdev/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 netdev netdev/ https://lore.kernel.org/netdev \
		netdev@vger.kernel.org
	public-inbox-index netdev

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.netdev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git