|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen stable-4.12] tools/xenstore: Preserve bad client until they are destroyed
commit 7da93258d45c1d59ac00be61bb52d4ed7d0c064a
Author: Harsha Shamsundara Havanur <havanur@xxxxxxxxxx>
AuthorDate: Tue Dec 15 14:29:54 2020 +0100
Commit: Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue Dec 15 14:29:54 2020 +0100
tools/xenstore: Preserve bad client until they are destroyed
XenStored will kill any connection that it thinks has misbehaved,
this is currently happening in two places:
* In `handle_input()` if the sanity check on the ring and the message
fails.
* In `handle_output()` when failing to write the response in the ring.
As the domain structure is a child of the connection, XenStored will
destroy its view of the domain when killing the connection. This will
result in sending @releaseDomain event to all the watchers.
As the watch event doesn't carry which domain has been released,
the watcher (such as XenStored) will generally go through the list of
domains registers and check if one of them is shutting down/dying.
In the case of a client misbehaving, the domain will likely to be
running, so no action will be performed.
When the domain is effectively destroyed, XenStored will not be aware of
the domain anymore. So the watch event is not going to be sent.
By consequence, the watchers of the event will not release mappings
they may have on the domain. This will result in a zombie domain.
In order to send @releaseDomain event at the correct time, we want
to keep the domain structure until the domain is effectively
shutting-down/dying.
We also want to keep the connection around so we could possibly revive
the connection in the future.
A new flag 'is_ignored' is added to mark whether a connection should be
ignored when checking if there are work to do. Additionally any
transactions, watches, buffers associated to the connection will be
freed as you can't do much with them (restarting the connection will
likely need a reset).
As a side note, when the device model were running in a stubdomain, a
guest would have been able to introduce a use-after-free because there
is two parents for a guest connection.
This is XSA-325.
Reported-by: Pawel Wieczorkiewicz <wipawel@xxxxxxxxx>
Signed-off-by: Harsha Shamsundara Havanur <havanur@xxxxxxxxxx>
Signed-off-by: Julien Grall <jgrall@xxxxxxxxxx>
Reviewed-by: Juergen Gross <jgross@xxxxxxxx>
Reviewed-by: Paul Durrant <paul@xxxxxxx>
---
tools/xenstore/xenstored_core.c | 49 ++++++++++++++++++++++++++++++++-------
tools/xenstore/xenstored_core.h | 3 +++
tools/xenstore/xenstored_domain.c | 8 +++++++
3 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c
index 65291414a3..cd15b9067c 100644
--- a/tools/xenstore/xenstored_core.c
+++ b/tools/xenstore/xenstored_core.c
@@ -1330,6 +1330,32 @@ static struct {
[XS_DIRECTORY_PART] = { "DIRECTORY_PART", send_directory_part },
};
+/*
+ * Keep the connection alive but stop processing any new request or sending
+ * reponse. This is to allow sending @releaseDomain watch event at the correct
+ * moment and/or to allow the connection to restart (not yet implemented).
+ *
+ * All watches, transactions, buffers will be freed.
+ */
+static void ignore_connection(struct connection *conn)
+{
+ struct buffered_data *out, *tmp;
+
+ trace("CONN %p ignored\n", conn);
+
+ conn->is_ignored = true;
+ conn_delete_all_watches(conn);
+ conn_delete_all_transactions(conn);
+
+ list_for_each_entry_safe(out, tmp, &conn->out_list, list) {
+ list_del(&out->list);
+ talloc_free(out);
+ }
+
+ talloc_free(conn->in);
+ conn->in = NULL;
+}
+
static const char *sockmsg_string(enum xsd_sockmsg_type type)
{
if ((unsigned int)type < ARRAY_SIZE(wire_funcs) && wire_funcs[type].str)
@@ -1388,8 +1414,10 @@ static void consider_message(struct connection *conn)
assert(conn->in == NULL);
}
-/* Errors in reading or allocating here mean we get out of sync, so we
- * drop the whole client connection. */
+/*
+ * Errors in reading or allocating here means we get out of sync, so we mark
+ * the connection as ignored.
+ */
static void handle_input(struct connection *conn)
{
int bytes;
@@ -1446,14 +1474,14 @@ static void handle_input(struct connection *conn)
return;
bad_client:
- /* Kill it. */
- talloc_free(conn);
+ ignore_connection(conn);
}
static void handle_output(struct connection *conn)
{
+ /* Ignore the connection if an error occured */
if (!write_messages(conn))
- talloc_free(conn);
+ ignore_connection(conn);
}
struct connection *new_connection(connwritefn_t *write, connreadfn_t *read)
@@ -1469,6 +1497,7 @@ struct connection *new_connection(connwritefn_t *write,
connreadfn_t *read)
new->write = write;
new->read = read;
new->can_write = true;
+ new->is_ignored = false;
new->transaction_started = 0;
INIT_LIST_HEAD(&new->out_list);
INIT_LIST_HEAD(&new->watches);
@@ -2166,8 +2195,9 @@ int main(int argc, char *argv[])
if (fds[conn->pollfd_idx].revents
& ~(POLLIN|POLLOUT))
talloc_free(conn);
- else if (fds[conn->pollfd_idx].revents
- & POLLIN)
+ else if ((fds[conn->pollfd_idx].revents
+ & POLLIN) &&
+ !conn->is_ignored)
handle_input(conn);
}
if (talloc_free(conn) == 0)
@@ -2179,8 +2209,9 @@ int main(int argc, char *argv[])
if (fds[conn->pollfd_idx].revents
& ~(POLLIN|POLLOUT))
talloc_free(conn);
- else if (fds[conn->pollfd_idx].revents
- & POLLOUT)
+ else if ((fds[conn->pollfd_idx].revents
+ & POLLOUT) &&
+ !conn->is_ignored)
handle_output(conn);
}
if (talloc_free(conn) == 0)
diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h
index 897ddab1e2..cd7993592c 100644
--- a/tools/xenstore/xenstored_core.h
+++ b/tools/xenstore/xenstored_core.h
@@ -80,6 +80,9 @@ struct connection
/* Is this a read-only connection? */
bool can_write;
+ /* Is this connection ignored? */
+ bool is_ignored;
+
/* Buffered incoming data. */
struct buffered_data *in;
diff --git a/tools/xenstore/xenstored_domain.c
b/tools/xenstore/xenstored_domain.c
index 0b2f49ac7d..28066733cf 100644
--- a/tools/xenstore/xenstored_domain.c
+++ b/tools/xenstore/xenstored_domain.c
@@ -276,6 +276,10 @@ bool domain_can_read(struct connection *conn)
if (domain_is_unprivileged(conn) && conn->domain->wrl_credit < 0)
return false;
+
+ if (conn->is_ignored)
+ return false;
+
return (intf->req_cons != intf->req_prod);
}
@@ -293,6 +297,10 @@ bool domain_is_unprivileged(struct connection *conn)
bool domain_can_write(struct connection *conn)
{
struct xenstore_domain_interface *intf = conn->domain->interface;
+
+ if (conn->is_ignored)
+ return false;
+
return ((intf->rsp_prod - intf->rsp_cons) != XENSTORE_RING_SIZE);
}
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.12
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |