diff options
| author | David S. Miller <davem@davemloft.net> | 2017-10-10 06:11:09 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-10 06:11:09 +0300 |
| commit | d93fa2ba64384a0bbee4ae7409d85fccb2cfcf14 (patch) | |
| tree | 8e55d9d74f46ce13e4299d23c23c72b9306798c1 /net/xfrm/xfrm_input.c | |
| parent | d0e60206bea2dec46c0a28fd6b116646aa67c5ae (diff) | |
| parent | 529a86e063e9ff625c4ff247d8aa17d8072444fb (diff) | |
| download | linux-d93fa2ba64384a0bbee4ae7409d85fccb2cfcf14.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/xfrm/xfrm_input.c')
| -rw-r--r-- | net/xfrm/xfrm_input.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c index 2515cd2bc5db..8ac9d32fb79d 100644 --- a/net/xfrm/xfrm_input.c +++ b/net/xfrm/xfrm_input.c @@ -429,7 +429,8 @@ resume: nf_reset(skb); if (decaps) { - skb->sp->olen = 0; + if (skb->sp) + skb->sp->olen = 0; skb_dst_drop(skb); gro_cells_receive(&gro_cells, skb); return 0; @@ -440,7 +441,8 @@ resume: err = x->inner_mode->afinfo->transport_finish(skb, xfrm_gro || async); if (xfrm_gro) { - skb->sp->olen = 0; + if (skb->sp) + skb->sp->olen = 0; skb_dst_drop(skb); gro_cells_receive(&gro_cells, skb); return err; |