Skip to content

Commit

Permalink
ethtool: fix error handling in linkstate_prepare_data()
Browse files Browse the repository at this point in the history
When getting SQI or maximum SQI value fails in linkstate_prepare_data(), we
must not return without calling ethnl_ops_complete(dev) as that could
result in imbalance between ethtool_ops ->begin() and ->complete() calls.

Fixes: 8066021 ("ethtool: provide UAPI for PHY Signal Quality Index (SQI)")
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
mkubecek authored and davem330 committed Jun 25, 2020
1 parent 0e00c05 commit 1ae71d9
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions net/ethtool/linkstate.c
Original file line number Diff line number Diff line change
Expand Up @@ -78,19 +78,18 @@ static int linkstate_prepare_data(const struct ethnl_req_info *req_base,

ret = linkstate_get_sqi(dev);
if (ret < 0 && ret != -EOPNOTSUPP)
return ret;

goto out;
data->sqi = ret;

ret = linkstate_get_sqi_max(dev);
if (ret < 0 && ret != -EOPNOTSUPP)
return ret;

goto out;
data->sqi_max = ret;

ret = 0;
out:
ethnl_ops_complete(dev);

return 0;
return ret;
}

static int linkstate_reply_size(const struct ethnl_req_info *req_base,
Expand Down

0 comments on commit 1ae71d9

Please sign in to comment.