diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-07-17 12:16:24 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-07-17 12:16:24 +0800 |
| commit | fe4c808f845e2ff3a3fb6c66009ab69c8d01bf57 (patch) | |
| tree | 82ce8b6476c1c4c84ab05a49c94317f1ce8ac1b7 /net/xfrm/xfrm_input.c | |
| parent | bbe8f0ee88a1eb4bb1e72e593b008faf387f30ac (diff) | |
| parent | 0ac0a856d986c1ab240753479f5e50fdfab82b14 (diff) | |
Merge tag 'v3.18.37' into linux-linaro-lsk-v3.18lsk-v3.18-16.07
This is the 3.18.37 stable release
Diffstat (limited to 'net/xfrm/xfrm_input.c')
| -rw-r--r-- | net/xfrm/xfrm_input.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c index 00977873300c..d0e6d351aba8 100644 --- a/net/xfrm/xfrm_input.c +++ b/net/xfrm/xfrm_input.c @@ -292,12 +292,15 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type) XFRM_SKB_CB(skb)->seq.input.hi = seq_hi; skb_dst_force(skb); + dev_hold(skb->dev); nexthdr = x->type->input(x, skb); if (nexthdr == -EINPROGRESS) return 0; resume: + dev_put(skb->dev); + spin_lock(&x->lock); if (nexthdr <= 0) { if (nexthdr == -EBADMSG) { |