]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: vlan: Replace BUG() with WARN_ON_ONCE() in vlan_dev_* stubs
authorGal Pressman <gal@nvidia.com>
Mon, 16 Jun 2025 13:26:25 +0000 (16:26 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Aug 2025 16:30:37 +0000 (18:30 +0200)
[ 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 <alazar@nvidia.com>
Reviewed-by: Dragos Tatulea <dtatulea@nvidia.com>
Signed-off-by: Gal Pressman <gal@nvidia.com>
Link: https://patch.msgid.link/20250616132626.1749331-3-gal@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
include/linux/if_vlan.h

index 4354f6ad8887f780a0e5c41dbf08ea34f6e311a8..9551dba15cc250aa9f2a88a817c13b5768b5bcf6 100644 (file)
@@ -258,19 +258,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;
 }