Skip to contentSkip to conversation

tools/xenstore: fix a use after free problem in xenstored

PATCH In review Juergen Gross 3 participants 3 messages Apr 3, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 tools/xenstore: fix a use after free problem in xenstored

Commit 562a1c0f7ef3fb ("tools/xenstore: dont unlink connection object twice") introduced a potential use after free problem in domain_cleanup(): after calling talloc_unlink() for domain->conn domain->conn is set to NULL. The problem is that domain is registered as talloc child of domain->conn, so it might be freed by the talloc_unlink() call.

With Xenstore being single threaded there are normally no concurrent memory allocations running and freeing a virtual memory area normally doesn't result in that area no longer being accessible. A problem could occur only in case either a signal received results in some memory allocation done in the signal handler (SIGHUP is a primary candidate leading to reopening the log file), or in case the talloc framework would do some internal memory allocation during freeing of the memory (which would lead to clobbering of the freed domain structure).

Fixes 562a1c0f7ef3fb ("tools/xenstore: dont unlink connection object twice")
---
 tools/xenstore/xenstored_domain.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
tools/xenstore/xenstored_domain.c +4 -1
index baddaba5df..5858185211 100644
@@ -214,6 +214,7 @@ static void domain_cleanup(void)
 {
 	xc_dominfo_t dominfo;
 	struct domain *domain;
+	struct connection *conn;
 	int notify = 0;
 
  again:
@@ -230,8 +231,10 @@ static void domain_cleanup(void)
 				continue;
 		}
 		if (domain->conn) {
-			talloc_unlink(talloc_autofree_context(), domain->conn);
+			/* domain is a talloc child of domain->conn. */
+			conn = domain->conn;
 			domain->conn = NULL;
+			talloc_unlink(talloc_autofree_context(), conn);
 			notify = 0; /* destroy_domain() fires the watch */
 			goto again;
 		}
Signature · 1 line
2.16.4
Reviewed-by on v2 1/1
#1 lore raw

Hi Juergen,

Quoted 7 lines · Juergen Gross

Commit 562a1c0f7ef3fb ("tools/xenstore: dont unlink connection object twice") introduced a potential use after free problem in domain_cleanup(): after calling talloc_unlink() for domain->conn domain->conn is set to NULL. The problem is that domain is registered as talloc child of domain->conn, so it might be freed by the talloc_unlink() call.

Quoted 9 lines

With Xenstore being single threaded there are normally no concurrent memory allocations running and freeing a virtual memory area normally doesn't result in that area no longer being accessible. A problem could occur only in case either a signal received results in some memory allocation done in the signal handler (SIGHUP is a primary candidate leading to reopening the log file), or in case the talloc framework would do some internal memory allocation during freeing of the memory (which would lead to clobbering of the freed domain structure).

Thank you for writing more context!

Quoted 3 lines
Fixes 562a1c0f7ef3fb ("tools/xenstore: dont unlink connection object twice")

Cheers,

Signature · 1 line
Julien Grall
#2 lore raw

Julien Grall writes ("Re: [PATCH v2] tools/xenstore: fix a use after free problem in xenstored"):

Quoted 18 lines · Juergen Gross
Quoted 7 lines

Commit 562a1c0f7ef3fb ("tools/xenstore: dont unlink connection object twice") introduced a potential use after free problem in domain_cleanup(): after calling talloc_unlink() for domain->conn domain->conn is set to NULL. The problem is that domain is registered as talloc child of domain->conn, so it might be freed by the talloc_unlink() call.

Quoted 9 lines

With Xenstore being single threaded there are normally no concurrent memory allocations running and freeing a virtual memory area normally doesn't result in that area no longer being accessible. A problem could occur only in case either a signal received results in some memory allocation done in the signal handler (SIGHUP is a primary candidate leading to reopening the log file), or in case the talloc framework would do some internal memory allocation during freeing of the memory (which would lead to clobbering of the freed domain structure).

Quoted 7 lines

Thank you for writing more context!

Quoted 3 lines
Fixes 562a1c0f7ef3fb ("tools/xenstore: dont unlink connection object twice")

Pushed, thanks both.

Ian.