linux-can.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH can 0/3] can: drivers: drop skb in xmit if device is in listen only mode
@ 2025-10-17 14:59 Marc Kleine-Budde
  2025-10-17 14:59 ` [PATCH can 1/3] can: bxcan: bxcan_start_xmit(): use can_dev_dropped_skb() instead of can_dropped_invalid_skb() Marc Kleine-Budde
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Marc Kleine-Budde @ 2025-10-17 14:59 UTC (permalink / raw)
  To: Dario Binacchi, Vincent Mailhol, Oliver Hartkopp,
	Stefan Mätje, socketcan, Heiko Stuebner
  Cc: kernel, linux-can, linux-kernel, linux-arm-kernel, linux-rockchip,
	Marc Kleine-Budde

I notived that 3 drivers (bxcan, esd and rockchip) use the function
can_dropped_invalid_skb(), that doesn't check if the device is in listen
only mode. This series converts these driver to use the new
can_dev_dropped_skb() function.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
Marc Kleine-Budde (3):
      can: bxcan: bxcan_start_xmit(): use can_dev_dropped_skb() instead of can_dropped_invalid_skb()
      can: esd: acc_start_xmit(): use can_dev_dropped_skb() instead of can_dropped_invalid_skb()
      can: rockchip-canfd: rkcanfd_start_xmit(): use can_dev_dropped_skb() instead of can_dropped_invalid_skb()

 drivers/net/can/bxcan.c                      | 2 +-
 drivers/net/can/esd/esdacc.c                 | 2 +-
 drivers/net/can/rockchip/rockchip_canfd-tx.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
base-commit: 7e0d4c111369ed385ec4aaa6c9c78c46efda54d0
change-id: 20251017-fix-skb-drop-check-5da14b585634

Best regards,
--  
Marc Kleine-Budde <mkl@pengutronix.de>


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH can 1/3] can: bxcan: bxcan_start_xmit(): use can_dev_dropped_skb() instead of can_dropped_invalid_skb()
  2025-10-17 14:59 [PATCH can 0/3] can: drivers: drop skb in xmit if device is in listen only mode Marc Kleine-Budde
@ 2025-10-17 14:59 ` Marc Kleine-Budde
  2025-10-17 15:00 ` [PATCH can 2/3] can: esd: acc_start_xmit(): " Marc Kleine-Budde
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Marc Kleine-Budde @ 2025-10-17 14:59 UTC (permalink / raw)
  To: Dario Binacchi, Vincent Mailhol, Oliver Hartkopp,
	Stefan Mätje, socketcan, Heiko Stuebner
  Cc: kernel, linux-can, linux-kernel, linux-arm-kernel, linux-rockchip,
	Marc Kleine-Budde

In addition to can_dropped_invalid_skb(), the helper function
can_dev_dropped_skb() checks whether the device is in listen-only mode and
discards the skb accordingly.

Replace can_dropped_invalid_skb() by can_dev_dropped_skb() to also drop
skbs in for listen-only mode.

Reported-by: Marc Kleine-Budde <mkl@pengutronix.de>
Closes: https://lore.kernel.org/all/20251017-bizarre-enchanted-quokka-f3c704-mkl@pengutronix.de/
Fixes: f00647d8127b ("can: bxcan: add support for ST bxCAN controller")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/bxcan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/can/bxcan.c b/drivers/net/can/bxcan.c
index bfc60eb33dc3..333ad42ea73b 100644
--- a/drivers/net/can/bxcan.c
+++ b/drivers/net/can/bxcan.c
@@ -842,7 +842,7 @@ static netdev_tx_t bxcan_start_xmit(struct sk_buff *skb,
 	u32 id;
 	int i, j;
 
-	if (can_dropped_invalid_skb(ndev, skb))
+	if (can_dev_dropped_skb(ndev, skb))
 		return NETDEV_TX_OK;
 
 	if (bxcan_tx_busy(priv))

-- 
2.51.0


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH can 2/3] can: esd: acc_start_xmit(): use can_dev_dropped_skb() instead of can_dropped_invalid_skb()
  2025-10-17 14:59 [PATCH can 0/3] can: drivers: drop skb in xmit if device is in listen only mode Marc Kleine-Budde
  2025-10-17 14:59 ` [PATCH can 1/3] can: bxcan: bxcan_start_xmit(): use can_dev_dropped_skb() instead of can_dropped_invalid_skb() Marc Kleine-Budde
