[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <03f51a1eb4a7e77d6488.1232785367@localhost.localdomain>
Date: Sat, 24 Jan 2009 08:22:47 +0000
From: Ian Campbell <ian.campbell@...rix.com>
To: linux-kernel@...r.kernel.org, xen-devel@...ts.xensource.com
Cc: Adam Wendt <thelsdj@...il.com>,
Jeremy Fitzhardinge <jeremy.fitzhardinge@...rix.com>,
Ingo Molnar <mingo@...e.hu>
Subject: [PATCH] xen: unitialised return value in xenbus_write_transaction
The return value of xenbus_write_transaction can be uninitialised in
the success case leading to the userspace xenstore utilities failing.
Signed-off-by: Ian Campbell <ian.campbell@...rix.com>
Cc: Adam Wendt <thelsdj@...il.com>
Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@...rix.com>
Cc: Ingo Molnar <mingo@...e.hu>
---
drivers/xen/xenfs/xenbus.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff -r 7c66d3ac6805 -r 03f51a1eb4a7 drivers/xen/xenfs/xenbus.c
--- a/drivers/xen/xenfs/xenbus.c Fri Jan 23 16:42:41 2009 +0000
+++ b/drivers/xen/xenfs/xenbus.c Fri Jan 23 16:42:41 2009 +0000
@@ -291,7 +291,7 @@
static int xenbus_write_transaction(unsigned msg_type,
struct xenbus_file_priv *u)
{
- int rc, ret;
+ int rc;
void *reply;
struct xenbus_transaction_holder *trans = NULL;
LIST_HEAD(staging_q);
@@ -326,15 +326,14 @@
}
mutex_lock(&u->reply_mutex);
- ret = queue_reply(&staging_q, &u->u.msg, sizeof(u->u.msg));
- if (!ret)
- ret = queue_reply(&staging_q, reply, u->u.msg.len);
- if (!ret) {
+ rc = queue_reply(&staging_q, &u->u.msg, sizeof(u->u.msg));
+ if (!rc)
+ rc = queue_reply(&staging_q, reply, u->u.msg.len);
+ if (!rc) {
list_splice_tail(&staging_q, &u->read_buffers);
wake_up(&u->read_waitq);
} else {
queue_cleanup(&staging_q);
- rc = ret;
}
mutex_unlock(&u->reply_mutex);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists