From: Martin Wilck <[email protected]> So far we haven't called any cleanup code if child() failed. Fix it.
Reviewed-by: Benjamin Marzinski <[email protected]> Signed-off-by: Martin Wilck <[email protected]> --- multipathd/main.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/multipathd/main.c b/multipathd/main.c index 07068e4..6b9e323 100644 --- a/multipathd/main.c +++ b/multipathd/main.c @@ -3044,6 +3044,7 @@ child (__attribute__((unused)) void *param) struct config *conf; char *envp; enum daemon_status state; + int exit_code = 1; mlockall(MCL_CURRENT | MCL_FUTURE); signal_init(); @@ -3207,6 +3208,8 @@ child (__attribute__((unused)) void *param) } } + exit_code = 0; +failed: cleanup_threads(); cleanup_vecs(); cleanup_foreign(); @@ -3227,12 +3230,7 @@ child (__attribute__((unused)) void *param) #ifdef _DEBUG_ dbg_free_final(NULL); #endif - exit(sd_notify_exit(0)); - -failed: - if (pid_fd >= 0) - close(pid_fd); - exit(sd_notify_exit(1)); + return sd_notify_exit(exit_code); } static int -- 2.29.0 -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
