Commit c84f6ce9 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Jakub Kicinski
Browse files

net: dsa: mv88e6xxx: avoid unregistering devlink regions which were never registered 

Russell King reports that a system with mv88e6xxx dereferences a NULL
pointer when unbinding this driver:
https://lore.kernel.org/netdev/Z_lRkMlTJ1KQ0kVX@shell.armlinux.org.uk/



The crash seems to be in devlink_region_destroy(), which is not NULL
tolerant but is given a NULL devlink global region pointer.

At least on some chips, some devlink regions are conditionally registered
since the blamed commit, see mv88e6xxx_setup_devlink_regions_global():

		if (cond && !cond(chip))
			continue;

These are MV88E6XXX_REGION_STU and MV88E6XXX_REGION_PVT. If the chip
does not have an STU or PVT, it should crash like this.

To fix the issue, avoid unregistering those regions which are NULL, i.e.
were skipped at mv88e6xxx_setup_devlink_regions_global() time.

Fixes: 836021a2 ("net: dsa: mv88e6xxx: Export cross-chip PVT as devlink region")
Tested-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Link: https://patch.msgid.link/20250414212850.2953957-1-vladimir.oltean@nxp.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent b2727326

drivers/net/dsa/mv88e6xxx/devlink.c

+2 −1
Original line number Diff line number Diff line
@@ -736,6 +736,7 @@ void mv88e6xxx_teardown_devlink_regions_global(struct dsa_switch *ds) 
	int i;



	for (i = 0; i < ARRAY_SIZE(mv88e6xxx_regions); i++)

		if (chip->regions[i])

			dsa_devlink_region_destroy(chip->regions[i]);

}