diff options
| author | Jarek Poplawski | 2009-02-13 01:51:43 +0100 |
|---|---|---|
| committer | David S. Miller | 2009-02-13 01:51:43 +0100 |
| commit | ce3dd39595d9d64f4ba6ee8dd24c6269a3b56b6a (patch) | |
| tree | 8efc1a3d7239b37ffd7f51851fc3b4bf734c6c02 /net/core | |
| parent | ehea: Fix: Remove adapter from adapter list in error path (diff) | |
| download | kernel-qcow2-linux-ce3dd39595d9d64f4ba6ee8dd24c6269a3b56b6a.tar.gz kernel-qcow2-linux-ce3dd39595d9d64f4ba6ee8dd24c6269a3b56b6a.tar.xz kernel-qcow2-linux-ce3dd39595d9d64f4ba6ee8dd24c6269a3b56b6a.zip | |
net: Fix page seeking for skb_splice_bits().
struct page walking should be done with proper accessor functions, not
directly.
With doubts from David S. Miller and Herbert Xu.
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/skbuff.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 7657cec5973d..ab7d2e9f02fa 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -1412,8 +1412,13 @@ static inline int spd_fill_page(struct splice_pipe_desc *spd, struct page *page, static inline void __segment_seek(struct page **page, unsigned int *poff, unsigned int *plen, unsigned int off) { + unsigned long n; + *poff += off; - *page += *poff / PAGE_SIZE; + n = *poff / PAGE_SIZE; + if (n) + *page = nth_page(*page, n); + *poff = *poff % PAGE_SIZE; *plen -= off; } |