From f39fac9deecf22d495215ff12d872583904c45bd Mon Sep 17 00:00:00 2001
From: Mihnea Dobrescu-Balaur <mihneadb@gmail.com>
Date: Mon, 11 Mar 2013 13:23:36 +0200
Subject: [PATCH] --- yaml --- r: 361980 b: refs/heads/master c:
 29d0b218c87ace1078e08bb32c2e72fc96fa3db3 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/block/xen-blkfront.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 618ed8895fd1..666dbe7f96e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e5e098ac22dae38f957e951b70d3cf73beff0f7
+refs/heads/master: 29d0b218c87ace1078e08bb32c2e72fc96fa3db3
diff --git a/trunk/drivers/block/xen-blkfront.c b/trunk/drivers/block/xen-blkfront.c
index c3dae2e0f290..962064487ef7 100644
--- a/trunk/drivers/block/xen-blkfront.c
+++ b/trunk/drivers/block/xen-blkfront.c
@@ -1203,11 +1203,10 @@ static int blkif_recover(struct blkfront_info *info)
 	int j;
 
 	/* Stage 1: Make a safe copy of the shadow state. */
-	copy = kmalloc(sizeof(info->shadow),
+	copy = kmemdup(info->shadow, sizeof(info->shadow),
 		       GFP_NOIO | __GFP_REPEAT | __GFP_HIGH);
 	if (!copy)
 		return -ENOMEM;
-	memcpy(copy, info->shadow, sizeof(info->shadow));
 
 	/* Stage 2: Set up free list. */
 	memset(&info->shadow, 0, sizeof(info->shadow));