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 4abbd63e6f8d39425c023f1ae9bd2a75abce0227..bdeed738e4c1d8e7a17a99dbde35369c6c1ab5b1 100644 (file)
--- 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");