Commit f96e9641 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by David S. Miller

net: ethernet: mtk-star-emac: fix error path in RX handling

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.

Fixes: 8c7bd5a4 ("net: ethernet: mtk-star-emac: new driver")
Reported-by: default avatarNathan Chancellor <natechancellor@gmail.com>
Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Tested-by: Nathan Chancellor <natechancellor@gmail.com> # build
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7cf4eda4
...@@ -1308,6 +1308,8 @@ static int mtk_star_receive_packet(struct mtk_star_priv *priv) ...@@ -1308,6 +1308,8 @@ static int mtk_star_receive_packet(struct mtk_star_priv *priv)
goto push_new_skb; 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. */ /* We can't fail anymore at this point: it's safe to unmap the skb. */
mtk_star_dma_unmap_rx(priv, &desc_data); mtk_star_dma_unmap_rx(priv, &desc_data);
...@@ -1318,7 +1320,6 @@ static int mtk_star_receive_packet(struct mtk_star_priv *priv) ...@@ -1318,7 +1320,6 @@ static int mtk_star_receive_packet(struct mtk_star_priv *priv)
netif_receive_skb(desc_data.skb); netif_receive_skb(desc_data.skb);
push_new_skb: push_new_skb:
desc_data.dma_addr = new_dma_addr;
desc_data.len = skb_tailroom(new_skb); desc_data.len = skb_tailroom(new_skb);
desc_data.skb = new_skb; desc_data.skb = new_skb;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment