---

yaml --- r: 377443 b: refs/heads/master c: 7e24bfb h: refs/heads/master i: 377441: 0d3c74e 377439: fa6c1de v: v3
git-mirror · Jun 25, 2013 · 8d1f43a · 8d1f43a
1 parent 2bf0ebf
commit 8d1f43a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd8a7036c06cf15779b31a5397d4afcb12be81ea
+refs/heads/master: 7e24bfbe43b545b1689a5f134ed83645b9e34b86
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
@@ -1010,8 +1010,10 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,
 			return -EMSGSIZE;
 		num_pages = get_user_pages_fast(base, size, 0, &page[i]);
 		if (num_pages != size) {
-			for (i = 0; i < num_pages; i++)
-				put_page(page[i]);
+			int j;
+
+			for (j = 0; j < num_pages; j++)
+				put_page(page[i + j]);
 			return -EFAULT;
 		}
 		truesize = size * PAGE_SIZE;