From: Jan Beulich <jbeulich@novell.com>
Date: Mon, 9 May 2011 09:02:19 +0000 (+0100)
Subject: xen/blkfront: fix data size for xenbus_gather in connect()
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a47fb6b9ad382ae572740bb90908bb01b70f5f9b;p=legacy%2Flinux-2.6.18-xen.git

xen/blkfront: fix data size for xenbus_gather in connect()

From: Marek Marczykowski <marmarek@mimuw.edu.pl>

barrier variable is int, not long. This overflow caused another
variable override: "err" (in PV code) and "binfo" (in xenlinux code -
drivers/xen/blkfront/blkfront.c). The latter caused incorrect device
flags (RO/removable etc).

Signed-off-by: Marek Marczykowski <marmarek@mimuw.edu.pl>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Jan Beulich <jbeulich@novell.com>
---

diff --git a/drivers/xen/blkfront/blkfront.c b/drivers/xen/blkfront/blkfront.c
index fdf43b75..92d97761 100644
--- a/drivers/xen/blkfront/blkfront.c
+++ b/drivers/xen/blkfront/blkfront.c
@@ -360,7 +360,7 @@ static void connect(struct blkfront_info *info)
 	}
 
 	err = xenbus_gather(XBT_NIL, info->xbdev->otherend,
-			    "feature-barrier", "%lu", &info->feature_barrier,
+			    "feature-barrier", "%d", &info->feature_barrier,
 			    NULL);
 	if (err)
 		info->feature_barrier = 0;