Kaynağa Gözat

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>
Jarek Poplawski 16 yıl önce
ebeveyn
işleme
ce3dd39595
1 değiştirilmiş dosya ile 6 ekleme ve 1 silme
  1. 6 1
      net/core/skbuff.c

+ 6 - 1
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,
 static inline void __segment_seek(struct page **page, unsigned int *poff,
 				  unsigned int *plen, unsigned int off)
 				  unsigned int *plen, unsigned int off)
 {
 {
+	unsigned long n;
+
 	*poff += off;
 	*poff += off;
-	*page += *poff / PAGE_SIZE;
+	n = *poff / PAGE_SIZE;
+	if (n)
+		*page = nth_page(*page, n);
+
 	*poff = *poff % PAGE_SIZE;
 	*poff = *poff % PAGE_SIZE;
 	*plen -= off;
 	*plen -= off;
 }
 }