diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-01-16 12:01:26 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-01-16 12:01:26 +0800 |
| commit | 75dd1c226c98dc1b4ad1bcf78746f4843c3fa1c4 (patch) | |
| tree | eba1b36d5096b8c56ac96b0544dda12e0bc9e1f0 /net/core/dev.c | |
| parent | 99d4c5fe0b7838de15c59b375491ef075848d92d (diff) | |
| parent | d9ea51a9bea4ed29f8fd9c59a8122c7aabcc5562 (diff) | |
Merge tag 'v4.4.43' into linux-linaro-lsk-v4.4
This is the 4.4.43 stable release
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 9ca749c81b6c..6f203c7fb166 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4187,7 +4187,9 @@ static void skb_gro_reset_offset(struct sk_buff *skb) pinfo->nr_frags && !PageHighMem(skb_frag_page(frag0))) { NAPI_GRO_CB(skb)->frag0 = skb_frag_address(frag0); - NAPI_GRO_CB(skb)->frag0_len = skb_frag_size(frag0); + NAPI_GRO_CB(skb)->frag0_len = min_t(unsigned int, + skb_frag_size(frag0), + skb->end - skb->tail); } } |