From 786dfcf456d2fcd10ac3a9f37a24161efa77df6a Mon Sep 17 00:00:00 2001 From: Shannon Nelson Date: Tue, 2 May 2017 17:17:36 -0700 Subject: [PATCH] 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 Reviewed-By: Jane Chu Reviewed-By: Alan Maguire Signed-off-by: Allen Pais --- net/ipv6/ip6_output.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 4abbd63e6f8d..bdeed738e4c1 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"); -- 2.50.1