From: David S. Miller <davem@davemloft.net>
Date: Tue, 14 Oct 2014 21:02:37 +0000 (-0400)
Subject: net: Trap attempts to call sock_kfree_s() with a NULL pointer.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e53da5fbfc02586fe4506ed583069b8205f3e38d;p=linux-beck.git

net: Trap attempts to call sock_kfree_s() with a NULL pointer.

Unlike normal kfree() it is never right to call sock_kfree_s() with
a NULL pointer, because sock_kfree_s() also has the side effect of
discharging the memory from the sockets quota.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/sock.c b/net/core/sock.c
index b4f3ea2fce60..15e0c67b1069 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1718,6 +1718,8 @@ EXPORT_SYMBOL(sock_kmalloc);
  */
 void sock_kfree_s(struct sock *sk, void *mem, int size)
 {
+	if (WARN_ON_ONCE(!mem))
+		return;
 	kfree(mem);
 	atomic_sub(size, &sk->sk_omem_alloc);
 }