* [PATCH net] ravb: Double free on error in ravb_start_xmit()
@ 2017-04-22 10:46 Dan Carpenter
2017-04-23 18:16 ` Sergei Shtylyov
2017-04-24 17:59 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2017-04-22 10:46 UTC (permalink / raw)
To: Sergei Shtylyov
Cc: David S. Miller, Kazuya Mizuguchi, Simon Horman, Yoshihiro Kaneko,
Masaru Nagai, Geert Uytterhoeven, Niklas Söderlund,
Philippe Reynes, netdev, linux-renesas-soc, kernel-janitors
If skb_put_padto() fails then it frees the skb. I shifted that code
up a bit to make my error handling a little simpler.
Fixes: a0d2f20650e8 ("Renesas Ethernet AVB PTP clock driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 8cfc4a54f2dc..3cd7989c007d 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -1516,11 +1516,12 @@ static netdev_tx_t ravb_start_xmit(struct sk_buff *skb, struct net_device *ndev)
spin_unlock_irqrestore(&priv->lock, flags);
return NETDEV_TX_BUSY;
}
- entry = priv->cur_tx[q] % (priv->num_tx_ring[q] * NUM_TX_DESC);
- priv->tx_skb[q][entry / NUM_TX_DESC] = skb;
if (skb_put_padto(skb, ETH_ZLEN))
- goto drop;
+ goto exit;
+
+ entry = priv->cur_tx[q] % (priv->num_tx_ring[q] * NUM_TX_DESC);
+ priv->tx_skb[q][entry / NUM_TX_DESC] = skb;
buffer = PTR_ALIGN(priv->tx_align[q], DPTR_ALIGN) +
entry / NUM_TX_DESC * DPTR_ALIGN;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net] ravb: Double free on error in ravb_start_xmit()
2017-04-22 10:46 [PATCH net] ravb: Double free on error in ravb_start_xmit() Dan Carpenter
@ 2017-04-23 18:16 ` Sergei Shtylyov
2017-04-24 17:59 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Sergei Shtylyov @ 2017-04-23 18:16 UTC (permalink / raw)
To: Dan Carpenter
Cc: David S. Miller, Kazuya Mizuguchi, Simon Horman, Yoshihiro Kaneko,
Masaru Nagai, Geert Uytterhoeven, Niklas Söderlund,
Philippe Reynes, netdev, linux-renesas-soc, kernel-janitors
Hello!
On 04/22/2017 01:46 PM, Dan Carpenter wrote:
> If skb_put_padto() fails then it frees the skb. I shifted that code
> up a bit to make my error handling a little simpler.
>
> Fixes: a0d2f20650e8 ("Renesas Ethernet AVB PTP clock driver")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
MBR, Sergei
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net] ravb: Double free on error in ravb_start_xmit()
2017-04-22 10:46 [PATCH net] ravb: Double free on error in ravb_start_xmit() Dan Carpenter
2017-04-23 18:16 ` Sergei Shtylyov
@ 2017-04-24 17:59 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2017-04-24 17:59 UTC (permalink / raw)
To: dan.carpenter
Cc: sergei.shtylyov, kazuya.mizuguchi.ks, horms+renesas, ykaneko0929,
masaru.nagai.vx, geert+renesas, niklas.soderlund+renesas, tremyfr,
netdev, linux-renesas-soc, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Sat, 22 Apr 2017 13:46:56 +0300
> If skb_put_padto() fails then it frees the skb. I shifted that code
> up a bit to make my error handling a little simpler.
>
> Fixes: a0d2f20650e8 ("Renesas Ethernet AVB PTP clock driver")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-04-24 17:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-22 10:46 [PATCH net] ravb: Double free on error in ravb_start_xmit() Dan Carpenter
2017-04-23 18:16 ` Sergei Shtylyov
2017-04-24 17:59 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).