diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-03 10:13:33 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-03 10:13:33 -0500 |
| commit | ebc01f593b58e1896150fc2e3cbdd0116323c52c (patch) | |
| tree | 23e905a3fdbee3fc8a66ef760b9ed5ef5455e9dd /net/xfrm/xfrm_output.c | |
| parent | 3f7256fe5fc64132a2dd19695255c990aa2188cf (diff) | |
| parent | 0df1f2487d2f0d04703f142813d53615d62a1da4 (diff) | |
Merge tag 'v3.18-rc3' into asoc-sgtl5000
Linux 3.18-rc3
Diffstat (limited to 'net/xfrm/xfrm_output.c')
| -rw-r--r-- | net/xfrm/xfrm_output.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c index 499d6c18a8ce..7c532856b398 100644 --- a/net/xfrm/xfrm_output.c +++ b/net/xfrm/xfrm_output.c | |||
| @@ -157,6 +157,8 @@ static int xfrm_output_gso(struct sk_buff *skb) | |||
| 157 | kfree_skb(skb); | 157 | kfree_skb(skb); |
| 158 | if (IS_ERR(segs)) | 158 | if (IS_ERR(segs)) |
| 159 | return PTR_ERR(segs); | 159 | return PTR_ERR(segs); |
| 160 | if (segs == NULL) | ||
| 161 | return -EINVAL; | ||
| 160 | 162 | ||
| 161 | do { | 163 | do { |
| 162 | struct sk_buff *nskb = segs->next; | 164 | struct sk_buff *nskb = segs->next; |