Commit 50bdd7a0 authored by Linus Torvalds's avatar 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
...@@ -442,8 +442,10 @@ static int xenbus_write_transaction(unsigned msg_type, ...@@ -442,8 +442,10 @@ static int xenbus_write_transaction(unsigned msg_type,
return xenbus_command_reply(u, XS_ERROR, "ENOENT"); return xenbus_command_reply(u, XS_ERROR, "ENOENT");
rc = xenbus_dev_request_and_reply(&u->u.msg, u); rc = xenbus_dev_request_and_reply(&u->u.msg, u);
if (rc) if (rc && trans) {
list_del(&trans->list);
kfree(trans); kfree(trans);
}
out: out:
return rc; return rc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment