Commit 50bdd7a0 authored Apr 07, 2017 by Linus Torvalds

Merge tag 'for-linus-4.11b-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull Xen fix from Juergen Gross:
 "A fix for error path cleanup in the xenbus handler"

* tag 'for-linus-4.11b-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xenbus: remove transaction holder from list before freeing

parents 5380e564 ac4cde39

drivers/xen/xenbus/xenbus_dev_frontend.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -442,8 +442,10 @@ static int xenbus_write_transaction(unsigned msg_type,
		return xenbus_command_reply(u, XS_ERROR, "ENOENT");

		rc = xenbus_dev_request_and_reply(&u->u.msg, u);
		if (rc)
		if (rc && trans) {
		list_del(&trans->list);
		kfree(trans);
		}

		out:
		return rc;