Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10a4d818 authored by Zhouyang Jia's avatar Zhouyang Jia Committed by Greg Kroah-Hartman
Browse files

xen: add error handling for xenbus_printf 



[ Upstream commit 84c029a73327cef571eaa61c7d6e67e8031b52ec ]

When xenbus_printf fails, the lack of error-handling code may
cause unexpected results.

This patch adds error-handling code after calling xenbus_printf.

Signed-off-by: default avatarZhouyang Jia <jiazhouyang09@gmail.com>
Reviewed-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 44af104e

drivers/xen/manage.c

+15 −3
Original line number Original line Diff line number Diff line
@@ -291,8 +291,15 @@ static void sysrq_handler(struct xenbus_watch *watch, const char **vec, 
		return;

		return;

	}

	}





	if (sysrq_key != '\0')

	if (sysrq_key != '\0') {

		xenbus_printf(xbt, "control", "sysrq", "%c", '\0');

		err = xenbus_printf(xbt, "control", "sysrq", "%c", '\0');

		if (err) {

			pr_err("%s: Error %d writing sysrq in control/sysrq\n",

			       __func__, err);

			xenbus_transaction_end(xbt, 1);

			return;

		}

	}





	err = xenbus_transaction_end(xbt, 0);

	err = xenbus_transaction_end(xbt, 0);

	if (err == -EAGAIN)

	if (err == -EAGAIN)
@@ -344,7 +351,12 @@ static int setup_shutdown_watcher(void) 
			continue;

			continue;

		snprintf(node, FEATURE_PATH_SIZE, "feature-%s",

		snprintf(node, FEATURE_PATH_SIZE, "feature-%s",

			 shutdown_handlers[idx].command);

			 shutdown_handlers[idx].command);

		xenbus_printf(XBT_NIL, "control", node, "%u", 1);

		err = xenbus_printf(XBT_NIL, "control", node, "%u", 1);

		if (err) {

			pr_err("%s: Error %d writing %s\n", __func__,

				err, node);

			return err;

		}

	}

	}





	return 0;

	return 0;