1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
|
From 0d8bea403d4d1763dddb0c1c81d30efebafb6962 Mon Sep 17 00:00:00 2001
From: Juergen Gross <jgross@suse.com>
Date: Tue, 13 Sep 2022 07:35:07 +0200
Subject: [PATCH 085/126] tools/xenstore: split up send_reply()
Today send_reply() is used for both, normal request replies and watch
events.
Split it up into send_reply() and send_event(). This will be used to
add some event specific handling.
add_event() can be merged into send_event(), removing the need for an
intermediate memory allocation.
This is part of XSA-326.
Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Julien Grall <jgrall@amazon.com>
(cherry picked from commit 9bfde319dbac2a1321898d2f75a3f075c3eb7b32)
---
tools/xenstore/xenstored_core.c | 74 +++++++++++++++++++-------------
tools/xenstore/xenstored_core.h | 1 +
tools/xenstore/xenstored_watch.c | 39 +++--------------
3 files changed, 52 insertions(+), 62 deletions(-)
diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c
index b28c2c66b53b..01d4a2e440ec 100644
--- a/tools/xenstore/xenstored_core.c
+++ b/tools/xenstore/xenstored_core.c
@@ -733,49 +733,32 @@ static void send_error(struct connection *conn, int error)
void send_reply(struct connection *conn, enum xsd_sockmsg_type type,
const void *data, unsigned int len)
{
- struct buffered_data *bdata;
+ struct buffered_data *bdata = conn->in;
+
+ assert(type != XS_WATCH_EVENT);
if ( len > XENSTORE_PAYLOAD_MAX ) {
send_error(conn, E2BIG);
return;
}
- /* Replies reuse the request buffer, events need a new one. */
- if (type != XS_WATCH_EVENT) {
- bdata = conn->in;
- /* Drop asynchronous responses, e.g. errors for watch events. */
- if (!bdata)
- return;
- bdata->inhdr = true;
- bdata->used = 0;
- conn->in = NULL;
- } else {
- /* Message is a child of the connection for auto-cleanup. */
- bdata = new_buffer(conn);
+ if (!bdata)
+ return;
+ bdata->inhdr = true;
+ bdata->used = 0;
- /*
- * Allocation failure here is unfortunate: we have no way to
- * tell anybody about it.
- */
- if (!bdata)
- return;
- }
if (len <= DEFAULT_BUFFER_SIZE)
bdata->buffer = bdata->default_buffer;
- else
+ else {
bdata->buffer = talloc_array(bdata, char, len);
- if (!bdata->buffer) {
- if (type == XS_WATCH_EVENT) {
- /* Same as above: no way to tell someone. */
- talloc_free(bdata);
+ if (!bdata->buffer) {
+ send_error(conn, ENOMEM);
return;
}
- /* re-establish request buffer for sending ENOMEM. */
- conn->in = bdata;
- send_error(conn, ENOMEM);
- return;
}
+ conn->in = NULL;
+
/* Update relevant header fields and fill in the message body. */
bdata->hdr.msg.type = type;
bdata->hdr.msg.len = len;
@@ -783,8 +766,39 @@ void send_reply(struct connection *conn, enum xsd_sockmsg_type type,
/* Queue for later transmission. */
list_add_tail(&bdata->list, &conn->out_list);
+}
- return;
+/*
+ * Send a watch event.
+ * As this is not directly related to the current command, errors can't be
+ * reported.
+ */
+void send_event(struct connection *conn, const char *path, const char *token)
+{
+ struct buffered_data *bdata;
+ unsigned int len;
+
+ len = strlen(path) + 1 + strlen(token) + 1;
+ /* Don't try to send over-long events. */
+ if (len > XENSTORE_PAYLOAD_MAX)
+ return;
+
+ bdata = new_buffer(conn);
+ if (!bdata)
+ return;
+
+ bdata->buffer = talloc_array(bdata, char, len);
+ if (!bdata->buffer) {
+ talloc_free(bdata);
+ return;
+ }
+ strcpy(bdata->buffer, path);
+ strcpy(bdata->buffer + strlen(path) + 1, token);
+ bdata->hdr.msg.type = XS_WATCH_EVENT;
+ bdata->hdr.msg.len = len;
+
+ /* Queue for later transmission. */
+ list_add_tail(&bdata->list, &conn->out_list);
}
/* Some routines (write, mkdir, etc) just need a non-error return */
diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h
index 900336afa426..38d97fa081a6 100644
--- a/tools/xenstore/xenstored_core.h
+++ b/tools/xenstore/xenstored_core.h
@@ -180,6 +180,7 @@ unsigned int get_string(const struct buffered_data *data, unsigned int offset);
void send_reply(struct connection *conn, enum xsd_sockmsg_type type,
const void *data, unsigned int len);
+void send_event(struct connection *conn, const char *path, const char *token);
/* Some routines (write, mkdir, etc) just need a non-error return */
void send_ack(struct connection *conn, enum xsd_sockmsg_type type);
diff --git a/tools/xenstore/xenstored_watch.c b/tools/xenstore/xenstored_watch.c
index db89e0141fce..a116f967dc66 100644
--- a/tools/xenstore/xenstored_watch.c
+++ b/tools/xenstore/xenstored_watch.c
@@ -85,35 +85,6 @@ static const char *get_watch_path(const struct watch *watch, const char *name)
return path;
}
-/*
- * Send a watch event.
- * Temporary memory allocations are done with ctx.
- */
-static void add_event(struct connection *conn,
- const void *ctx,
- struct watch *watch,
- const char *name)
-{
- /* Data to send (node\0token\0). */
- unsigned int len;
- char *data;
-
- name = get_watch_path(watch, name);
-
- len = strlen(name) + 1 + strlen(watch->token) + 1;
- /* Don't try to send over-long events. */
- if (len > XENSTORE_PAYLOAD_MAX)
- return;
-
- data = talloc_array(ctx, char, len);
- if (!data)
- return;
- strcpy(data, name);
- strcpy(data + strlen(name) + 1, watch->token);
- send_reply(conn, XS_WATCH_EVENT, data, len);
- talloc_free(data);
-}
-
/*
* Check permissions of a specific watch to fire:
* Either the node itself or its parent have to be readable by the connection
@@ -190,10 +161,14 @@ void fire_watches(struct connection *conn, const void *ctx, const char *name,
list_for_each_entry(watch, &i->watches, list) {
if (exact) {
if (streq(name, watch->node))
- add_event(i, ctx, watch, name);
+ send_event(i,
+ get_watch_path(watch, name),
+ watch->token);
} else {
if (is_child(name, watch->node))
- add_event(i, ctx, watch, name);
+ send_event(i,
+ get_watch_path(watch, name),
+ watch->token);
}
}
}
@@ -292,7 +267,7 @@ int do_watch(struct connection *conn, struct buffered_data *in)
send_ack(conn, XS_WATCH);
/* We fire once up front: simplifies clients and restart. */
- add_event(conn, in, watch, watch->node);
+ send_event(conn, get_watch_path(watch, watch->node), watch->token);
return 0;
}
--
2.37.4
|
GitWeb