From: Shannon Nelson <shannon.nelson@oracle.com>
Date: Wed, 3 May 2017 00:17:36 +0000 (-0700)
Subject: ipv6: catch a null skb before using it in a DTRACE
X-Git-Tag: v4.1.12-102.0.20170530_1700~27
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=786dfcf456d2fcd10ac3a9f37a24161efa77df6a;p=users%2Fjedix%2Flinux-maple.git

ipv6: catch a null skb before using it in a DTRACE

Fix a little trap set by an earlier DTRACE_IP patch.  While I was there
I checked the other similar calls and the rest look okay.

Orabug: 25973797

Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com>
Reviewed-By: Jane Chu <jane.chu@oracle.com>
Reviewed-By: Alan Maguire <alan.maguire@oracle.com>
Signed-off-by: Allen Pais <allen.pais@oracle.com>
---

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 4abbd63e6f8d3..bdeed738e4c1d 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1380,9 +1380,9 @@ emsgsize:
 					 sizeof(struct ipv6hdr));
 			DTRACE_IP(drop__out,
 			    struct sk_buff * : pktinfo_t *, skb,
-			    struct sock * : csinfo_t *, skb->sk,
+			    struct sock * : csinfo_t *, skb ? skb->sk : NULL,
 			    void_ip_t * : ipinfo_t *, NULL,
-			    struct net_device * : ifinfo_t *, skb->dev,
+			    struct net_device * : ifinfo_t *, skb ? skb->dev : NULL,
 			    struct iphdr * : ipv4info_t *, NULL,
 			    struct ipv6hdr * : ipv6info_t *, NULL,
 			    char * : string, "packet too big");