RE: [PATCH] can: flexcan: free error skb if enqueueing failed

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



> -----Original Message-----
> From: Sean Nyekjaer <sean@xxxxxxxxxx>
> Sent: 2019年8月20日 17:50
> To: Martin Hundebøll <martin@xxxxxxxxxx>; Wolfgang Grandegger
> <wg@xxxxxxxxxxxxxx>; Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>;
> linux-can@xxxxxxxxxxxxxxx
> Cc: David S . Miller <davem@xxxxxxxxxxxxx>; netdev@xxxxxxxxxxxxxxx; Joakim
> Zhang <qiangqing.zhang@xxxxxxx>
> Subject: Re: [PATCH] can: flexcan: free error skb if enqueueing failed
> 
> CC'ing Joakim Zhang

Looks good, so add my tag:
Acked-by: Joakim Zhang <qiangqing.zhang@xxxxxxx>

Best Regards,
Joakim Zhang
> On 15/07/2019 20.53, Martin Hundebøll wrote:
> > If the call to can_rx_offload_queue_sorted() fails, the passed skb
> > isn't consumed, so the caller must do so.
> >
> > Fixes: 30164759db1b ("can: flexcan: make use of rx-offload's
> > irq_offload_fifo")
> > Signed-off-by: Martin Hundebøll <martin@xxxxxxxxxx>
> > ---
> >   drivers/net/can/flexcan.c | 6 ++++--
> >   1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
> > index 1c66fb2ad76b..21f39e805d42 100644
> > --- a/drivers/net/can/flexcan.c
> > +++ b/drivers/net/can/flexcan.c
> > @@ -688,7 +688,8 @@ static void flexcan_irq_bus_err(struct net_device
> *dev, u32 reg_esr)
> >   	if (tx_errors)
> >   		dev->stats.tx_errors++;
> >
> > -	can_rx_offload_queue_sorted(&priv->offload, skb, timestamp);
> > +	if (can_rx_offload_queue_sorted(&priv->offload, skb, timestamp))
> > +		kfree_skb(skb);
> >   }
> >
> >   static void flexcan_irq_state(struct net_device *dev, u32 reg_esr)
> > @@ -732,7 +733,8 @@ static void flexcan_irq_state(struct net_device *dev,
> u32 reg_esr)
> >   	if (unlikely(new_state == CAN_STATE_BUS_OFF))
> >   		can_bus_off(dev);
> >
> > -	can_rx_offload_queue_sorted(&priv->offload, skb, timestamp);
> > +	if (can_rx_offload_queue_sorted(&priv->offload, skb, timestamp))
> > +		kfree_skb(skb);
> >   }
> >
> >   static inline struct flexcan_priv *rx_offload_to_priv(struct
> > can_rx_offload *offload)
> >




[Index of Archives]     [Automotive Discussions]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [eCos]     [Asterisk Internet PBX]     [Linux API]     [CAN Bus]

  Powered by Linux