diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-16 15:05:45 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-16 15:05:45 +0100 |
| commit | 5593edfbfa30a049fca9abbd70a834d2888a4d9d (patch) | |
| tree | a5c67524a82995fa17e44669c037fcced4fa91aa /net/core/dev.c | |
| parent | 113ccc38378b6f0b24c0993040c6044e35163a51 (diff) | |
| parent | 49def1853334396f948dcb4cedb9347abb318df5 (diff) | |
| download | talos-op-linux-5593edfbfa30a049fca9abbd70a834d2888a4d9d.tar.gz talos-op-linux-5593edfbfa30a049fca9abbd70a834d2888a4d9d.zip | |
Merge 4.10-rc4 into driver-core-next
We want the sysfs file revert and other fixes in here as well for
testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 8db5a0b4b520..07b307b0b414 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4441,7 +4441,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); } } |
