Commit d97772db authored by Dan Carpenter's avatar Dan Carpenter Committed by David S. Miller
Browse files

ethtool: fix ->reply_size() error handling 



The "ret < 0" comparison is never true because "ret" is still zero.

Fixes: 728480f1 ("ethtool: default handlers for GET requests")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarMichal Kubecek <mkubecek@suse.cz>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a6dd0480

net/ethtool/netlink.c

+4 −2
Original line number Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE