tools/xenstore: don't use conn->in as context for temporary allocations

Using the struct buffered data pointer of the current processed request
for temporary data allocations has a major drawback: the used area (and
with that the temporary data) is freed only after the response of the
request has been written to the ring page or has been read via the
socket. This can happen much later in case a guest isn't reading its
responses fast enough.

As the temporary data can be safely freed after creating the response,
add a temporary context for that purpose and use that for allocating
the temporary memory, as it was already the case before commit
cc0612464896 ("xenstore: add small default data buffer to internal
struct").

Some sub-functions need to gain the "const" attribute for the talloc
context.

This is XSA-416 / CVE-2022-42319.

Fixes: cc0612464896 ("xenstore: add small default data buffer to internal struct")
Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Julien Grall <jgrall@amazon.com>
(cherry picked from commit 2a587de219cc0765330fbf9fac6827bfaf29e29b)

diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c
index 0227a5565657b2dddc5e94fc71826f5fae3331f7..05e38e576a3d0ad6932503d6fdd765e85f41099c 100644 (file)
--- a/tools/xenstore/xenstored_control.c
+++ b/tools/xenstore/xenstored_control.c
@@ -30,11 +30,11 @@
 
 struct cmd_s {
        char *cmd;
-       int (*func)(void *, struct connection *, char **, int);
+       int (*func)(const void *, struct connection *, char **, int);
        char *pars;
 };
 
-static int do_control_check(void *ctx, struct connection *conn,
+static int do_control_check(const void *ctx, struct connection *conn,
                            char **vec, int num)
 {
        if (num)
@@ -46,7 +46,7 @@ static int do_control_check(void *ctx, struct connection *conn,
        return 0;
 }
 
-static int do_control_log(void *ctx, struct connection *conn,
+static int do_control_log(const void *ctx, struct connection *conn,
                          char **vec, int num)
 {
        if (num != 1)
@@ -147,7 +147,7 @@ static int quota_get(const void *ctx, struct connection *conn,
        return domain_get_quota(ctx, conn, atoi(vec[0]));
 }
 
-static int do_control_quota(void *ctx, struct connection *conn,
+static int do_control_quota(const void *ctx, struct connection *conn,
                            char **vec, int num)
 {
        if (num == 0)
@@ -159,7 +159,7 @@ static int do_control_quota(void *ctx, struct connection *conn,
        return quota_get(ctx, conn, vec, num);
 }
 
-static int do_control_quota_s(void *ctx, struct connection *conn,
+static int do_control_quota_s(const void *ctx, struct connection *conn,
                              char **vec, int num)
 {
        if (num == 0)
@@ -172,7 +172,7 @@ static int do_control_quota_s(void *ctx, struct connection *conn,
 }
 
 #ifdef __MINIOS__
-static int do_control_memreport(void *ctx, struct connection *conn,
+static int do_control_memreport(const void *ctx, struct connection *conn,
                                char **vec, int num)
 {
        if (num)
@@ -184,7 +184,7 @@ static int do_control_memreport(void *ctx, struct connection *conn,
        return 0;
 }
 #else
-static int do_control_logfile(void *ctx, struct connection *conn,
+static int do_control_logfile(const void *ctx, struct connection *conn,
                              char **vec, int num)
 {
        if (num != 1)
@@ -199,7 +199,7 @@ static int do_control_logfile(void *ctx, struct connection *conn,
        return 0;
 }
 
-static int do_control_memreport(void *ctx, struct connection *conn,
+static int do_control_memreport(const void *ctx, struct connection *conn,
                                char **vec, int num)
 {
        FILE *fp;
@@ -239,7 +239,7 @@ static int do_control_memreport(void *ctx, struct connection *conn,
 }
 #endif
 
-static int do_control_print(void *ctx, struct connection *conn,
+static int do_control_print(const void *ctx, struct connection *conn,
                            char **vec, int num)
 {
        if (num != 1)
@@ -251,7 +251,7 @@ static int do_control_print(void *ctx, struct connection *conn,
        return 0;
 }
 
-static int do_control_help(void *, struct connection *, char **, int);
+static int do_control_help(const void *, struct connection *, char **, int);
 
 static struct cmd_s cmds[] = {
        { "check", do_control_check, "" },
@@ -268,7 +268,7 @@ static struct cmd_s cmds[] = {
        { "help", do_control_help, "" },
 };
 
-static int do_control_help(void *ctx, struct connection *conn,
+static int do_control_help(const void *ctx, struct connection *conn,
                           char **vec, int num)
 {
        int cmd, len = 0;
@@ -304,7 +304,8 @@ static int do_control_help(void *ctx, struct connection *conn,
        return 0;
 }
 
-int do_control(struct connection *conn, struct buffered_data *in)
+int do_control(const void *ctx, struct connection *conn,
+              struct buffered_data *in)
 {
        int num;
        int cmd;
@@ -316,7 +317,7 @@ int do_control(struct connection *conn, struct buffered_data *in)
        num = xs_count_strings(in->buffer, in->used);
        if (num < 1)
                return EINVAL;
-       vec = talloc_array(in, char *, num);
+       vec = talloc_array(ctx, char *, num);
        if (!vec)
                return ENOMEM;
        if (get_strings(in, vec, num) != num)
@@ -324,7 +325,7 @@ int do_control(struct connection *conn, struct buffered_data *in)
 
        for (cmd = 0; cmd < ARRAY_SIZE(cmds); cmd++)
                if (streq(vec[0], cmds[cmd].cmd))
-                       return cmds[cmd].func(in, conn, vec + 1, num - 1);
+                       return cmds[cmd].func(ctx, conn, vec + 1, num - 1);
 
        return EINVAL;
 }

diff --git a/tools/xenstore/xenstored_control.h b/tools/xenstore/xenstored_control.h
index 207e0a6fa352cb1923405f9c005504bcecaf06ad..faa955968db13d041892422f1cae3ca862e9eb85 100644 (file)
--- a/tools/xenstore/xenstored_control.h
+++ b/tools/xenstore/xenstored_control.h
@@ -16,4 +16,5 @@
     along with this program; If not, see <http://www.gnu.org/licenses/>.
 */
 
-int do_control(struct connection *conn, struct buffered_data *in);
+int do_control(const void *ctx, struct connection *conn,
+              struct buffered_data *in);

diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c
index 6ed1ae2614708a400d2947ecbff8c959f6aefe0e..28724ef10a4b7c17672c9d47d502e4a4867dd3b7 100644 (file)
--- a/tools/xenstore/xenstored_core.c
+++ b/tools/xenstore/xenstored_core.c
@@ -1147,11 +1147,13 @@ static struct node *get_node_canonicalized(struct connection *conn,
        return get_node(conn, ctx, *canonical_name, perm);
 }
 
-static int send_directory(struct connection *conn, struct buffered_data *in)
+static int send_directory(const void *ctx, struct connection *conn,
+                         struct buffered_data *in)
 {
        struct node *node;
 
-       node = get_node_canonicalized(conn, in, onearg(in), NULL, XS_PERM_READ);
+       node = get_node_canonicalized(conn, ctx, onearg(in), NULL,
+                                     XS_PERM_READ);
        if (!node)
                return errno;
 
@@ -1160,7 +1162,7 @@ static int send_directory(struct connection *conn, struct buffered_data *in)
        return 0;
 }
 
-static int send_directory_part(struct connection *conn,
+static int send_directory_part(const void *ctx, struct connection *conn,
                               struct buffered_data *in)
 {
        unsigned int off, len, maxlen, genlen;
@@ -1172,7 +1174,8 @@ static int send_directory_part(struct connection *conn,
                return EINVAL;
 
        /* First arg is node name. */
-       node = get_node_canonicalized(conn, in, in->buffer, NULL, XS_PERM_READ);
+       node = get_node_canonicalized(conn, ctx, in->buffer, NULL,
+                                     XS_PERM_READ);
        if (!node)
                return errno;
 
@@ -1199,7 +1202,7 @@ static int send_directory_part(struct connection *conn,
                        break;
        }
 
-       data = talloc_array(in, char, genlen + len + 1);
+       data = talloc_array(ctx, char, genlen + len + 1);
        if (!data)
                return ENOMEM;
 
@@ -1215,11 +1218,13 @@ static int send_directory_part(struct connection *conn,
        return 0;
 }
 
-static int do_read(struct connection *conn, struct buffered_data *in)
+static int do_read(const void *ctx, struct connection *conn,
+                  struct buffered_data *in)
 {
        struct node *node;
 
-       node = get_node_canonicalized(conn, in, onearg(in), NULL, XS_PERM_READ);
+       node = get_node_canonicalized(conn, ctx, onearg(in), NULL,
+                                     XS_PERM_READ);
        if (!node)
                return errno;
 
@@ -1399,7 +1404,8 @@ err:
 }
 
 /* path, data... */
-static int do_write(struct connection *conn, struct buffered_data *in)
+static int do_write(const void *ctx, struct connection *conn,
+                   struct buffered_data *in)
 {
        unsigned int offset, datalen;
        struct node *node;
@@ -1413,12 +1419,12 @@ static int do_write(struct connection *conn, struct buffered_data *in)
        offset = strlen(vec[0]) + 1;
        datalen = in->used - offset;
 
-       node = get_node_canonicalized(conn, in, vec[0], &name, XS_PERM_WRITE);
+       node = get_node_canonicalized(conn, ctx, vec[0], &name, XS_PERM_WRITE);
        if (!node) {
                /* No permissions, invalid input? */
                if (errno != ENOENT)
                        return errno;
-               node = create_node(conn, in, name, in->buffer + offset,
+               node = create_node(conn, ctx, name, in->buffer + offset,
                                   datalen);
                if (!node)
                        return errno;
@@ -1429,18 +1435,19 @@ static int do_write(struct connection *conn, struct buffered_data *in)
                        return errno;
        }
 
-       fire_watches(conn, in, name, node, false, NULL);
+       fire_watches(conn, ctx, name, node, false, NULL);
        send_ack(conn, XS_WRITE);
 
        return 0;
 }
 
-static int do_mkdir(struct connection *conn, struct buffered_data *in)
+static int do_mkdir(const void *ctx, struct connection *conn,
+                   struct buffered_data *in)
 {
        struct node *node;
        char *name;
 
-       node = get_node_canonicalized(conn, in, onearg(in), &name,
+       node = get_node_canonicalized(conn, ctx, onearg(in), &name,
                                      XS_PERM_WRITE);
 
        /* If it already exists, fine. */
@@ -1448,10 +1455,10 @@ static int do_mkdir(struct connection *conn, struct buffered_data *in)
                /* No permissions? */
                if (errno != ENOENT)
                        return errno;
-               node = create_node(conn, in, name, NULL, 0);
+               node = create_node(conn, ctx, name, NULL, 0);
                if (!node)
                        return errno;
-               fire_watches(conn, in, name, node, false, NULL);
+               fire_watches(conn, ctx, name, node, false, NULL);
        }
        send_ack(conn, XS_MKDIR);
 
@@ -1549,22 +1556,23 @@ static int _rm(struct connection *conn, const void *ctx, struct node *node,
 }
 
 
-static int do_rm(struct connection *conn, struct buffered_data *in)
+static int do_rm(const void *ctx, struct connection *conn,
+                struct buffered_data *in)
 {
        struct node *node;
        int ret;
        char *name;
        char *parentname;
 
-       node = get_node_canonicalized(conn, in, onearg(in), &name,
+       node = get_node_canonicalized(conn, ctx, onearg(in), &name,
                                      XS_PERM_WRITE);
        if (!node) {
                /* Didn't exist already?  Fine, if parent exists. */
                if (errno == ENOENT) {
-                       parentname = get_parent(in, name);
+                       parentname = get_parent(ctx, name);
                        if (!parentname)
                                return errno;
-                       node = read_node(conn, in, parentname);
+                       node = read_node(conn, ctx, parentname);
                        if (node) {
                                send_ack(conn, XS_RM);
                                return 0;
@@ -1579,7 +1587,7 @@ static int do_rm(struct connection *conn, struct buffered_data *in)
        if (streq(name, "/"))
                return EINVAL;
 
-       ret = _rm(conn, in, node, name);
+       ret = _rm(conn, ctx, node, name);
        if (ret)
                return ret;
 
@@ -1589,13 +1597,15 @@ static int do_rm(struct connection *conn, struct buffered_data *in)
 }
 
 
-static int do_get_perms(struct connection *conn, struct buffered_data *in)
+static int do_get_perms(const void *ctx, struct connection *conn,
+                       struct buffered_data *in)
 {
        struct node *node;
        char *strings;
        unsigned int len;
 
-       node = get_node_canonicalized(conn, in, onearg(in), NULL, XS_PERM_READ);
+       node = get_node_canonicalized(conn, ctx, onearg(in), NULL,
+                                     XS_PERM_READ);
        if (!node)
                return errno;
 
@@ -1608,7 +1618,8 @@ static int do_get_perms(struct connection *conn, struct buffered_data *in)
        return 0;
 }
 
-static int do_set_perms(struct connection *conn, struct buffered_data *in)
+static int do_set_perms(const void *ctx, struct connection *conn,
+                       struct buffered_data *in)
 {
        struct node_perms perms, old_perms;
        char *name, *permstr;
@@ -1625,7 +1636,7 @@ static int do_set_perms(struct connection *conn, struct buffered_data *in)
 
        permstr = in->buffer + strlen(in->buffer) + 1;
 
-       perms.p = talloc_array(in, struct xs_permissions, perms.num);
+       perms.p = talloc_array(ctx, struct xs_permissions, perms.num);
        if (!perms.p)
                return ENOMEM;
        if (!xs_strings_to_perms(perms.p, perms.num, permstr))
@@ -1640,7 +1651,7 @@ static int do_set_perms(struct connection *conn, struct buffered_data *in)
        }
 
        /* We must own node to do this (tools can do this too). */
-       node = get_node_canonicalized(conn, in, in->buffer, &name,
+       node = get_node_canonicalized(conn, ctx, in->buffer, &name,
                                      XS_PERM_WRITE | XS_PERM_OWNER);
        if (!node)
                return errno;
@@ -1675,7 +1686,7 @@ static int do_set_perms(struct connection *conn, struct buffered_data *in)
                return errno;
        }
 
-       fire_watches(conn, in, name, node, false, &old_perms);
+       fire_watches(conn, ctx, name, node, false, &old_perms);
        send_ack(conn, XS_SET_PERMS);
 
        return 0;
@@ -1683,7 +1694,8 @@ static int do_set_perms(struct connection *conn, struct buffered_data *in)
 
 static struct {
        const char *str;
-       int (*func)(struct connection *conn, struct buffered_data *in);
+       int (*func)(const void *ctx, struct connection *conn,
+                   struct buffered_data *in);
        unsigned int flags;
 #define XS_FLAG_NOTID          (1U << 0)       /* Ignore transaction id. */
 #define XS_FLAG_PRIV           (1U << 1)       /* Privileged domain only. */
@@ -1756,6 +1768,7 @@ static void process_message(struct connection *conn, struct buffered_data *in)
        struct transaction *trans;
        enum xsd_sockmsg_type type = in->hdr.msg.type;
        int ret;
+       void *ctx;
 
        if ((unsigned int)type >= XS_TYPE_COUNT || !wire_funcs[type].func) {
                eprintf("Client unknown operation %i", type);
@@ -1776,10 +1789,17 @@ static void process_message(struct connection *conn, struct buffered_data *in)
                return;
        }
 
+       ctx = talloc_new(NULL);
+       if (!ctx) {
+               send_error(conn, ENOMEM);
+               return;
+       }
+
        assert(conn->transaction == NULL);
        conn->transaction = trans;
 
-       ret = wire_funcs[type].func(conn, in);
+       ret = wire_funcs[type].func(ctx, conn, in);
+       talloc_free(ctx);
        if (ret)
                send_error(conn, ret);
 

diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c
index 47e8010b3491d55b7a9be931b4012c7c1d1f12ac..417ff81181e4bb762077c62789b799ad1e8e1238 100644 (file)
--- a/tools/xenstore/xenstored_domain.c
+++ b/tools/xenstore/xenstored_domain.c
@@ -333,7 +333,7 @@ bool domain_can_write(struct connection *conn)
        return ((intf->rsp_prod - intf->rsp_cons) != XENSTORE_RING_SIZE);
 }
 
-static char *talloc_domain_path(void *context, unsigned int domid)
+static char *talloc_domain_path(const void *context, unsigned int domid)
 {
        return talloc_asprintf(context, "/local/domain/%u", domid);
 }
@@ -475,7 +475,8 @@ static void domain_conn_reset(struct domain *domain)
 }
 
 /* domid, gfn, evtchn, path */
-int do_introduce(struct connection *conn, struct buffered_data *in)
+int do_introduce(const void *ctx, struct connection *conn,
+                struct buffered_data *in)
 {
        struct domain *domain;
        char *vec[3];
@@ -551,7 +552,8 @@ static struct domain *find_connected_domain(unsigned int domid)
        return domain;
 }
 
-int do_set_target(struct connection *conn, struct buffered_data *in)
+int do_set_target(const void *ctx, struct connection *conn,
+                 struct buffered_data *in)
 {
        char *vec[2];
        unsigned int domid, tdomid;
@@ -598,7 +600,8 @@ static struct domain *onearg_domain(struct connection *conn,
 }
 
 /* domid */
-int do_release(struct connection *conn, struct buffered_data *in)
+int do_release(const void *ctx, struct connection *conn,
+              struct buffered_data *in)
 {
        struct domain *domain;
 
@@ -613,7 +616,8 @@ int do_release(struct connection *conn, struct buffered_data *in)
        return 0;
 }
 
-int do_resume(struct connection *conn, struct buffered_data *in)
+int do_resume(const void *ctx, struct connection *conn,
+             struct buffered_data *in)
 {
        struct domain *domain;
 
@@ -628,7 +632,8 @@ int do_resume(struct connection *conn, struct buffered_data *in)
        return 0;
 }
 
-int do_get_domain_path(struct connection *conn, struct buffered_data *in)
+int do_get_domain_path(const void *ctx, struct connection *conn,
+                      struct buffered_data *in)
 {
        char *path;
        const char *domid_str = onearg(in);
@@ -636,18 +641,17 @@ int do_get_domain_path(struct connection *conn, struct buffered_data *in)
        if (!domid_str)
                return EINVAL;
 
-       path = talloc_domain_path(conn, atoi(domid_str));
+       path = talloc_domain_path(ctx, atoi(domid_str));
        if (!path)
                return errno;
 
        send_reply(conn, XS_GET_DOMAIN_PATH, path, strlen(path) + 1);
 
-       talloc_free(path);
-
        return 0;
 }
 
-int do_is_domain_introduced(struct connection *conn, struct buffered_data *in)
+int do_is_domain_introduced(const void *ctx, struct connection *conn,
+                           struct buffered_data *in)
 {
        int result;
        unsigned int domid;
@@ -668,7 +672,8 @@ int do_is_domain_introduced(struct connection *conn, struct buffered_data *in)
 }
 
 /* Allow guest to reset all watches */
-int do_reset_watches(struct connection *conn, struct buffered_data *in)
+int do_reset_watches(const void *ctx, struct connection *conn,
+                    struct buffered_data *in)
 {
        conn_delete_all_watches(conn);
        conn_delete_all_transactions(conn);

diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h
index e013a9991ca8e8d843e27676ebbfb226b19c5fd8..732eb8fa75e1df01f84daea92f8c7d2eb11107f1 100644 (file)
--- a/tools/xenstore/xenstored_domain.h
+++ b/tools/xenstore/xenstored_domain.h
@@ -22,25 +22,32 @@
 void handle_event(void);
 
 /* domid, mfn, eventchn, path */
-int do_introduce(struct connection *conn, struct buffered_data *in);
+int do_introduce(const void *ctx, struct connection *conn,
+                struct buffered_data *in);
 
 /* domid */
-int do_is_domain_introduced(struct connection *conn, struct buffered_data *in);
+int do_is_domain_introduced(const void *ctx, struct connection *conn,
+                           struct buffered_data *in);
 
 /* domid */
-int do_release(struct connection *conn, struct buffered_data *in);
+int do_release(const void *ctx, struct connection *conn,
+              struct buffered_data *in);
 
 /* domid */
-int do_resume(struct connection *conn, struct buffered_data *in);
+int do_resume(const void *ctx, struct connection *conn,
+             struct buffered_data *in);
 
 /* domid, target */
-int do_set_target(struct connection *conn, struct buffered_data *in);
+int do_set_target(const void *ctx, struct connection *conn,
+                 struct buffered_data *in);
 
 /* domid */
-int do_get_domain_path(struct connection *conn, struct buffered_data *in);
+int do_get_domain_path(const void *ctx, struct connection *conn,
+                      struct buffered_data *in);
 
 /* Allow guest to reset all watches */
-int do_reset_watches(struct connection *conn, struct buffered_data *in);
+int do_reset_watches(const void *ctx, struct connection *conn,
+                    struct buffered_data *in);
 
 void domain_init(void);
 

diff --git a/tools/xenstore/xenstored_transaction.c b/tools/xenstore/xenstored_transaction.c
index 6e29118c800dbf218ae75f12d79e3c2765e2da15..cd592845e7ca585d8467b833cb6f73e406ab537f 100644 (file)
--- a/tools/xenstore/xenstored_transaction.c
+++ b/tools/xenstore/xenstored_transaction.c
@@ -487,7 +487,8 @@ struct transaction *transaction_lookup(struct connection *conn, uint32_t id)
        return ERR_PTR(-ENOENT);
 }
 
-int do_transaction_start(struct connection *conn, struct buffered_data *in)
+int do_transaction_start(const void *ctx, struct connection *conn,
+                        struct buffered_data *in)
 {
        struct transaction *trans, *exists;
        char id_str[20];
@@ -500,8 +501,8 @@ int do_transaction_start(struct connection *conn, struct buffered_data *in)
            conn->transaction_started > quota_max_transaction)
                return ENOSPC;
 
-       /* Attach transaction to input for autofree until it's complete */
-       trans = talloc_zero(in, struct transaction);
+       /* Attach transaction to ctx for autofree until it's complete */
+       trans = talloc_zero(ctx, struct transaction);
        if (!trans)
                return ENOMEM;
 
@@ -548,7 +549,8 @@ static int transaction_fix_domains(struct transaction *trans, bool update)
        return 0;
 }
 
-int do_transaction_end(struct connection *conn, struct buffered_data *in)
+int do_transaction_end(const void *ctx, struct connection *conn,
+                      struct buffered_data *in)
 {
        const char *arg = onearg(in);
        struct transaction *trans;
@@ -564,8 +566,8 @@ int do_transaction_end(struct connection *conn, struct buffered_data *in)
        list_del(&trans->list);
        conn->transaction_started--;
 
-       /* Attach transaction to in for auto-cleanup */
-       talloc_steal(in, trans);
+       /* Attach transaction to ctx for auto-cleanup */
+       talloc_steal(ctx, trans);
 
        if (streq(arg, "T")) {
                if (trans->fail)

diff --git a/tools/xenstore/xenstored_transaction.h b/tools/xenstore/xenstored_transaction.h
index e3cbd6b23095b0701fc973cc104a532d68d7583f..39d7f81c5127d24f2b583df53424dc24b7fb96cf 100644 (file)
--- a/tools/xenstore/xenstored_transaction.h
+++ b/tools/xenstore/xenstored_transaction.h
@@ -29,8 +29,10 @@ struct transaction;
 
 extern uint64_t generation;
 
-int do_transaction_start(struct connection *conn, struct buffered_data *node);
-int do_transaction_end(struct connection *conn, struct buffered_data *in);
+int do_transaction_start(const void *ctx, struct connection *conn,
+                        struct buffered_data *node);
+int do_transaction_end(const void *ctx, struct connection *conn,
+                      struct buffered_data *in);
 
 struct transaction *transaction_lookup(struct connection *conn, uint32_t id);
 

diff --git a/tools/xenstore/xenstored_watch.c b/tools/xenstore/xenstored_watch.c
index 19d0fb01b1c4fbf3c91d5911eab314de0ee8661e..13627ce972666979163b311e07c75cedd5d5dc48 100644 (file)
--- a/tools/xenstore/xenstored_watch.c
+++ b/tools/xenstore/xenstored_watch.c
@@ -184,7 +184,7 @@ static int destroy_watch(void *_watch)
        return 0;
 }
 
-int do_watch(struct connection *conn, struct buffered_data *in)
+int do_watch(const void *ctx, struct connection *conn, struct buffered_data *in)
 {
        struct watch *watch;
        char *vec[2];
@@ -200,7 +200,7 @@ int do_watch(struct connection *conn, struct buffered_data *in)
                /* check if valid event */
        } else {
                relative = !strstarts(vec[0], "/");
-               vec[0] = canonicalize(conn, in, vec[0]);
+               vec[0] = canonicalize(conn, ctx, vec[0]);
                if (!vec[0])
                        return ENOMEM;
                if (!is_valid_nodename(vec[0]))
@@ -250,7 +250,8 @@ int do_watch(struct connection *conn, struct buffered_data *in)
        return 0;
 }
 
-int do_unwatch(struct connection *conn, struct buffered_data *in)
+int do_unwatch(const void *ctx, struct connection *conn,
+              struct buffered_data *in)
 {
        struct watch *watch;
        char *node, *vec[2];
@@ -258,7 +259,7 @@ int do_unwatch(struct connection *conn, struct buffered_data *in)
        if (get_strings(in, vec, ARRAY_SIZE(vec)) != ARRAY_SIZE(vec))
                return EINVAL;
 
-       node = canonicalize(conn, in, vec[0]);
+       node = canonicalize(conn, ctx, vec[0]);
        if (!node)
                return ENOMEM;
        list_for_each_entry(watch, &conn->watches, list) {

diff --git a/tools/xenstore/xenstored_watch.h b/tools/xenstore/xenstored_watch.h
index 03094374f3793532ff1455498ea2259403020f05..40455dff5d2b2a5a9548aafe3565d30ada62f9d0 100644 (file)
--- a/tools/xenstore/xenstored_watch.h
+++ b/tools/xenstore/xenstored_watch.h
@@ -21,8 +21,10 @@
 
 #include "xenstored_core.h"
 
-int do_watch(struct connection *conn, struct buffered_data *in);
-int do_unwatch(struct connection *conn, struct buffered_data *in);
+int do_watch(const void *ctx, struct connection *conn,
+            struct buffered_data *in);
+int do_unwatch(const void *ctx, struct connection *conn,
+              struct buffered_data *in);
 
 /* Fire all watches: !exact means all the children are affected (ie. rm). */
 void fire_watches(struct connection *conn, const void *tmp, const char *name,