net: ethernet: mtk-star-emac: fix error path in RX handling
Subsystems (4)
PATCH 1/1 net: ethernet: mtk-star-emac: fix error path in RX handling
From: Bartosz Golaszewski <[email protected]>
The dma_addr field in desc_data must not be overwritten until after the new skb is mapped. Currently we do replace it with uninitialized value in error path. This change fixes it by moving the assignment before the label to which we jump after mapping or allocation errors.
--- drivers/net/ethernet/mediatek/mtk_star_emac.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/mediatek/mtk_star_emac.c +2 -1
@@ -1308,6 +1308,8 @@ static int mtk_star_receive_packet(struct mtk_star_priv *priv) goto push_new_skb; } + desc_data.dma_addr = new_dma_addr; +/* We can't fail anymore at this point: it's safe to unmap the skb. */ mtk_star_dma_unmap_rx (priv, &desc_data);
@@ -1318,7 +1320,6 @@ static int mtk_star_receive_packet(struct mtk_star_priv *priv)netif_receive_skb (desc_data.skb); push_new_skb: - desc_data.dma_addr = new_dma_addr; desc_data.len =skb_tailroom (new_skb); desc_data.skb = new_skb;
Signature · 1 line
2.25.0
Quoted 10 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
The
dma_addrfield indesc_datamust not be overwritten until after the new skb is mapped. Currently we do replace it with uninitialized value in error path. This change fixes it by moving the assignment before the label to which we jump after mapping or allocation errors.Fixes 8c7bd5a454ff ("net: ethernet: mtk-star-emac: new driver")Reported-by Nathan Chancellor <[email protected]>Signed-off-by Bartosz Golaszewski <[email protected]>
Quoted 28 lines
--- drivers/net/ethernet/mediatek/mtk_star_emac.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/net/ethernet/mediatek/mtk_star_emac.c +2
-1@@ -1308,6 +1308,8 @@ static int mtk_star_receive_packet(struct mtk_star_priv *priv) goto push_new_skb; } + desc_data.dma_addr = new_dma_addr; +/* We can't fail anymore at this point: it's safe to unmap the skb. */ mtk_star_dma_unmap_rx (priv, &desc_data);@@ -1318,7 +1320,6 @@ static int mtk_star_receive_packet(struct mtk_star_priv *priv)netif_receive_skb (desc_data.skb); push_new_skb: - desc_data.dma_addr = new_dma_addr; desc_data.len =skb_tailroom (new_skb); desc_data.skb = new_skb;Signature · 1 line
2.25.0
From: Bartosz Golaszewski <[email protected]>
Date: Wed, 27 May 2020 11:24:04 +0200
Quoted 10 lines
From: Bartosz Golaszewski <[email protected]>
The
dma_addrfield indesc_datamust not be overwritten until after the new skb is mapped. Currently we do replace it with uninitialized value in error path. This change fixes it by moving the assignment before the label to which we jump after mapping or allocation errors.Fixes 8c7bd5a454ff ("net: ethernet: mtk-star-emac: new driver")Reported-by Nathan Chancellor <[email protected]>Signed-off-by Bartosz Golaszewski <[email protected]>
Applied, please use "[PATCH net-next]" to clearly indicate the target GIT tree next time.
Thank you.