Commit 4c0ef2f2 authored by Jarek Poplawski's avatar Jarek Poplawski Committed by Greg Kroah-Hartman

net: Fix a memmove bug in dev_gro_receive()

[ Upstream commit e5093aec ]

>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: default avatar"Xin, Xiaohui" <xiaohui.xin@intel.com>
Signed-off-by: default avatarJarek Poplawski <jarkao2@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 525127bf
...@@ -3133,7 +3133,7 @@ enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff *skb) ...@@ -3133,7 +3133,7 @@ enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
put_page(skb_shinfo(skb)->frags[0].page); put_page(skb_shinfo(skb)->frags[0].page);
memmove(skb_shinfo(skb)->frags, memmove(skb_shinfo(skb)->frags,
skb_shinfo(skb)->frags + 1, skb_shinfo(skb)->frags + 1,
--skb_shinfo(skb)->nr_frags); --skb_shinfo(skb)->nr_frags * sizeof(skb_frag_t));
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment