Commit a6dd0480 authored by Dan Carpenter's avatar Dan Carpenter Committed by David S. Miller

ethtool: fix a memory leak in ethnl_default_start()

If ethnl_default_parse() fails then we need to free a couple
memory allocations before returning.

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 78b6d073
...@@ -472,8 +472,8 @@ static int ethnl_default_start(struct netlink_callback *cb) ...@@ -472,8 +472,8 @@ static int ethnl_default_start(struct netlink_callback *cb)
return -ENOMEM; return -ENOMEM;
reply_data = kmalloc(ops->reply_data_size, GFP_KERNEL); reply_data = kmalloc(ops->reply_data_size, GFP_KERNEL);
if (!reply_data) { if (!reply_data) {
kfree(req_info); ret = -ENOMEM;
return -ENOMEM; goto free_req_info;
} }
ret = ethnl_default_parse(req_info, cb->nlh, sock_net(cb->skb->sk), ops, ret = ethnl_default_parse(req_info, cb->nlh, sock_net(cb->skb->sk), ops,
...@@ -487,7 +487,7 @@ static int ethnl_default_start(struct netlink_callback *cb) ...@@ -487,7 +487,7 @@ static int ethnl_default_start(struct netlink_callback *cb)
req_info->dev = NULL; req_info->dev = NULL;
} }
if (ret < 0) if (ret < 0)
return ret; goto free_reply_data;
ctx->ops = ops; ctx->ops = ops;
ctx->req_info = req_info; ctx->req_info = req_info;
...@@ -496,6 +496,13 @@ static int ethnl_default_start(struct netlink_callback *cb) ...@@ -496,6 +496,13 @@ static int ethnl_default_start(struct netlink_callback *cb)
ctx->pos_idx = 0; ctx->pos_idx = 0;
return 0; return 0;
free_reply_data:
kfree(reply_data);
free_req_info:
kfree(req_info);
return ret;
} }
/* default ->done() handler for GET requests */ /* default ->done() handler for GET requests */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment