Skip to content

Commit 643001b

Browse files
Yunlongsdavem330
authored andcommitted
ethernet:enic: Fix a use after free bug in enic_hard_start_xmit
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: fb7516d ("enic: add sw timestamp support") Signed-off-by: Lv Yunlong <[email protected]> Acked-by: Govindarajulu Varadarajan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent f18c51b commit 643001b

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

drivers/net/ethernet/cisco/enic/enic_main.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -768,7 +768,7 @@ static inline int enic_queue_wq_skb_encap(struct enic *enic, struct vnic_wq *wq,
768768
return err;
769769
}
770770

771-
static inline void enic_queue_wq_skb(struct enic *enic,
771+
static inline int enic_queue_wq_skb(struct enic *enic,
772772
struct vnic_wq *wq, struct sk_buff *skb)
773773
{
774774
unsigned int mss = skb_shinfo(skb)->gso_size;
@@ -814,6 +814,7 @@ static inline void enic_queue_wq_skb(struct enic *enic,
814814
wq->to_use = buf->next;
815815
dev_kfree_skb(skb);
816816
}
817+
return err;
817818
}
818819

819820
/* netif_tx_lock held, process context with BHs disabled, or BH */
@@ -857,14 +858,16 @@ static netdev_tx_t enic_hard_start_xmit(struct sk_buff *skb,
857858
return NETDEV_TX_BUSY;
858859
}
859860

860-
enic_queue_wq_skb(enic, wq, skb);
861+
if (enic_queue_wq_skb(enic, wq, skb))
862+
goto error;
861863

862864
if (vnic_wq_desc_avail(wq) < MAX_SKB_FRAGS + ENIC_DESC_MAX_SPLITS)
863865
netif_tx_stop_queue(txq);
864866
skb_tx_timestamp(skb);
865867
if (!netdev_xmit_more() || netif_xmit_stopped(txq))
866868
vnic_wq_doorbell(wq);
867869

870+
error:
868871
spin_unlock(&enic->wq_lock[txq_map]);
869872

870873
return NETDEV_TX_OK;

0 commit comments

Comments
 (0)