lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 15 Jul 2019 20:53:08 +0200 From: Martin Hundebøll <martin@...nix.com> To: Wolfgang Grandegger <wg@...ndegger.com>, Marc Kleine-Budde <mkl@...gutronix.de>, linux-can@...r.kernel.org Cc: Martin Hundebøll <martin@...nix.com>, "David S . Miller" <davem@...emloft.net>, netdev@...r.kernel.org, Sean Nyekjaer <sean@...nix.com> Subject: [PATCH] can: flexcan: free error skb if enqueueing failed 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@...nix.com> --- 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) -- 2.22.0
Powered by blists - more mailing lists