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 50AF723314A; Mon, 10 Mar 2025 17:14:19 +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=1741626859; cv=none; b=dfv9uuobuia/5q4GczvSXh8TYF+PS2wz97srBdbRXqDP0T0GvQKflzlZ0vyhN+IJPp5bdqLE3EdF57hf0WH60RuuNmTNpsb16NHr3X1YP/LKHQyxL0EkwkP9d1hZdnBrxFowAUlnCP2vlughMXMsZ0pXAo4rW7aqWevFm4Fpb3w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741626859; c=relaxed/simple; bh=91OMtU0NG+3UvnKd+VOpaICgTBZEJpMwbaaFaBymgO0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S2oPMlC51eoVKFiow0X6hT90TA4FXPwNs5CG1Go2zY+rSSmDyNeFPzTrTO9EaTWx5WJ9RxDjJqa2+WKa9CDZqeTGFUOYUQDXwe88QubSbMPNFogEujSGd+hoS/mYleRD53wTdSiKGVIQyNCF5S3s+ASlwl1lcubQxa6VzaSvZII= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=V1OlpgFj; 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="V1OlpgFj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA460C4CEEB; Mon, 10 Mar 2025 17:14:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1741626859; bh=91OMtU0NG+3UvnKd+VOpaICgTBZEJpMwbaaFaBymgO0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V1OlpgFjoG1v8vrVCK+sfMa996hBxm6AnM1AALA07+X0kGk+sgNnyTT5cbgUfviT5 7OTfcr1P/ZQT9+O/11j/28Yk72yIb3zKAi4bBfsv6OE6xeZxSMt5f0SWAT+RNdHG04 0NM+QgXFmiY8SJcqqlgp0/ei8HxoKzlJalAEsQRE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+91161fe81857b396c8a0@syzkaller.appspotmail.com, Oscar Maes , Jiri Pirko , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.13 136/207] vlan: enforce underlying device type Date: Mon, 10 Mar 2025 18:05:29 +0100 Message-ID: <20250310170453.203263632@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310170447.729440535@linuxfoundation.org> References: <20250310170447.729440535@linuxfoundation.org> User-Agent: quilt/0.68 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.13-stable review patch. If anyone has any objections, please let me know. ------------------ From: Oscar Maes [ Upstream commit b33a534610067ade2bdaf2052900aaad99701353 ] 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: 22bedad3ce11 ("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 Reviewed-by: Jiri Pirko Link: https://patch.msgid.link/20250303155619.8918-1-oscmaes92@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/8021q/vlan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index e45187b882206..41be38264493d 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -131,7 +131,8 @@ int vlan_check_real_dev(struct net_device *real_dev, { const char *name = real_dev->name; - if (real_dev->features & NETIF_F_VLAN_CHALLENGED) { + if (real_dev->features & NETIF_F_VLAN_CHALLENGED || + real_dev->type != ARPHRD_ETHER) { pr_info("VLANs not supported on %s\n", name); NL_SET_ERR_MSG_MOD(extack, "VLANs not supported on device"); return -EOPNOTSUPP; -- 2.39.5