[xen master] tools/xenstored: delay_request: don't assume conn->in == in

[patchbot@xxxxxxx]

commit 361f1deb42ec32ea97df7e79f8df12bfc2d0e049
Author:     Julien Grall <jgrall@xxxxxxxxxx>
AuthorDate: Thu Jun 24 09:08:56 2021 +0100
Commit:     Julien Grall <jgrall@xxxxxxxxxx>
CommitDate: Thu Jun 24 09:08:56 2021 +0100

    tools/xenstored: delay_request: don't assume conn->in == in
    
    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>
    Reviewed-by: Luca Fancellu <luca.fancellu@xxxxxxx>
    Reviewed-by: Juergen Gross <jgross@xxxxxxxx>
---
 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 4c0d6e1874..3286eb55d3 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;
 }
--
generated by git-patchbot for /home/xen/git/xen.git#master