]> git.baikalelectronics.ru Git - kernel.git/commitdiff
can: j1939: j1939_sk_queue_activate_next_locked(): replace WARN_ON_ONCE with netdev_w...
authorFedor Pchelkin <pchelkin@ispras.ru>
Fri, 29 Jul 2022 14:36:55 +0000 (17:36 +0300)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Tue, 9 Aug 2022 07:05:06 +0000 (09:05 +0200)
We should warn user-space that it is doing something wrong when trying
to activate sessions with identical parameters but WARN_ON_ONCE macro
can not be used here as it serves a different purpose.

So it would be good to replace it with netdev_warn_once() message.

Found by Linux Verification Center (linuxtesting.org) with Syzkaller.

Fixes: c4da2dabb66d ("can: add support of SAE J1939 protocol")
Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru>
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Acked-by: Oleksij Rempel <o.rempel@pengutronix.de>
Link: https://lore.kernel.org/all/20220729143655.1108297-1-pchelkin@ispras.ru
[mkl: fix indention]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
net/can/j1939/socket.c

index f5ecfdcf57b22a86eb447bffde33e0dcfd3b378e..b670ba03a675c5748fac71794d5949ed08141d3d 100644 (file)
@@ -178,7 +178,10 @@ activate_next:
        if (!first)
                return;
 
-       if (WARN_ON_ONCE(j1939_session_activate(first))) {
+       if (j1939_session_activate(first)) {
+               netdev_warn_once(first->priv->ndev,
+                                "%s: 0x%p: Identical session is already activated.\n",
+                                __func__, first);
                first->err = -EBUSY;
                goto activate_next;
        } else {