2022-11-18 01:31:39

by Yue Haibing

Subject: [PATCH] macsec: Fix invalid error code set

'ret' is defined twice in macsec_changelink(), when it is set in macsec_is_offloaded
case, it will be invalid before return.

Fixes: 3cf3227a21d1 ("net: macsec: hardware offloading infrastructure")
Signed-off-by: YueHaibing <[email protected]>
---
drivers/net/macsec.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
index a7b46219bab7..d73b9d535b7a 100644
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
@@ -3835,7 +3835,6 @@ static int macsec_changelink(struct net_device *dev, struct nlattr *tb[],
if (macsec_is_offloaded(macsec)) {
const struct macsec_ops *ops;
struct macsec_context ctx;
- int ret;

ops = macsec_get_ops(netdev_priv(dev), &ctx);
if (!ops) {
--
2.20.1

2022-11-18 03:19:15

by Saeed Mahameed

Subject: Re: [PATCH] macsec: Fix invalid error code set

On 18 Nov 09:12, YueHaibing wrote:
>'ret' is defined twice in macsec_changelink(), when it is set in macsec_is_offloaded
>case, it will be invalid before return.
>
>Fixes: 3cf3227a21d1 ("net: macsec: hardware offloading infrastructure")
>Signed-off-by: YueHaibing <[email protected]>

I have the same exact patch lined up in my internal queue.
this needs to go to net: so for next time please tag [PATCH net].

Reviewed-by: Saeed Mahameed <[email protected]>

2022-11-18 09:42:52

by Antoine Tenart

Subject: Re: [PATCH] macsec: Fix invalid error code set

Quoting YueHaibing (2022-11-18 02:12:49)
> 'ret' is defined twice in macsec_changelink(), when it is set in macsec_is_offloaded
> case, it will be invalid before return.
>
> Fixes: 3cf3227a21d1 ("net: macsec: hardware offloading infrastructure")
> Signed-off-by: YueHaibing <[email protected]>

Reviewed-by: Antoine Tenart <[email protected]>

Thanks!

> ---
> drivers/net/macsec.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
> index a7b46219bab7..d73b9d535b7a 100644
> --- a/drivers/net/macsec.c
> +++ b/drivers/net/macsec.c
> @@ -3835,7 +3835,6 @@ static int macsec_changelink(struct net_device *dev, struct nlattr *tb[],
> if (macsec_is_offloaded(macsec)) {
> const struct macsec_ops *ops;
> struct macsec_context ctx;
> - int ret;
>
> ops = macsec_get_ops(netdev_priv(dev), &ctx);
> if (!ops) {
> --
> 2.20.1
>

2022-11-19 04:11:51

by patchwork-bot+netdevbpf

Subject: Re: [PATCH] macsec: Fix invalid error code set

Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:

On Fri, 18 Nov 2022 09:12:49 +0800 you wrote:
> 'ret' is defined twice in macsec_changelink(), when it is set in macsec_is_offloaded
> case, it will be invalid before return.
>
> Fixes: 3cf3227a21d1 ("net: macsec: hardware offloading infrastructure")
> Signed-off-by: YueHaibing <[email protected]>
> ---
> drivers/net/macsec.c | 1 -
> 1 file changed, 1 deletion(-)

Here is the summary with links:
- macsec: Fix invalid error code set
https://git.kernel.org/netdev/net/c/7cef6b73fba9

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