Commit 1499b892 authored by Sean Nyekjaer's avatar Sean Nyekjaer Committed by Jakub Kicinski
Browse files

net: dsa: microchip: provide a list of valid protocols for xmit handler 



Provide a list of valid protocols for which the driver will provide
it's deferred xmit handler.

When using DSA_TAG_PROTO_KSZ8795 protocol, it does not provide a
"connect" method, therefor ksz_connect() is not allocating ksz_tagger_data.

This avoids the following null pointer dereference:
 ksz_connect_tag_protocol from dsa_register_switch+0x9ac/0xee0
 dsa_register_switch from ksz_switch_register+0x65c/0x828
 ksz_switch_register from ksz_spi_probe+0x11c/0x168
 ksz_spi_probe from spi_probe+0x84/0xa8
 spi_probe from really_probe+0xc8/0x2d8

Fixes: ab32f56a ("net: dsa: microchip: ptp: add packet transmission timestamping")
Signed-off-by: default avatarSean Nyekjaer <sean@geanix.com>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Reviewed-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Link: https://lore.kernel.org/r/20231206071655.1626479-1-sean@geanix.com


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

drivers/net/dsa/microchip/ksz_common.c

+12 −4
Original line number Diff line number Diff line
@@ -2713,10 +2713,18 @@ static int ksz_connect_tag_protocol(struct dsa_switch *ds, 
{

	struct ksz_tagger_data *tagger_data;



	switch (proto) {

	case DSA_TAG_PROTO_KSZ8795:

		return 0;

	case DSA_TAG_PROTO_KSZ9893:

	case DSA_TAG_PROTO_KSZ9477:

	case DSA_TAG_PROTO_LAN937X:

		tagger_data = ksz_tagger_data(ds);

		tagger_data->xmit_work_fn = ksz_port_deferred_xmit;



		return 0;

	default:

		return -EPROTONOSUPPORT;

	}

}



static int ksz_port_vlan_filtering(struct dsa_switch *ds, int port,