From: Dwight Engen <dwight.engen@oracle.com>
Date: Mon, 22 Apr 2013 18:02:30 +0000 (-0400)
Subject: goto correct cleanup label to ensure fd is closed
X-Git-Tag: lxc-1.0.0.alpha1~1^2~274
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=051151de890705173a42bbead40a6125d34ea41b;p=thirdparty%2Flxc.git

goto correct cleanup label to ensure fd is closed

Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/start.c b/src/lxc/start.c
index aefccd650..0a0cc40f7 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -434,10 +434,10 @@ struct lxc_handler *lxc_init(const char *name, struct lxc_conf *conf, const char
 		goto out_close_maincmd_fd;
 	}
 
-	/* Begin the set the state to STARTING*/
+	/* Begin by setting the state to STARTING */
 	if (lxc_set_state(name, handler, STARTING)) {
 		ERROR("failed to set state '%s'", lxc_state2str(STARTING));
-		goto out_free_name;
+		goto out_close_maincmd_fd;
 	}
 
 	/* Start of environment variable setup for hooks */