From: Florian Westphal <fw@strlen.de>
Date: Sun, 23 Jul 2017 17:54:47 +0000 (+0200)
Subject: skbuff: re-add check for NULL skb->head in kfree_skb path
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a28b1b90de8322ecc45d58f1c08da12197dad17f;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

skbuff: re-add check for NULL skb->head in kfree_skb path

A null check is needed after all.  netlink skbs can have skb->head be
backed by vmalloc.  The netlink destructor vfree()s head, then sets it to
NULL.  We then panic in skb_release_data with a NULL dereference.

Re-add such a test.

Alternative would be to switch to kvfree to free skb->head memory
and remove the special handling in netlink destructor.

Reported-by: kernel test robot <fengguang.wu@intel.com>
Fixes: 06dc75ab06943 ("net: Revert "net: add function to allocate sk_buff head without data area")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 84bdfa229b0d..c27da51d14e4 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -638,7 +638,8 @@ void skb_release_head_state(struct sk_buff *skb)
 static void skb_release_all(struct sk_buff *skb)
 {
 	skb_release_head_state(skb);
-	skb_release_data(skb);
+	if (likely(skb->head))
+		skb_release_data(skb);
 }
 
 /**