summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2009-01-29 16:07:52 -0800
committerDavid S. Miller <davem@davemloft.net>2009-01-29 16:07:52 -0800
commit95e3b24cfb4ec0479d2c42f7a1780d68063a542a (patch)
treeae16c4b765c86fbb764a3519e4d73e6f148e6f89 /net
parente125646ab56b490d0390b158e0afa9cccfc1f897 (diff)
downloadop-kernel-dev-95e3b24cfb4ec0479d2c42f7a1780d68063a542a.zip
op-kernel-dev-95e3b24cfb4ec0479d2c42f7a1780d68063a542a.tar.gz
net: Fix frag_list handling in skb_seq_read
The frag_list handling was broken in skb_seq_read: 1) We didn't add the stepped offset when looking at the head are of fragments other than the first. 2) We didn't take the stepped offset away when setting the data pointer in the head area. 3) The frag index wasn't reset. This patch fixes both issues. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/skbuff.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 2e5f2ca..f23fd43 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2212,10 +2212,10 @@ unsigned int skb_seq_read(unsigned int consumed, const u8 **data,
return 0;
next_skb:
- block_limit = skb_headlen(st->cur_skb);
+ block_limit = skb_headlen(st->cur_skb) + st->stepped_offset;
if (abs_offset < block_limit) {
- *data = st->cur_skb->data + abs_offset;
+ *data = st->cur_skb->data + (abs_offset - st->stepped_offset);
return block_limit - abs_offset;
}
@@ -2257,6 +2257,7 @@ next_skb:
} else if (st->root_skb == st->cur_skb &&
skb_shinfo(st->root_skb)->frag_list) {
st->cur_skb = skb_shinfo(st->root_skb)->frag_list;
+ st->frag_idx = 0;
goto next_skb;
}
OpenPOWER on IntegriCloud