@ 2025-10-17 15:00 ` Marc Kleine-Budde
  2025-10-17 15:00 ` [PATCH can 3/3] can: rockchip-canfd: rkcanfd_start_xmit(): " Marc Kleine-Budde
  2025-10-20 15:19 ` [PATCH can 0/3] can: drivers: drop skb in xmit if device is in listen only mode Marc Kleine-Budde
  3 siblings, 0 replies; 5+ messages in thread
From: Marc Kleine-Budde @ 2025-10-17 15:00 UTC (permalink / raw)
  To: Dario Binacchi, Vincent Mailhol, Oliver Hartkopp,
	Stefan Mätje, socketcan, Heiko Stuebner
  Cc: kernel, linux-can, linux-kernel, linux-arm-kernel, linux-rockchip,
	Marc Kleine-Budde

In addition to can_dropped_invalid_skb(), the helper function
can_dev_dropped_skb() checks whether the device is in listen-only mode and
discards the skb accordingly.

Replace can_dropped_invalid_skb() by can_dev_dropped_skb() to also drop
skbs in for listen-only mode.

Reported-by: Marc Kleine-Budde <mkl@pengutronix.de>
Closes: https://lore.kernel.org/all/20251017-bizarre-enchanted-quokka-f3c704-mkl@pengutronix.de/
Fixes: 9721866f07e1 ("can: esd: add support for esd GmbH PCIe/402 CAN interface family")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/esd/esdacc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/can/esd/esdacc.c b/drivers/net/can/esd/esdacc.c
index c80032bc1a52..73e66f9a3781 100644
--- a/drivers/net/can/esd/esdacc.c
+++ b/drivers/net/can/esd/esdacc.c
@@ -254,7 +254,7 @@ netdev_tx_t acc_start_xmit(struct sk_buff *skb, struct net_device *netdev)
 	u32 acc_id;
 	u32 acc_dlc;
 
-	if (can_dropped_invalid_skb(netdev, skb))
+	if (can_dev_dropped_skb(netdev, skb))
 		return NETDEV_TX_OK;
 
 	/* Access core->tx_fifo_tail only once because it may be changed

-- 
2.51.0


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH can 3/3] can: rockchip-canfd: rkcanfd_start_xmit(): use can_dev_dropped_skb() instead of can_dropped_invalid_skb()
  2025-10-17 14:59 [PATCH can 0/3] can: drivers: drop skb in xmit if device is in listen only mode Marc Kleine-Budde
  2025-10-17 14:59 ` [PATCH can 1/3] can: bxcan: bxcan_start_xmit(): use can_dev_dropped_skb() instead of can_dropped_invalid_skb() Marc Kleine-Budde
  2025-10-17 15:00 ` [PATCH can 2/3] can: esd: acc_start_xmit(): " Marc Kleine-Budde
@ 2025-10-17 15:00 ` Marc Kleine-Budde
  2025-10-20 15:19 ` [PATCH can 0/3] can: drivers: drop skb in xmit if device is in listen only mode Marc Kleine-Budde
  3 siblings, 0 replies; 5+ messages in thread
From: Marc Kleine-Budde @ 2025-10-17 15:00 UTC (permalink / raw)
  To: Dario Binacchi, Vincent Mailhol, Oliver Hartkopp,
	Stefan Mätje, socketcan, Heiko Stuebner
  Cc: kernel, linux-can, linux-kernel, linux-arm-kernel, linux-rockchip,
	Marc Kleine-Budde

In addition to can_dropped_invalid_skb(), the helper function
can_dev_dropped_skb() checks whether the device is in listen-only mode and
discards the skb accordingly.

Replace can_dropped_invalid_skb() by can_dev_dropped_skb() to also drop
skbs in for listen-only mode.

Reported-by: Marc Kleine-Budde <mkl@pengutronix.de>
Closes: https://lore.kernel.org/all/20251017-bizarre-enchanted-quokka-f3c704-mkl@pengutronix.de/
Fixes: ff60bfbaf67f ("can: rockchip_canfd: add driver for Rockchip CAN-FD controller")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/rockchip/rockchip_canfd-tx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/can/rockchip/rockchip_canfd-tx.c b/drivers/net/can/rockchip/rockchip_canfd-tx.c
index 865a15e033a9..12200dcfd338 100644
--- a/drivers/net/can/rockchip/rockchip_canfd-tx.c
+++ b/drivers/net/can/rockchip/rockchip_canfd-tx.c
@@ -72,7 +72,7 @@ netdev_tx_t rkcanfd_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 	int err;
 	u8 i;
 
-	if (can_dropped_invalid_skb(ndev, skb))
+	if (can_dev_dropped_skb(ndev, skb))
 		return NETDEV_TX_OK;
 
 	if (!netif_subqueue_maybe_stop(priv->ndev, 0,

-- 
2.51.0


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH can 0/3] can: drivers: drop skb in xmit if device is in listen only mode
  2025-10-17 14:59 [PATCH can 0/3] can: drivers: drop skb in xmit if device is in listen only mode Marc Kleine-Budde
                   ` (2 preceding siblings ...)
  2025-10-17 15:00 ` [PATCH can 3/3] can: rockchip-canfd: rkcanfd_start_xmit(): " Marc Kleine-Budde
@ 2025-10-20 15:19 ` Marc Kleine-Budde
  3 siblings, 0 replies; 5+ messages in thread
