proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-27 03:44:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

coverity: fix mount_entry_create_dir_file

Browse Source 
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>
This commit is contained in:
Serge Hallyn 2015-09-04 13:15:13 -05:00
parent 2c5bcd3a53
commit 608e356771
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lxc/conf.c
View File

@ -1808,7 +1808,7 @@ static int mount_entry_create_dir_file(const struct mntent *mntent,
const char* path) const char* path)
{ {
char *pathdirname = NULL; char *pathdirname = NULL;
int ret; int ret = 0;
FILE *pathfile = NULL; FILE *pathfile = NULL;
if (hasmntopt(mntent, "create=dir")) { 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); 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); cull_mntent_opt(mntent);
if (parse_mntopts(mntent->mnt_opts, &mntflags, &mntdata) < 0) { if (parse_mntopts(mntent->mnt_opts, &mntflags, &mntdata) < 0) {