From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 500C03016F9; Mon, 27 Oct 2025 19:21:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761592910; cv=none; b=iRfaD0duJ4+bwT1pjxueazj07NoAdxgrDNqWbuwnNnDF0ULFucjlTEQR9upSx9myCaKn1+UBbhdQgd2vBIR5hXAAXQ5AekZ+YbpC0vY0ffdiBLTl2dm0Yzc7ot1yVG7JU1ttx04a9EjeY1I7yoJmaDxx2pFP/yl91+x4tWgyzuA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761592910; c=relaxed/simple; bh=EUDYKZTxXkgT+Uq6GG+tuExma4xLzfKyNiRC+xoVX/M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LcRVz7KCjDonolSWiq+ymfGu65u/0fXSwlRlXtVdo1mER9XI6pnaMQFqDYd8jFJHBjq+cszu3kLTODOKHqSCc9M/bUKj8DrWnpVDxFwn836S5lvZDBIkpd1SiSaov777ENkGBV5jqT0omuQQ7z1DNhJ+rMWcZy0PGZ1FJ/Wf294= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=BALGj2g6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="BALGj2g6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 90A92C4CEF1; Mon, 27 Oct 2025 19:21:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1761592908; bh=EUDYKZTxXkgT+Uq6GG+tuExma4xLzfKyNiRC+xoVX/M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BALGj2g6C+cqq+csOZUQeFZLFr9yM2+PIEqy26ukb5v6K4LQGulaktsx3pMLfLg8o U8jJarBP8zbHrU+DMQNXAtLxSfAxQhosiDrNhHCxk/MPYlsmuaedSP4jweMW9Q+1D0 Zbw8yrqx7dH7qLOPp5oFzuShBBhR56hWJZR4G11k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Marc Kleine-Budde , Sasha Levin Subject: [PATCH 6.12 031/117] can: esd: acc_start_xmit(): use can_dev_dropped_skb() instead of can_dropped_invalid_skb() Date: Mon, 27 Oct 2025 19:35:57 +0100 Message-ID: <20251027183454.810792419@linuxfoundation.org> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251027183453.919157109@linuxfoundation.org> References: <20251027183453.919157109@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Marc Kleine-Budde [ Upstream commit 0bee15a5caf36fe513fdeee07fd4f0331e61c064 ] 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 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") Link: https://patch.msgid.link/20251017-fix-skb-drop-check-v1-2-556665793fa4@pengutronix.de Signed-off-by: Marc Kleine-Budde Signed-off-by: Sasha Levin --- 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 c80032bc1a521..73e66f9a3781c 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