libxl: fix transaction leak in logdirty error path

libxl__domain_suspend_common_switch_qemu_logdirty would leak t if
there was an error.  Fix this.

Also, document the intended usage for libxl__xs_transaction_* in the
doc comment in libxl_internal.h.

Reported-by: Ian Campbell <Ian.Campbell@citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Campbell <Ian.Campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
This commit is contained in:
Ian Jackson committed 2012-07-25 17:39:17 +01:00
1 parent f87945a8d1
commit 00a12a9d16
2 files changed
+37

No files matched your search

+1
View File
@@ -628,6 +628,7 @@ void libxl__domain_suspend_common_switch_qemu_logdirty
out:
LOG(ERROR,"logdirty switch failed (rc=%d), aborting suspend",rc);
libxl__xs_transaction_abort(gc, &t);
switch_logdirty_done(egc,dss,-1);
}
+36
View File
@@ -550,6 +550,42 @@ int libxl__xs_rm_checked(libxl__gc *gc, xs_transaction_t t, const char *path);
* +1 commit conflict; transaction has been destroyed and caller
* must go round again (call _start again and retry)
* 0 committed successfully
*
* The intended usage pattern looks like this:
* int some_function()
* {
* int rc;
* xs_transaction_t t = 0;
* // other initialisations
*
* // do whatever you need to do before the xenstore stuff
* // errors? set rc and goto out.
*
* for (;;) {
* rc = libxl__xs_transaction_start(gc, &t);
* if (rc) goto out;
*
* // do your work here, including all xenstore reads and writes
* // libxl__xs_*_checked are useful; pass them t.
* // errors? set rc and goto out.
*
* rc = libxl__xs_transaction_commit(gc, &t);
* if (!rc) break;
* if (rc<0) goto out;
* }
*
* // now the xenstore transaction succeeded
* // do whatever else you need to do
* // errors? set rc and goto out.
*
* return something;
*
* out:
* // other cleanups
* libxl__xs_transaction_abort(gc, &t);
* // other cleanups
* return rc;
* }
*/
int libxl__xs_transaction_start(libxl__gc *gc, xs_transaction_t *t);
int libxl__xs_transaction_commit(libxl__gc *gc, xs_transaction_t *t);
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.