Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0982b64e authored by Cong Wang's avatar Cong Wang Committed by Greg Kroah-Hartman
Browse files

8021q: fix a memory leak for VLAN 0 device 




[ Upstream commit 78bbb15f2239bc8e663aa20bbe1987c91a0b75f6 ]

A vlan device with vid 0 is allow to creat by not able to be fully
cleaned up by unregister_vlan_dev() which checks for vlan_id!=0.

Also, VLAN 0 is probably not a valid number and it is kinda
"reserved" for HW accelerating devices, but it is probably too
late to reject it from creation even if makes sense. Instead,
just remove the check in unregister_vlan_dev().

Reported-by: default avatarDmitry Vyukov <dvyukov@google.com>
Fixes: ad1afb00 ("vlan_dev: VLAN 0 should be treated as "no vlan tag" (802.1p packet)")
Cc: Vlad Yasevich <vyasevich@gmail.com>
Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a7404081

net/8021q/vlan.c

+1 −6
Original line number Diff line number Diff line
@@ -111,11 +111,6 @@ void unregister_vlan_dev(struct net_device *dev, struct list_head *head) 
		vlan_gvrp_uninit_applicant(real_dev);

	}



	/* Take it out of our own structures, but be sure to interlock with

	 * HW accelerating devices or SW vlan input packet processing if

	 * VLAN is not 0 (leave it there for 802.1p).

	 */

	if (vlan_id)

	vlan_vid_del(real_dev, vlan->vlan_proto, vlan_id);



	/* Get rid of the vlan's reference to real_dev */