diff options
| author | Thomas Chenault <thomas_chenault@dell.com> | 2009-05-18 21:43:27 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-15 09:39:50 -0700 |
| commit | d7a6c1b0a5d74c37ada244880779750eda1a370e (patch) | |
| tree | a0cc1a7af0a16f4147a125d2cf2cfe8f7b30a020 | |
| parent | 3ae0f1042ff18706e652b2cff7419136cebf0f22 (diff) | |
net: fix skb_seq_read returning wrong offset/length for page frag data
[ 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>
| -rw-r--r-- | net/core/skbuff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index eae69549ccb9..f4bbc98e5e07 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -2206,7 +2206,7 @@ unsigned int skb_seq_read(unsigned int consumed, const u8 **data, 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; } |