diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-11 02:31:11 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-11 02:31:11 -0500 |
| commit | 35eeacf1820a08305c2b0960febfa190f5a6dd63 (patch) | |
| tree | f1227c7384ee01d3f029cc5f82223234e6456c5f /net/ipv4/ping.c | |
| parent | bed45f79a2afc9d7c279b880dfcac8f27d513b50 (diff) | |
| parent | 1ee18329fae936089c6c599250ae92482ff2b81f (diff) | |
| download | linux-35eeacf1820a08305c2b0960febfa190f5a6dd63.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv4/ping.c')
| -rw-r--r-- | net/ipv4/ping.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index 6ee792d83d5b..2af6244b83e2 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -642,6 +642,8 @@ static int ping_v4_push_pending_frames(struct sock *sk, struct pingfakehdr *pfh, { struct sk_buff *skb = skb_peek(&sk->sk_write_queue); + if (!skb) + return 0; pfh->wcheck = csum_partial((char *)&pfh->icmph, sizeof(struct icmphdr), pfh->wcheck); pfh->icmph.checksum = csum_fold(pfh->wcheck); |