Commit ef576405 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: mscc: ocelot: fix use-after-free in ocelot_vlan_del() 



ocelot_vlan_member_del() will free the struct ocelot_bridge_vlan, so if
this is the same as the port's pvid_vlan which we access afterwards,
what we're accessing is freed memory.

Fix the bug by determining whether to clear ocelot_port->pvid_vlan prior
to calling ocelot_vlan_member_del().

Fixes: d4004422 ("net: mscc: ocelot: track the port pvid using a pointer")
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9ceaf6f7

drivers/net/ethernet/mscc/ocelot.c

+5 −1
Original line number Diff line number Diff line
@@ -549,14 +549,18 @@ EXPORT_SYMBOL(ocelot_vlan_add); 
int ocelot_vlan_del(struct ocelot *ocelot, int port, u16 vid)

{

	struct ocelot_port *ocelot_port = ocelot->ports[port];

	bool del_pvid = false;

	int err;



	if (ocelot_port->pvid_vlan && ocelot_port->pvid_vlan->vid == vid)

		del_pvid = true;



	err = ocelot_vlan_member_del(ocelot, port, vid);

	if (err)

		return err;



	/* Ingress */

	if (ocelot_port->pvid_vlan && ocelot_port->pvid_vlan->vid == vid)

	if (del_pvid)

		ocelot_port_set_pvid(ocelot, port, NULL);



	/* Egress */