tools/xenstore: fix XSA-417 patch

The fix for XSA-417 had a bug: domain_alloc_permrefs() will not return
a negative value in case of an error, but a plain errno value.

Note this is not considered to be a security issue, as the only case
where domain_alloc_permrefs() will return an error is a failed memory
allocation. As a guest should not be able to drive Xenstore out of
memory, this is NOT a problem a guest can trigger at will.

Fixes: ab128218225d ("tools/xenstore: fix checking node permissions")
Signed-off-by: Juergen Gross <jgross@suse.com>
Acked-by: Julien Grall <jgrall@amazon.com>
master commit: 0c53c638e16278078371ce028c74693841d7738a
master date: 2023-07-21 08:32:43 +0200

diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c
index feb7bbaa528c66e71bf788964d1f705d6747db4d..13d6c0372d8a910188fd5c5398fc7e512e5b0062 100644 (file)
--- a/tools/xenstore/xenstored_core.c
+++ b/tools/xenstore/xenstored_core.c
@@ -1784,7 +1784,7 @@ static int do_set_perms(const void *ctx, struct connection *conn,
        if (!xs_strings_to_perms(perms.p, perms.num, permstr))
                return errno;
 
-       if (domain_alloc_permrefs(&perms) < 0)
+       if (domain_alloc_permrefs(&perms))
                return ENOMEM;
        if (perms.p[0].perms & XS_PERM_IGNORE)
                return ENOENT;