Skip to contentSkip to conversation

xen/xenbus: make xs_talkv() interruptible for SIGKILL

PATCH Superseded Juergen Gross 2 participants 2 messages Dec 9, 2020 Xen hypervisor interface

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Juergen Gross

author maintainer
#0 lore raw

PATCH 1/1 xen/xenbus: make xs_talkv() interruptible for SIGKILL

In case a process waits for any Xenstore action in the xenbus driver it should be interruptible via SIGKILL.

---
 drivers/xen/xenbus/xenbus_xs.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/xen/xenbus/xenbus_xs.c +8 -1
index 3a06eb699f33..1f4d3593e89e 100644
@@ -205,8 +205,15 @@ static bool test_reply(struct xb_req_data *req)
 
 static void *read_reply(struct xb_req_data *req)
 {
+	int ret;
+
 	do {
-		wait_event(req->wq, test_reply(req));
+		ret = wait_event_interruptible(req->wq, test_reply(req));
+
+		if (ret == -ERESTARTSYS && fatal_signal_pending(current)) {
+			req->msg.type = XS_ERROR;
+			return ERR_PTR(-EINTR);
+		}
 
 		if (!xenbus_ok())
 			/*
Signature · 1 line
2.26.2