iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

phylink: require valid state argument to phylink_validate_mask_caps()

Browse Source 
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: f392a18464 ("net: phylink: provide phylink_validate_mask_caps() helper")
Reviewed-by: Sean Anderson <sean.anderson@seco.com>
Link: https://lore.kernel.org/r/20221025185126.1720553-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
2022-10-25 11:51:26 -07:00
parent d1e96cc4fb
commit e0b3ef17f4
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/phy/phylink.c
View File

@@ -564,7 +564,7 @@ EXPORT_SYMBOL_GPL(phylink_get_capabilities);
/** /**
* phylink_validate_mask_caps() - Restrict link modes based on caps * phylink_validate_mask_caps() - Restrict link modes based on caps
* @supported: ethtool bitmask for supported link modes. * @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 * @mac_capabilities: bitmask of MAC capabilities
* *
* Calculate the supported link modes based on @mac_capabilities, and restrict * Calculate the supported link modes based on @mac_capabilities, and restrict
@@ -585,8 +585,7 @@ void phylink_validate_mask_caps(unsigned long *supported,
phylink_caps_to_linkmodes(mask, caps); phylink_caps_to_linkmodes(mask, caps);
linkmode_and(supported, supported, mask); linkmode_and(supported, supported, mask);
if (state) linkmode_and(state->advertising, state->advertising, mask);
linkmode_and(state->advertising, state->advertising, mask);
} }
EXPORT_SYMBOL_GPL(phylink_validate_mask_caps); EXPORT_SYMBOL_GPL(phylink_validate_mask_caps);