From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Thu, 26 Mar 2020 14:32:29 +0000 (+0100)
Subject: dir: use cleanup macro in dir_mount()
X-Git-Tag: lxc-5.0.0~492^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f2e356612f454d4d0e2150b866f81829ba73dd4;p=thirdparty%2Flxc.git

dir: use cleanup macro in dir_mount()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/storage/dir.c b/src/lxc/storage/dir.c
index d09e570ec..b657cc009 100644
--- a/src/lxc/storage/dir.c
+++ b/src/lxc/storage/dir.c
@@ -138,7 +138,7 @@ bool dir_detect(const char *path)
 
 int dir_mount(struct lxc_storage *bdev)
 {
-	char *mntdata = NULL;
+	__do_free char *mntdata = NULL;
 	unsigned long mflags = 0, mntflags = 0, pflags = 0;
 	int ret;
 	const char *src;
@@ -152,14 +152,12 @@ int dir_mount(struct lxc_storage *bdev)
 	ret = parse_mntopts(bdev->mntopts, &mntflags, &mntdata);
 	if (ret < 0) {
 		ERROR("Failed to parse mount options \"%s\"", bdev->mntopts);
-		free(mntdata);
 		return -EINVAL;
 	}
 
 	ret = parse_propagationopts(bdev->mntopts, &pflags);
 	if (ret < 0) {
 		ERROR("Failed to parse propagation options \"%s\"", bdev->mntopts);
-		free(mntdata);
 		return -EINVAL;
 	}
 
@@ -175,12 +173,10 @@ int dir_mount(struct lxc_storage *bdev)
 
 	if (ret < 0) {
 		SYSERROR("Failed to mount \"%s\" on \"%s\"", src, bdev->dest);
-		free(mntdata);
 		return -1;
 	}
 
 	TRACE("Mounted \"%s\" on \"%s\"", src, bdev->dest);
-	free(mntdata);
 	return ret;
 }