From: Marc Kleine-Budde @ 2025-10-20 15:19 UTC (permalink / raw)
  To: Dario Binacchi, Vincent Mailhol, Oliver Hartkopp,
	Stefan Mätje, socketcan, Heiko Stuebner
  Cc: kernel, linux-can, linux-kernel, linux-arm-kernel, linux-rockchip

[-- Attachment #1: Type: text/plain, Size: 657 bytes --]

On 17.10.2025 16:59:58, Marc Kleine-Budde wrote:
> I notived that 3 drivers (bxcan, esd and rockchip) use the function
> can_dropped_invalid_skb(), that doesn't check if the device is in listen
> only mode. This series converts these driver to use the new
> can_dev_dropped_skb() function.
> 
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

Applied to linux-can.

Marc

-- 
Pengutronix e.K.                 | Marc Kleine-Budde          |
Embedded Linux                   | https://www.pengutronix.de |
Vertretung Nürnberg              | Phone: +49-5121-206917-129 |
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-9   |

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2025-10-20 15:19 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-10-17 14:59 [PATCH can 0/3] can: drivers: drop skb in xmit if device is in listen only mode Marc Kleine-Budde
2025-10-17 14:59 ` [PATCH can 1/3] can: bxcan: bxcan_start_xmit(): use can_dev_dropped_skb() instead of can_dropped_invalid_skb() Marc Kleine-Budde
2025-10-17 15:00 ` [PATCH can 2/3] can: esd: acc_start_xmit(): " Marc Kleine-Budde
2025-10-17 15:00 ` [PATCH can 3/3] can: rockchip-canfd: rkcanfd_start_xmit(): " Marc Kleine-Budde
2025-10-20 15:19 ` [PATCH can 0/3] can: drivers: drop skb in xmit if device is in listen only mode Marc Kleine-Budde

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).