Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b51eb57d authored by Arkadi Sharshevsky's avatar Arkadi Sharshevsky Committed by Greg Kroah-Hartman
Browse files

devlink: Remove redundant free on error path 




[ Upstream commit 7fe4d6dcbcb43fe0282d4213fc52be178bb30e91 ]

The current code performs unneeded free. Remove the redundant skb freeing
during the error path.

Fixes: 1555d204 ("devlink: Support for pipeline debug (dpipe)")
Signed-off-by: default avatarArkadi Sharshevsky <arkadis@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 67a1dc56

net/core/devlink.c

+4 −12
Original line number Diff line number Diff line
@@ -1776,7 +1776,7 @@ static int devlink_dpipe_tables_fill(struct genl_info *info, 
	if (!nlh) {

		err = devlink_dpipe_send_and_alloc_skb(&skb, info);

		if (err)

			goto err_skb_send_alloc;

			return err;

		goto send_done;

	}
@@ -1785,7 +1785,6 @@ static int devlink_dpipe_tables_fill(struct genl_info *info, 
nla_put_failure:

	err = -EMSGSIZE;

err_table_put:

err_skb_send_alloc:

	genlmsg_cancel(skb, hdr);

	nlmsg_free(skb);

	return err;
@@ -2051,7 +2050,7 @@ static int devlink_dpipe_entries_fill(struct genl_info *info, 
					     table->counters_enabled,

					     &dump_ctx);

	if (err)

		goto err_entries_dump;

		return err;



send_done:

	nlh = nlmsg_put(dump_ctx.skb, info->snd_portid, info->snd_seq,
@@ -2059,16 +2058,10 @@ static int devlink_dpipe_entries_fill(struct genl_info *info, 
	if (!nlh) {

		err = devlink_dpipe_send_and_alloc_skb(&dump_ctx.skb, info);

		if (err)

			goto err_skb_send_alloc;

			return err;

		goto send_done;

	}

	return genlmsg_reply(dump_ctx.skb, info);



err_entries_dump:

err_skb_send_alloc:

	genlmsg_cancel(dump_ctx.skb, dump_ctx.hdr);

	nlmsg_free(dump_ctx.skb);

	return err;

}



static int devlink_nl_cmd_dpipe_entries_get(struct sk_buff *skb,
@@ -2207,7 +2200,7 @@ static int devlink_dpipe_headers_fill(struct genl_info *info, 
	if (!nlh) {

		err = devlink_dpipe_send_and_alloc_skb(&skb, info);

		if (err)

			goto err_skb_send_alloc;

			return err;

		goto send_done;

	}

	return genlmsg_reply(skb, info);
@@ -2215,7 +2208,6 @@ static int devlink_dpipe_headers_fill(struct genl_info *info, 
nla_put_failure:

	err = -EMSGSIZE;

err_table_put:

err_skb_send_alloc:

	genlmsg_cancel(skb, hdr);

	nlmsg_free(skb);

	return err;