Skip to contentSkip to conversation

fix xenstored

PATCH New Gerd Hoffmann 1 participant 1 message Feb 26, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix xenstored

Hi,

There is a use-after-free bug in xenstored.

Problem: Handling requests for one connection can not only zap the connection itself, due to socket disconnects for example. It can also zap *other* connections, due to domain release requests. Especially it can zap the connection we have saved a pointer to in the "next" variable.

The attached patch fixes it by adjusting the reference counting.

please apply,

Gerd

tools/xenstore/xenstored_core.c +4 -2
diff -r 8417ddc981b4 tools/xenstore/xenstored_core.c
@@ -1937,14 +1937,17 @@
 			handle_event();
 
 		next = list_entry(connections.next, typeof(*conn), list);
+		if (&next->list != &connections)
+			talloc_increase_ref_count(next);
 		while (&next->list != &connections) {
 			conn = next;
 
 			next = list_entry(conn->list.next,
 					  typeof(*conn), list);
+			if (&next->list != &connections)
+				talloc_increase_ref_count(next);
 
 			if (conn->domain) {
-				talloc_increase_ref_count(conn);
 				if (domain_can_read(conn))
 					handle_input(conn);
 				if (talloc_free(conn) == 0)
@@ -1957,7 +1960,6 @@
 				if (talloc_free(conn) == 0)
 					continue;
 			} else {
-				talloc_increase_ref_count(conn);
 				if (FD_ISSET(conn->fd, &inset))
 					handle_input(conn);
 				if (talloc_free(conn) == 0)

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel