* [PATCH net-next] ethtool: fix ->reply_size() error handling
@ 2020-01-08 5:41 Dan Carpenter
2020-01-08 9:08 ` Michal Kubecek
2020-01-09 0:03 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2020-01-08 5:41 UTC (permalink / raw)
To: David S. Miller, Michal Kubecek
Cc: Florian Fainelli, Andrew Lunn, netdev, kernel-janitors
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>
---
net/ethtool/netlink.c | 6 ++++--
1 file 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)
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] ethtool: fix ->reply_size() error handling
2020-01-08 5:41 [PATCH net-next] ethtool: fix ->reply_size() error handling Dan Carpenter
@ 2020-01-08 9:08 ` Michal Kubecek
2020-01-09 0:03 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Michal Kubecek @ 2020-01-08 9:08 UTC (permalink / raw)
To: netdev
Cc: Dan Carpenter, David S. Miller, Florian Fainelli, Andrew Lunn,
kernel-janitors
On Wed, Jan 08, 2020 at 08:41:25AM +0300, Dan Carpenter wrote:
> 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>
> ---
> net/ethtool/netlink.c | 6 ++++--
> 1 file 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)
Thank you.
Reviewed-by: Michal Kubecek <mkubecek@suse.cz>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] ethtool: fix ->reply_size() error handling
2020-01-08 5:41 [PATCH net-next] ethtool: fix ->reply_size() error handling Dan Carpenter
2020-01-08 9:08 ` Michal Kubecek
@ 2020-01-09 0:03 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2020-01-09 0:03 UTC (permalink / raw)
To: dan.carpenter; +Cc: mkubecek, f.fainelli, andrew, netdev, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Wed, 8 Jan 2020 08:41:25 +0300
> 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>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-01-09 0:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-08 5:41 [PATCH net-next] ethtool: fix ->reply_size() error handling Dan Carpenter
2020-01-08 9:08 ` Michal Kubecek
2020-01-09 0:03 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).