Skip to content

Commit 85815f0

Browse files
committed
vlan: enforce underlying device type
jira LE-3262 cve CVE-2025-21920 Rebuild_History Non-Buildable kernel-5.14.0-570.21.1.el9_6 commit-author Oscar Maes <oscmaes92@gmail.com> commit b33a534 Currently, VLAN devices can be created on top of non-ethernet devices. Besides the fact that it doesn't make much sense, this also causes a bug which leaks the address of a kernel function to usermode. When creating a VLAN device, we initialize GARP (garp_init_applicant) and MRP (mrp_init_applicant) for the underlying device. As part of the initialization process, we add the multicast address of each applicant to the underlying device, by calling dev_mc_add. __dev_mc_add uses dev->addr_len to determine the length of the new multicast address. This causes an out-of-bounds read if dev->addr_len is greater than 6, since the multicast addresses provided by GARP and MRP are only 6 bytes long. This behaviour can be reproduced using the following commands: ip tunnel add gretest mode ip6gre local ::1 remote ::2 dev lo ip l set up dev gretest ip link add link gretest name vlantest type vlan id 100 Then, the following command will display the address of garp_pdu_rcv: ip maddr show | grep 01:80:c2:00:00:21 Fix the bug by enforcing the type of the underlying device during VLAN device initialization. Fixes: 22bedad ("net: convert multicast list to list_head") Reported-by: syzbot+91161fe81857b396c8a0@syzkaller.appspotmail.com Closes: https://lore.kernel.org/netdev/000000000000ca9a81061a01ec20@google.com/ Signed-off-by: Oscar Maes <oscmaes92@gmail.com> Reviewed-by: Jiri Pirko <jiri@nvidia.com> Link: https://patch.msgid.link/20250303155619.8918-1-oscmaes92@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> (cherry picked from commit b33a534) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent 7385be3 commit 85815f0

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

net/8021q/vlan.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,8 @@ int vlan_check_real_dev(struct net_device *real_dev,
131131
{
132132
const char *name = real_dev->name;
133133

134-
if (real_dev->features & NETIF_F_VLAN_CHALLENGED) {
134+
if (real_dev->features & NETIF_F_VLAN_CHALLENGED ||
135+
real_dev->type != ARPHRD_ETHER) {
135136
pr_info("VLANs not supported on %s\n", name);
136137
NL_SET_ERR_MSG_MOD(extack, "VLANs not supported on device");
137138
return -EOPNOTSUPP;

0 commit comments

Comments
 (0)