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 0F2E834DCF6; Tue, 26 Aug 2025 13:52:09 +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=1756216329; cv=none; b=q0KKOSNQldZAflHs/dNGMbgP8Eq3t30TXZ5Ak7xlIbMiatvHz4Q3yznncV1UHSXyrdbI7YenI2FqzfJGRaPA2xMBtjT84fsZ0HUnq0FOkVSUOLUylyORE6dM4MRIbTrfvaw1A057OLvNo6Hn4rsD2TowSYUach/8g7tnM7DlETU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756216329; c=relaxed/simple; bh=doF/d9IXudhVof52EcPa8e3GDmDNfwm26FtgnHBGJFU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZID8qdaVtaNocllmctX7l6gS15aXowayNGyIafiks7kwRJeGX1FODBz9Ae8Vx1QTKyAhytvgaO6u9Iqz53CRXZLFakGjh/71nhUwanS2Td6fZsVQVpR2RkBjfCJiXBjgUnuHrI4O7u/gvXRttUgTsH9OLZ9zC51mC+x4wFGlZ2o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=IFI6Xf6n; 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="IFI6Xf6n" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9596DC4CEF1; Tue, 26 Aug 2025 13:52:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756216328; bh=doF/d9IXudhVof52EcPa8e3GDmDNfwm26FtgnHBGJFU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IFI6Xf6nGU2OJzs6AMClM8fXjqxDtXG1+x+mORHVFBgDoEOgTzXd05X4EbDcK5+Rm aAI7TdZ1lZY1dJ/i8rrQTCHNuEHDjgOs5wy7kqW5f7JfR+qmw0s7Clzzbi602Qlibe ifPa9ocdPK9WhszxJqazv4G1DZoPjjOLLvw9OEP8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alex Lazar , Dragos Tatulea , Gal Pressman , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.15 370/644] net: vlan: Replace BUG() with WARN_ON_ONCE() in vlan_dev_* stubs Date: Tue, 26 Aug 2025 13:07:41 +0200 Message-ID: <20250826110955.585196188@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250826110946.507083938@linuxfoundation.org> References: <20250826110946.507083938@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Gal Pressman [ Upstream commit 60a8b1a5d0824afda869f18dc0ecfe72f8dfda42 ] When CONFIG_VLAN_8021Q=n, a set of stub helpers are used, three of these helpers use BUG() unconditionally. This code should not be reached, as callers of these functions should always check for is_vlan_dev() first, but the usage of BUG() is not recommended, replace it with WARN_ON() instead. Reviewed-by: Alex Lazar Reviewed-by: Dragos Tatulea Signed-off-by: Gal Pressman Link: https://patch.msgid.link/20250616132626.1749331-3-gal@nvidia.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- include/linux/if_vlan.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index 64cfe7cd292c..3728e3978f83 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h @@ -248,19 +248,19 @@ vlan_for_each(struct net_device *dev, static inline struct net_device *vlan_dev_real_dev(const struct net_device *dev) { - BUG(); + WARN_ON_ONCE(1); return NULL; } static inline u16 vlan_dev_vlan_id(const struct net_device *dev) { - BUG(); + WARN_ON_ONCE(1); return 0; } static inline __be16 vlan_dev_vlan_proto(const struct net_device *dev) { - BUG(); + WARN_ON_ONCE(1); return 0; } -- 2.39.5