diff options
| author | Todd Kjos <tkjos@google.com> | 2017-03-02 13:53:48 -0800 |
|---|---|---|
| committer | Todd Kjos <tkjos@google.com> | 2017-03-02 13:53:48 -0800 |
| commit | 837de638dc019843efb0f8744e299769af32e004 (patch) | |
| tree | 3f693d421593332edcdf1d877433d31e9f1525de /net/ipv4/ping.c | |
| parent | f04805218728192d346291c1a0e78cb184142bad (diff) | |
| parent | dd4534d88b93a911983503851ec9441787a4997d (diff) | |
Merge branch 'upstream-linux-4.4.y' into android-4.4
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 495fefe6a898..1f138d61d592 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -645,6 +645,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); |