From 8d1f43ae10f2dbba7b24420f68e6ae0968534996 Mon Sep 17 00:00:00 2001
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Sun, 23 Jun 2013 17:19:03 +0300
Subject: [PATCH] --- yaml --- r: 377443 b: refs/heads/master c:
 7e24bfbe43b545b1689a5f134ed83645b9e34b86 h: refs/heads/master i:   377441:
 0d3c74ed8d0557955e7d3c9b6a40fe3171c6ad59   377439:
 fa6c1de3034d124ab44729397d0e60fac65d1304 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tun.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e6a93ca38979..77426d17dabf 100644
--- 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
index bfa9bb48e42d..9c61f8734a40 100644
--- 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;