ethtool: fix a memory leak in ethnl_default_start() (a6dd0480) · Commits · 戴 / test

If ethnl_default_parse() fails then we need to free a couple memory allocations before returning. Fixes: ("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>

net/ethtool/netlink.c

+10 −3

Original line number	Diff line number	Diff line
		@@ -472,8 +472,8 @@ static int ethnl_default_start(struct netlink_callback *cb)
		return -ENOMEM;
		reply_data = kmalloc(ops->reply_data_size, GFP_KERNEL);
		if (!reply_data) {
		kfree(req_info);
		return -ENOMEM;
		ret = -ENOMEM;
		goto free_req_info;
		}

		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)
		req_info->dev = NULL;
		}
		if (ret < 0)
		return ret;
		goto free_reply_data;

		ctx->ops = ops;
		ctx->req_info = req_info;
		@@ -496,6 +496,13 @@ static int ethnl_default_start(struct netlink_callback *cb)
		ctx->pos_idx = 0;

		return 0;

		free_reply_data:
		kfree(reply_data);
		free_req_info:
		kfree(req_info);

		return ret;
		}

		/* default ->done() handler for GET requests */

Admin message