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

Commit fe785bee authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

netlabel: netlink_unicast calls kfree_skb on error path by itself 



So, no need to kfree_skb here on the error path. In this case we can
simply return.

Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Acked-by: default avatarPaul Moore <paul.moore@hp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2e655571

net/netlabel/netlabel_cipso_v4.c

+1 −6
Original line number Diff line number Diff line
@@ -584,12 +584,7 @@ static int netlbl_cipsov4_list(struct sk_buff *skb, struct genl_info *info) 
	rcu_read_unlock();



	genlmsg_end(ans_skb, data);



	ret_val = genlmsg_reply(ans_skb, info);

	if (ret_val != 0)

		goto list_failure;



	return 0;

	return genlmsg_reply(ans_skb, info);



list_retry:

	/* XXX - this limit is a guesstimate */

net/netlabel/netlabel_mgmt.c

+2 −10
Original line number Diff line number Diff line
@@ -386,11 +386,7 @@ static int netlbl_mgmt_listdef(struct sk_buff *skb, struct genl_info *info) 
	rcu_read_unlock();



	genlmsg_end(ans_skb, data);



	ret_val = genlmsg_reply(ans_skb, info);

	if (ret_val != 0)

		goto listdef_failure;

	return 0;

	return genlmsg_reply(ans_skb, info);



listdef_failure_lock:

	rcu_read_unlock();
@@ -501,11 +497,7 @@ static int netlbl_mgmt_version(struct sk_buff *skb, struct genl_info *info) 
		goto version_failure;



	genlmsg_end(ans_skb, data);



	ret_val = genlmsg_reply(ans_skb, info);

	if (ret_val != 0)

		goto version_failure;

	return 0;

	return genlmsg_reply(ans_skb, info);



version_failure:

	kfree_skb(ans_skb);

net/netlabel/netlabel_unlabeled.c

+1 −5
Original line number Diff line number Diff line
@@ -1107,11 +1107,7 @@ static int netlbl_unlabel_list(struct sk_buff *skb, struct genl_info *info) 
		goto list_failure;



	genlmsg_end(ans_skb, data);



	ret_val = genlmsg_reply(ans_skb, info);

	if (ret_val != 0)

		goto list_failure;

	return 0;

	return genlmsg_reply(ans_skb, info);



list_failure:

	kfree_skb(ans_skb);