diff options
-rw-r--r-- | kernel/audit.c | 2 | ||||
-rw-r--r-- | net/netlink/af_netlink.c | 9 | ||||
-rw-r--r-- | net/unix/af_unix.c | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/kernel/audit.c b/kernel/audit.c index c71bd26631a2..8296aa516c5a 100644 --- a/kernel/audit.c +++ b/kernel/audit.c | |||
@@ -407,7 +407,7 @@ static void kauditd_send_skb(struct sk_buff *skb) | |||
407 | audit_hold_skb(skb); | 407 | audit_hold_skb(skb); |
408 | } else | 408 | } else |
409 | /* drop the extra reference if sent ok */ | 409 | /* drop the extra reference if sent ok */ |
410 | kfree_skb(skb); | 410 | consume_skb(skb); |
411 | } | 411 | } |
412 | 412 | ||
413 | static int kauditd_thread(void *dummy) | 413 | static int kauditd_thread(void *dummy) |
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 7aeaa83193db..8648a9922aab 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c | |||
@@ -1076,14 +1076,15 @@ int netlink_broadcast_filtered(struct sock *ssk, struct sk_buff *skb, u32 pid, | |||
1076 | sk_for_each_bound(sk, node, &nl_table[ssk->sk_protocol].mc_list) | 1076 | sk_for_each_bound(sk, node, &nl_table[ssk->sk_protocol].mc_list) |
1077 | do_one_broadcast(sk, &info); | 1077 | do_one_broadcast(sk, &info); |
1078 | 1078 | ||
1079 | kfree_skb(skb); | 1079 | consume_skb(skb); |
1080 | 1080 | ||
1081 | netlink_unlock_table(); | 1081 | netlink_unlock_table(); |
1082 | 1082 | ||
1083 | kfree_skb(info.skb2); | 1083 | if (info.delivery_failure) { |
1084 | 1084 | kfree_skb(info.skb2); | |
1085 | if (info.delivery_failure) | ||
1086 | return -ENOBUFS; | 1085 | return -ENOBUFS; |
1086 | } else | ||
1087 | consume_skb(info.skb2); | ||
1087 | 1088 | ||
1088 | if (info.delivered) { | 1089 | if (info.delivered) { |
1089 | if (info.congested && (allocation & __GFP_WAIT)) | 1090 | if (info.congested && (allocation & __GFP_WAIT)) |
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 75ba48b0d12a..4414a18c63b4 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
@@ -1906,7 +1906,7 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
1906 | break; | 1906 | break; |
1907 | } | 1907 | } |
1908 | 1908 | ||
1909 | kfree_skb(skb); | 1909 | consume_skb(skb); |
1910 | 1910 | ||
1911 | if (siocb->scm->fp) | 1911 | if (siocb->scm->fp) |
1912 | break; | 1912 | break; |