summaryrefslogtreecommitdiff
path: root/net/ethtool
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2020-01-08 08:41:25 +0300
committerDavid S. Miller <davem@davemloft.net>2020-01-09 03:03:35 +0300
commitd97772dbd7727655aa894f1610e983e73678212e (patch)
tree38311173398530209bcf02898d6c38909b78a728 /net/ethtool
parenta6dd04807ce4d7b71920d996e6b84fa3733a1bfd (diff)
downloadlinux-d97772dbd7727655aa894f1610e983e73678212e.tar.xz
ethtool: fix ->reply_size() error handling
The "ret < 0" comparison is never true because "ret" is still zero. Fixes: 728480f12442 ("ethtool: default handlers for GET requests") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Michal Kubecek <mkubecek@suse.cz> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ethtool')
-rw-r--r--net/ethtool/netlink.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ethtool/netlink.c b/net/ethtool/netlink.c
index 5d16436498ac..86b79f9bc08d 100644
--- a/net/ethtool/netlink.c
+++ b/net/ethtool/netlink.c
@@ -319,9 +319,10 @@ static int ethnl_default_doit(struct sk_buff *skb, struct genl_info *info)
rtnl_unlock();
if (ret < 0)
goto err_cleanup;
- reply_len = ops->reply_size(req_info, reply_data);
+ ret = ops->reply_size(req_info, reply_data);
if (ret < 0)
goto err_cleanup;
+ reply_len = ret;
ret = -ENOMEM;
rskb = ethnl_reply_init(reply_len, req_info->dev, ops->reply_cmd,
ops->hdr_attr, info, &reply_payload);
@@ -555,9 +556,10 @@ static void ethnl_default_notify(struct net_device *dev, unsigned int cmd,
ret = ops->prepare_data(req_info, reply_data, NULL);
if (ret < 0)
goto err_cleanup;
- reply_len = ops->reply_size(req_info, reply_data);
+ ret = ops->reply_size(req_info, reply_data);
if (ret < 0)
goto err_cleanup;
+ reply_len = ret;
ret = -ENOMEM;
skb = genlmsg_new(reply_len, GFP_KERNEL);
if (!skb)