Skip to content

Commit

Permalink
netlabel: netlink_unicast calls kfree_skb on error path by itself
Browse files Browse the repository at this point in the history
So, no need to kfree_skb here on the error path. In this case we can
simply return.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Acked-by: Paul Moore <paul.moore@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Denis V. Lunev authored and David S. Miller committed Jul 10, 2008
1 parent 2e65557 commit fe785be
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 21 deletions.
7 changes: 1 addition & 6 deletions net/netlabel/netlabel_cipso_v4.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
12 changes: 2 additions & 10 deletions net/netlabel/netlabel_mgmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 1 addition & 5 deletions net/netlabel/netlabel_unlabeled.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit fe785be

Please sign in to comment.