Messages in this thread Patch in this message | | | Date | Tue, 09 Jun 2009 17:13:43 -0700 | From | Greg KH <> | Subject | [patch 15/60] net: fix skb_seq_read returning wrong offset/length for page frag data |
| |
-stable review patch. If anyone has any objections, please let us know.
------------------ From: Thomas Chenault <thomas_chenault@dell.com>
[ Upstream commit 995b337952cdf7e05d288eede580257b632a8343 ]
When called with a consumed value that is less than skb_headlen(skb) bytes into a page frag, skb_seq_read() incorrectly returns an offset/length relative to skb->data. Ensure that data which should come from a page frag does.
Signed-off-by: Thomas Chenault <thomas_chenault@dell.com> Tested-by: Shyam Iyer <shyam_iyer@dell.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- net/core/skbuff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -1992,7 +1992,7 @@ unsigned int skb_seq_read(unsigned int c next_skb: block_limit = skb_headlen(st->cur_skb) + st->stepped_offset; - if (abs_offset < block_limit) { + if (abs_offset < block_limit && !st->frag_data) { *data = st->cur_skb->data + (abs_offset - st->stepped_offset); return block_limit - abs_offset; }
| |