Commit e0b3ef17 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

phylink: require valid state argument to phylink_validate_mask_caps() 



state is deferenced earlier in the function, the NULL check
is pointless. Since we don't have any crash reports presumably
it's safe to assume state is not NULL.

Fixes: f392a184 ("net: phylink: provide phylink_validate_mask_caps() helper")
Reviewed-by: default avatarSean Anderson <sean.anderson@seco.com>
Link: https://lore.kernel.org/r/20221025185126.1720553-1-kuba@kernel.org


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

drivers/net/phy/phylink.c

+2 −3
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ EXPORT_SYMBOL_GPL(phylink_get_capabilities); 
/**

 * phylink_validate_mask_caps() - Restrict link modes based on caps

 * @supported: ethtool bitmask for supported link modes.

 * @state: an (optional) pointer to a &struct phylink_link_state.

 * @state: pointer to a &struct phylink_link_state.

 * @mac_capabilities: bitmask of MAC capabilities

 *

 * Calculate the supported link modes based on @mac_capabilities, and restrict
@@ -585,7 +585,6 @@ void phylink_validate_mask_caps(unsigned long *supported, 
	phylink_caps_to_linkmodes(mask, caps);



	linkmode_and(supported, supported, mask);

	if (state)

	linkmode_and(state->advertising, state->advertising, mask);

}

EXPORT_SYMBOL_GPL(phylink_validate_mask_caps);