diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2020-01-08 08:41:25 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-01-08 16:03:35 -0800 |
| commit | d97772dbd7727655aa894f1610e983e73678212e (patch) | |
| tree | 38311173398530209bcf02898d6c38909b78a728 /net | |
| parent | ethtool: fix a memory leak in ethnl_default_start() (diff) | |
| download | linux-dev-d97772dbd7727655aa894f1610e983e73678212e.tar.xz linux-dev-d97772dbd7727655aa894f1610e983e73678212e.zip | |
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')
| -rw-r--r-- | net/ethtool/netlink.c | 6 |
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) |