dir: use cleanup macro in dir_mount()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
lxc · Mar 26, 2020 · 53209ca · 53209ca
1 parent 039f2a9
commit 53209ca
Showing 1 changed file with 1 addition and 5 deletions.
diff --git 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;
 }