ethtool: mm: fix get_mm() return code not propagating to user space
authorVladimir Oltean <vladimir.oltean@nxp.com>
Mon, 6 Feb 2023 09:49:32 +0000 (11:49 +0200)
committerPaolo Abeni <pabeni@redhat.com>
Tue, 7 Feb 2023 14:39:06 +0000 (15:39 +0100)
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>
Link: https://lore.kernel.org/r/20230206094932.446379-1-vladimir.oltean@nxp.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
net/ethtool/mm.c

index 7e51f76..e612856 100644 (file)
@@ -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,