Received: by 2002:ac0:e34a:0:0:0:0:0 with SMTP id g10csp607157imn; Thu, 28 Jul 2022 10:14:19 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t/TsZuaFzyxtU2s4fOdKsllSCXRjLYC6faGtmRcvS3rR4nGyUzEN//qu0rBli3of++qF0r X-Received: by 2002:a17:907:2d88:b0:72f:5bb:1ee0 with SMTP id gt8-20020a1709072d8800b0072f05bb1ee0mr21611196ejc.641.1659028459004; Thu, 28 Jul 2022 10:14:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659028458; cv=none; d=google.com; s=arc-20160816; b=YrzH0Uln40vTVIMqCRxss9Polcu48n6MdKcqYXW5FF/+SthGGnNYkzRg4r4TGAs7x5 i0En8c5EpwhHKICArYJNHzHTnVOcaMsAJvQ4qdNh50DQc3VUbvuZswIYQwcFHJLRYjuM IspXLWFO4R71f/DhUof9jLBmsRUFKW86EdN1ePoBcBNtoUndNFfxRghbGQ9kpvgoBStO D2L6FTD90Bh7aH/mGQyHU+tBHe/cHXQN2C1icybtxW6rZXeK6pccdKZddkktQxU4r4Jk x9E5piX/DTlRzE0rY4DTLm1+YNopSNwROlYSL7J7SbG1O2sCN8gsjUqnteNcrBDKHbm4 2XUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=NDMwPgGrwEKxmaTz1QnK4lXELFMQ1YTdhiJ9adqo1dw=; b=NYLwaVlMFuILxzs9micA4rYLZ2SIoT2UURRC8L8eqxsrW93qau8A4EvUlCxa48FY1F k1d6HmCP1MbiUxjSnE72uzC3e2/bKW6uRMwIzFH0+t3VHvGE8E/sJQNoLKJgi9PGr69o pzOF3tamS2cwZyy6vRrJuNzB3i+VoaYEqr6IsyaZ+ob6/2uxCRz7KRDLd049ZGNv6n6Z Ykp8Y50gUJYxBwDDk38dKtZthx73R1lsPQUOow80BOM+6T1qYdgNmmXUYn10N+Vl7jy5 A/RD1aKCQGMgFRcR9G2J0UCtsBs+2SAJ4igTVqiIgW3zV5E/oMePv8rd033BsBESgFTD vDYw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hc36-20020a17090716a400b0072a6bd1a193si1435459ejc.112.2022.07.28.10.13.54; Thu, 28 Jul 2022 10:14:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230239AbiG1QfE (ORCPT + 99 others); Thu, 28 Jul 2022 12:35:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229949AbiG1QfC (ORCPT ); Thu, 28 Jul 2022 12:35:02 -0400 Received: from mail.ispras.ru (mail.ispras.ru [83.149.199.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8034054ADC; Thu, 28 Jul 2022 09:35:01 -0700 (PDT) Received: from localhost.localdomain (unknown [83.149.199.65]) by mail.ispras.ru (Postfix) with ESMTPSA id 8828E40755E1; Thu, 28 Jul 2022 16:34:59 +0000 (UTC) From: Fedor Pchelkin To: Robin van der Gracht , Oleksij Rempel Cc: Fedor Pchelkin , kernel@pengutronix.de, Oliver Hartkopp , Marc Kleine-Budde , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Kurt Van Dijck , Bastian Stender , linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Alexey Khoroshilov , ldv-project@linuxtesting.org Subject: [PATCH] can: j1939: Replace WARN_ON_ONCE with pr_warn_once() in j1939_sk_queue_activate_next_locked() Date: Thu, 28 Jul 2022 19:34:29 +0300 Message-Id: <20220728163429.214758-1-pchelkin@ispras.ru> X-Mailer: git-send-email 2.25.1 In-Reply-To: <7ea40c0e-e696-3537-c2a4-a8eccf4695d0@ispras.ru> References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Found by Linux Verification Center (linuxtesting.org) with Syzkaller. Fixes: 9d71dd0c7009 ("can: add support of SAE J1939 protocol") Signed-off-by: Fedor Pchelkin Signed-off-by: Alexey Khoroshilov --- net/can/j1939/socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/can/j1939/socket.c b/net/can/j1939/socket.c index f5ecfdcf57b2..67e8b50b8bc1 100644 --- a/net/can/j1939/socket.c +++ b/net/can/j1939/socket.c @@ -178,7 +178,8 @@ static void j1939_sk_queue_activate_next_locked(struct j1939_session *session) if (!first) return; - if (WARN_ON_ONCE(j1939_session_activate(first))) { + if (j1939_session_activate(first)) { + pr_warn_once("can: j1939: Identical session is already activated.\n"); first->err = -EBUSY; goto activate_next; } else { -- 2.25.1