summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-11-24 13:02:11 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-11-24 15:55:58 +0100
commit03ae68f419f9ac94529b4fd5bff54f21a248ab1c (patch)
treec0ec84316227bba1191e1cc634b03c55550563bb
parent73c2c5255d355663ddbccf3c5ad3e06fe6c5e843 (diff)
downloadsystemd-03ae68f419f9ac94529b4fd5bff54f21a248ab1c.tar.gz
dissect-image: reuse common exit path
-rw-r--r--src/shared/dissect-image.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 06d0319f75..d3e741a1a0 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);
}