diff options
| author | Jarek Poplawski <jarkao2@gmail.com> | 2010-08-11 02:02:10 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-17 17:37:28 -0700 |
| commit | e5093aec2e6b60c3df2420057ffab9ed4a6d2792 (patch) | |
| tree | f48c2c26c632adc44e5664bdea213b2f173f39f6 | |
| parent | 1c40be12f7d8ca1d387510d39787b12e512a7ce8 (diff) | |
| download | talos-op-linux-e5093aec2e6b60c3df2420057ffab9ed4a6d2792.tar.gz talos-op-linux-e5093aec2e6b60c3df2420057ffab9ed4a6d2792.zip | |
net: Fix a memmove bug in dev_gro_receive()
>Xin Xiaohui wrote:
> I looked into the code dev_gro_receive(), found the code here:
> if the frags[0] is pulled to 0, then the page will be released,
> and memmove() frags left.
> Is that right? I'm not sure if memmove do right or not, but
> frags[0].size is never set after memove at least. what I think
> a simple way is not to do anything if we found frags[0].size == 0.
> The patch is as followed.
...
This version of the patch fixes the bug directly in memmove.
Reported-by: "Xin, Xiaohui" <xiaohui.xin@intel.com>
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 1ae654391442..3721fbb9a83c 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3143,7 +3143,7 @@ pull: put_page(skb_shinfo(skb)->frags[0].page); memmove(skb_shinfo(skb)->frags, skb_shinfo(skb)->frags + 1, - --skb_shinfo(skb)->nr_frags); + --skb_shinfo(skb)->nr_frags * sizeof(skb_frag_t)); } } |
