From 49dd52fb1311dadab29f6634d0bc1f4c022c357a Mon Sep 17 00:00:00 2001 From: Juergen Gross Date: Wed, 25 May 2022 12:55:49 +0200 Subject: [PATCH] tools/xenstore: fix event sending in introduce_domain() Commit fc2b57c9af46 ("xenstored: send an evtchn notification on introduce_domain") introduced a potential NULL dereference in case of Xenstore live update. Fix that by adding an appropriate check. Coverity-Id: 1504572 Fixes: fc2b57c9af46 ("xenstored: send an evtchn notification on introduce_domain") Signed-off-by: Juergen Gross Reviewed-by: Andrew Cooper --- tools/xenstore/xenstored_domain.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index de88bf2a68..ead4c237d2 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -493,9 +493,11 @@ static struct domain *introduce_domain(const void *ctx, /* Now domain belongs to its connection. */ talloc_steal(domain->conn, domain); - /* Notify the domain that xenstore is available */ - interface->connection = XENSTORE_CONNECTED; - xenevtchn_notify(xce_handle, domain->port); + if (!restore) { + /* Notify the domain that xenstore is available */ + interface->connection = XENSTORE_CONNECTED; + xenevtchn_notify(xce_handle, domain->port); + } if (!is_master_domain && !restore) fire_watches(NULL, ctx, "@introduceDomain", NULL, -- 2.30.2