[PATCH 07/10] tools/xenstored: delay_request: don't assume conn->in == in

[Julien Grall <julien@xxxxxxx>]

From: Julien Grall <jgrall@xxxxxxxxxx>

delay_request() is currently assuming that the request delayed is
always conn->in. This is currently correct, but it is a call for
a latent bug as the function allows the caller to specify any request.

To prevent any future surprise, check if the request delayed is the
current one.

Fixes: c5ca1404b4 ("tools/xenstore: add support for delaying execution of a 
xenstore request")
Signed-off-by: Julien Grall <jgrall@xxxxxxxxxx>
---
 tools/xenstore/xenstored_core.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c
index 2e5760fe4599..a5084a5b173d 100644
--- a/tools/xenstore/xenstored_core.c
+++ b/tools/xenstore/xenstored_core.c
@@ -306,7 +306,9 @@ int delay_request(struct connection *conn, struct 
buffered_data *in,
        delayed_requests++;
        list_add(&req->list, &conn->delayed);
 
-       conn->in = NULL;
+       /* Unlink the request from conn if this is the current one */
+       if (conn->in == in)
+               conn->in = NULL;
 
        return 0;
 }
-- 
2.17.1