coverity: fix mount_entry_create_dir_file

First, fix use of uninitialized variable 'ret'. Then, actually use the value it returned in its caller. Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

coverity: fix mount_entry_create_dir_file
e3a1984d · Serge Hallyn · Stéphane Graber · 1f9ddb78 · e3a1984d
Commit e3a1984d authored Sep 04, 2015 by Serge Hallyn Committed by Stéphane Graber Sep 21, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

conf.c src/lxc/conf.c +7 -1

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -1808,7 +1808,7 @@ static int mount_entry_create_dir_file(const struct mntent *mntent,
 				       const char* path)
 {
 	char *pathdirname = NULL;
-	int ret;
+	int ret = 0;
 	FILE *pathfile = NULL;

 	if (hasmntopt(mntent, "create=dir")) {
@@ -1846,6 +1846,12 @@ static inline int mount_entry_on_generic(struct mntent *mntent,

 	ret = mount_entry_create_dir_file(mntent, path);

+	if (ret < 0)
+		return optional ? 0 : -1;
+
+	if (ret < 0 && !optional)
+		return -1;
+
 	cull_mntent_opt(mntent);

 	if (parse_mntopts(mntent->mnt_opts, &mntflags, &mntdata) < 0) {