ethtool: fix error handling in linkstate_prepare_data()
Subsystems (3)
PATCH 1/1 ethtool: fix error handling in linkstate_prepare_data()
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 806602191592 ("ethtool: provide UAPI for PHY Signal Quality Index (SQI)")
Signed-off-by Michal Kubecek <[email protected]>
--- net/ethtool/linkstate.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
net/ethtool/linkstate.c +5 -6
@@ -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,
Signature · 1 line
2.27.0
From: Michal Kubecek <[email protected]>
Date: Thu, 25 Jun 2020 00:09:08 +0200 (CEST)
Quoted 6 lines
When getting SQI or maximum SQI value fails in
linkstate_prepare_data(), we must not return without callingethnl_ops_complete(dev)as that could result in imbalance betweenethtool_ops->begin() and ->complete() calls.Fixes 806602191592 ("ethtool: provide UAPI for PHY Signal Quality Index (SQI)")Signed-off-by Michal Kubecek <[email protected]>
Applied, thank you.