[PATCH net-next] phylink: require valid state argument to phylink_validate_mask_caps()

[PATCH net-next] phylink: require valid state argument to phylink_validate_mask_caps()

[Jakub Kicinski]

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: f392a1846489 ("net: phylink: provide phylink_validate_mask_caps() helper")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
CC: linux@armlinux.org.uk
CC: andrew@lunn.ch
CC: hkallweit1@gmail.com
CC: sean.anderson@seco.com
CC: rmk+kernel@armlinux.org.uk
---
 drivers/net/phy/phylink.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 62106c9e9a9d..88f60e98b760 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -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,8 +585,7 @@ 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);
+	linkmode_and(state->advertising, state->advertising, mask);
 }
 EXPORT_SYMBOL_GPL(phylink_validate_mask_caps);
 
-- 
2.37.3

Re: [PATCH net-next] phylink: require valid state argument to phylink_validate_mask_caps()

[Sean Anderson]

On 10/25/22 14:51, Jakub Kicinski wrote:
> 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.

Yes, I believe this was in place just for a patch which hasn't
been upstreamed.

> Fixes: f392a1846489 ("net: phylink: provide phylink_validate_mask_caps() helper")
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> ---
> CC: linux@armlinux.org.uk
> CC: andrew@lunn.ch
> CC: hkallweit1@gmail.com
> CC: sean.anderson@seco.com
> CC: rmk+kernel@armlinux.org.uk
> ---
>  drivers/net/phy/phylink.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
> index 62106c9e9a9d..88f60e98b760 100644
> --- a/drivers/net/phy/phylink.c
> +++ b/drivers/net/phy/phylink.c
> @@ -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,8 +585,7 @@ 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);
> +	linkmode_and(state->advertising, state->advertising, mask);
>  }
>  EXPORT_SYMBOL_GPL(phylink_validate_mask_caps);
>  

Reviewed-by: Sean Anderson <sean.anderson@seco.com>

Re: [PATCH net-next] phylink: require valid state argument to phylink_validate_mask_caps()

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:

On Tue, 25 Oct 2022 11:51:26 -0700 you wrote:
> 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: f392a1846489 ("net: phylink: provide phylink_validate_mask_caps() helper")
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> 
> [...]

Here is the summary with links:
  - [net-next] phylink: require valid state argument to phylink_validate_mask_caps()
    https://git.kernel.org/netdev/net-next/c/e0b3ef17f45e

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html