git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From f7f0adfe64de08803990dc4cbecd2849c04e314a Mon Sep 17 00:00:00 2001
   2 From: Robin van der Gracht <robin@protonic.nl>
   3 Date: Mon, 27 Jan 2025 13:16:44 +0100
   4 Subject: can: rockchip: rkcanfd_handle_rx_fifo_overflow_int(): bail out if skb cannot be allocated
   5
   6 From: Robin van der Gracht <robin@protonic.nl>
   7
   8 commit f7f0adfe64de08803990dc4cbecd2849c04e314a upstream.
   9
  10 Fix NULL pointer check in rkcanfd_handle_rx_fifo_overflow_int() to
  11 bail out if skb cannot be allocated.
  12
  13 Fixes: ff60bfbaf67f ("can: rockchip_canfd: add driver for Rockchip CAN-FD controller")
  14 Cc: stable@vger.kernel.org
  15 Signed-off-by: Robin van der Gracht <robin@protonic.nl>
  16 Link: https://patch.msgid.link/20250208-fix-rockchip-canfd-v1-1-ec533c8a9895@pengutronix.de
  17 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  18 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  19 ---
  20  drivers/net/can/rockchip/rockchip_canfd-core.c | 2 +-
  21  1 file changed, 1 insertion(+), 1 deletion(-)
  22
  23 diff --git a/drivers/net/can/rockchip/rockchip_canfd-core.c b/drivers/net/can/rockchip/rockchip_canfd-core.c
  24 index df18c85fc078..d9a937ba126c 100644
  25 --- a/drivers/net/can/rockchip/rockchip_canfd-core.c
  26 +++ b/drivers/net/can/rockchip/rockchip_canfd-core.c
  27 @@ -622,7 +622,7 @@ rkcanfd_handle_rx_fifo_overflow_int(struct rkcanfd_priv *priv)
  28         netdev_dbg(priv->ndev, "RX-FIFO overflow\n");
  29
  30         skb = rkcanfd_alloc_can_err_skb(priv, &cf, &timestamp);
  31 -       if (skb)
  32 +       if (!skb)
  33                 return 0;
  34
  35         rkcanfd_get_berr_counter_corrected(priv, &bec);
  36 --
  37 2.48.1
  38