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

Commit ec3d7202 authored by Jaco Coetzee's avatar Jaco Coetzee Committed by Greg Kroah-Hartman
Browse files

nfp: add port from netdev validation for EEPROM access 



[ Upstream commit 0873016d46f6dfafd1bdf4d9b935b3331b226f7c ]

Setting of the port flag `NFP_PORT_CHANGED`, introduced
to ensure the correct reading of EEPROM data, causes a
fatal kernel NULL pointer dereference in cases where
the target netdev type cannot be determined.

Add validation of port struct pointer before attempting
to set the `NFP_PORT_CHANGED` flag. Return that operation
is not supported if the netdev type cannot be determined.

Fixes: 4ae97cae07e1 ("nfp: ethtool: fix the display error of `ethtool -m DEVNAME`")
Signed-off-by: default avatarJaco Coetzee <jaco.coetzee@corigine.com>
Reviewed-by: default avatarLouis Peens <louis.peens@corigine.com>
Signed-off-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 9b8061a6

drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c

+3 −0
Original line number Diff line number Diff line
@@ -1127,6 +1127,9 @@ nfp_port_get_module_info(struct net_device *netdev, 
	u8 data;



	port = nfp_port_from_netdev(netdev);

	if (!port)

		return -EOPNOTSUPP;



	/* update port state to get latest interface */

	set_bit(NFP_PORT_CHANGED, &port->flags);

	eth_port = nfp_port_get_eth_port(port);