summaryrefslogtreecommitdiffstats
path: root/libmount
diff options
context:
space:
mode:
authorKarel Zak2017-06-29 12:58:57 +0200
committerKarel Zak2017-06-29 12:58:57 +0200
commit41d758f82d2e5e0a3f5c87c58cb3ca4eacc80d9b (patch)
treee084d122a9a057c7913fea137d0475267249c161 /libmount
parentdocs: correct line(1) deprecation comment (diff)
downloadkernel-qcow2-util-linux-41d758f82d2e5e0a3f5c87c58cb3ca4eacc80d9b.tar.gz
kernel-qcow2-util-linux-41d758f82d2e5e0a3f5c87c58cb3ca4eacc80d9b.tar.xz
kernel-qcow2-util-linux-41d758f82d2e5e0a3f5c87c58cb3ca4eacc80d9b.zip
libmount: use _exit() in <type> handlers
The originally used exit() is bad idea for the shared library. Reported-by: Ruediger Meier <sweet_f_a@gmx.de> Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libmount')
-rw-r--r--libmount/src/context_mount.c8
-rw-r--r--libmount/src/context_umount.c6
2 files changed, 7 insertions, 7 deletions
diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
index 2c5334217..65f7dbfd0 100644
--- a/libmount/src/context_mount.c
+++ b/libmount/src/context_mount.c
@@ -597,10 +597,10 @@ static int exec_helper(struct libmnt_context *cxt)
int i = 0;
if (setgid(getgid()) < 0)
- exit(EXIT_FAILURE);
+ _exit(EXIT_FAILURE);
if (setuid(getuid()) < 0)
- exit(EXIT_FAILURE);
+ _exit(EXIT_FAILURE);
type = mnt_fs_get_fstype(cxt->fs);
@@ -632,7 +632,7 @@ static int exec_helper(struct libmnt_context *cxt)
i, args[i]));
DBG_FLUSH;
execv(cxt->helper, (char * const *) args);
- exit(EXIT_FAILURE);
+ _exit(EXIT_FAILURE);
}
default:
{
@@ -1244,7 +1244,7 @@ int mnt_context_next_mount(struct libmnt_context *cxt,
if (mnt_context_is_child(cxt)) {
DBG(CXT, ul_debugobj(cxt, "next-mount: child exit [rc=%d]", rc));
DBG_FLUSH;
- exit(rc);
+ _exit(rc);
}
return 0;
}
diff --git a/libmount/src/context_umount.c b/libmount/src/context_umount.c
index 0bee0278c..f2c304f4a 100644
--- a/libmount/src/context_umount.c
+++ b/libmount/src/context_umount.c
@@ -543,10 +543,10 @@ static int exec_helper(struct libmnt_context *cxt)
int i = 0;
if (setgid(getgid()) < 0)
- exit(EXIT_FAILURE);
+ _exit(EXIT_FAILURE);
if (setuid(getuid()) < 0)
- exit(EXIT_FAILURE);
+ _exit(EXIT_FAILURE);
type = mnt_fs_get_fstype(cxt->fs);
@@ -576,7 +576,7 @@ static int exec_helper(struct libmnt_context *cxt)
i, args[i]));
DBG_FLUSH;
execv(cxt->helper, (char * const *) args);
- exit(EXIT_FAILURE);
+ _exit(EXIT_FAILURE);
}
default:
{