From 03ae68f419f9ac94529b4fd5bff54f21a248ab1c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 24 Nov 2021 13:02:11 +0100 Subject: [PATCH] dissect-image: reuse common exit path --- src/shared/dissect-image.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c index 06d0319f750..d3e741a1a0e 100644 --- a/src/shared/dissect-image.c +++ b/src/shared/dissect-image.c @@ -3085,11 +3085,8 @@ int dissected_image_acquire_metadata(DissectedImage *m) { DISSECT_IMAGE_VALIDATE_OS_EXT| DISSECT_IMAGE_USR_NO_ROOT); if (r < 0) { - /* Let parent know the error */ - (void) write(error_pipe[1], &r, sizeof(r)); - log_debug_errno(r, "Failed to mount dissected image: %m"); - _exit(EXIT_FAILURE); + goto inner_fail; } for (unsigned k = 0; k < _META_MAX; k++) { @@ -3168,6 +3165,7 @@ int dissected_image_acquire_metadata(DissectedImage *m) { _exit(EXIT_SUCCESS); inner_fail: + /* Let parent know the error */ (void) write(error_pipe[1], &r, sizeof(r)); _exit(EXIT_FAILURE); } -- 2.47.3