aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/netlink/af_netlink.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 85d27f9f0e67..b3025a603d56 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -154,6 +154,12 @@ static void netlink_destroy_callback(struct netlink_callback *cb)
154 kfree(cb); 154 kfree(cb);
155} 155}
156 156
157static void netlink_consume_callback(struct netlink_callback *cb)
158{
159 consume_skb(cb->skb);
160 kfree(cb);
161}
162
157static void netlink_sock_destruct(struct sock *sk) 163static void netlink_sock_destruct(struct sock *sk)
158{ 164{
159 struct netlink_sock *nlk = nlk_sk(sk); 165 struct netlink_sock *nlk = nlk_sk(sk);
@@ -902,8 +908,10 @@ static int netlink_unicast_kernel(struct sock *sk, struct sk_buff *skb)
902 ret = skb->len; 908 ret = skb->len;
903 skb_set_owner_r(skb, sk); 909 skb_set_owner_r(skb, sk);
904 nlk->netlink_rcv(skb); 910 nlk->netlink_rcv(skb);
911 consume_skb(skb);
912 } else {
913 kfree_skb(skb);
905 } 914 }
906 kfree_skb(skb);
907 sock_put(sk); 915 sock_put(sk);
908 return ret; 916 return ret;
909} 917}
@@ -1728,7 +1736,7 @@ static int netlink_dump(struct sock *sk)
1728 nlk->cb = NULL; 1736 nlk->cb = NULL;
1729 mutex_unlock(nlk->cb_mutex); 1737 mutex_unlock(nlk->cb_mutex);
1730 1738
1731 netlink_destroy_callback(cb); 1739 netlink_consume_callback(cb);
1732 return 0; 1740 return 0;
1733 1741
1734errout_skb: 1742errout_skb: