[PATCH net-next] ethtool: mm: fix get_mm() return code not propagating to user space

[PATCH net-next] ethtool: mm: fix get_mm() return code not propagating to user space

[Vladimir Oltean]

If ops->get_mm() returns a non-zero error code, we goto out_complete,
but there, we return 0. Fix that to propagate the "ret" variable to the
caller. If ops->get_mm() succeeds, it will always return 0.

Fixes: 2b30f8291a30 ("net: ethtool: add support for MAC Merge layer")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 net/ethtool/mm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ethtool/mm.c b/net/ethtool/mm.c
index 7e51f7633001..e612856eed8c 100644
--- a/net/ethtool/mm.c
+++ b/net/ethtool/mm.c
@@ -56,7 +56,7 @@ static int mm_prepare_data(const struct ethnl_req_info *req_base,
 out_complete:
 	ethnl_ops_complete(dev);
 
-	return 0;
+	return ret;
 }
 
 static int mm_reply_size(const struct ethnl_req_info *req_base,
-- 
2.34.1

Re: [PATCH net-next] ethtool: mm: fix get_mm() return code not propagating to user space

[Simon Horman]

On Mon, Feb 06, 2023 at 11:49:32AM +0200, Vladimir Oltean wrote:
> If ops->get_mm() returns a non-zero error code, we goto out_complete,
> but there, we return 0. Fix that to propagate the "ret" variable to the
> caller. If ops->get_mm() succeeds, it will always return 0.
> 
> Fixes: 2b30f8291a30 ("net: ethtool: add support for MAC Merge layer")
> Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>

Reviewed-by: Simon Horman <simon.horman@corigine.com>

Re: [PATCH net-next] ethtool: mm: fix get_mm() return code not propagating to user space

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net-next.git (master)
by Paolo Abeni <pabeni@redhat.com>:

On Mon,  6 Feb 2023 11:49:32 +0200 you wrote:
> If ops->get_mm() returns a non-zero error code, we goto out_complete,
> but there, we return 0. Fix that to propagate the "ret" variable to the
> caller. If ops->get_mm() succeeds, it will always return 0.
> 
> Fixes: 2b30f8291a30 ("net: ethtool: add support for MAC Merge layer")
> Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
> 
> [...]

Here is the summary with links:
  - [net-next] ethtool: mm: fix get_mm() return code not propagating to user space
    https://git.kernel.org/netdev/net-next/c/ca8e4cbff6d5

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