libmount: Fix possible crash in mnt_context_setup_loopdev()

If loopcxt_init() fails, Iloopcxt_deinit() should not be called.

Signed-off-by: Stanislav Brabec <sbrabec@suse.cz>

diff --git a/libmount/src/context_loopdev.c b/libmount/src/context_loopdev.c
index 836ebc1d3884e890f1f360679107484d5bfb4c9d..75306321901e45739523e45bad83f881d166285f 100644 (file)
--- a/libmount/src/context_loopdev.c
+++ b/libmount/src/context_loopdev.c
@@ -217,7 +217,7 @@ int mnt_context_setup_loopdev(struct libmnt_context *cxt)
        */
        rc = loopcxt_init(&lc, 0);
        if (rc)
-               goto done;
+               goto done_no_deinit;
        if (backing_file && !(loopcxt_find_by_backing_file(&lc,
                        backing_file, offset, LOOPDEV_FL_OFFSET))) {
                DBG(LOOP, ul_debugobj(cxt, "using existing loop device %s",
@@ -234,7 +234,9 @@ int mnt_context_setup_loopdev(struct libmnt_context *cxt)
        loopcxt_deinit(&lc);
 
        rc = loopcxt_init(&lc, 0);
-       if (rc == 0 && loopval) {
+       if (rc)
+               goto done_no_deinit;
+       if (loopval) {
                rc = loopcxt_set_device(&lc, loopval);
                if (rc == 0)
                        loopdev = loopcxt_get_device(&lc);