SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tree-wide: use dissected_image_relinquish()

Browse Source
This commit is contained in:
Yu Watanabe
2022-09-18 23:47:20 +09:00
parent f906075a15
commit 3044d343dd
4 changed files with 24 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/dissect-image.c
+7 -16
View File
@@ -3063,13 +3063,9 @@ int mount_image_privately_interactively(
if (r < 0)
return r;
if (decrypted_image) {
r = decrypted_image_relinquish(decrypted_image);
if (r < 0)
return log_error_errno(r, "Failed to relinquish DM devices: %m");
}
loop_device_relinquish(d);
r = dissected_image_relinquish(dissected_image);
if (r < 0)
return log_error_errno(r, "Failed to relinquish DM and loopback block devices: %m");
*ret_directory = TAKE_PTR(created_dir);
*ret_loop_device = TAKE_PTR(d);
@@ -3117,7 +3113,6 @@ int verity_dissect_and_mount(
const char *required_sysext_scope) {
_cleanup_(loop_device_unrefp) LoopDevice *loop_device = NULL;
_cleanup_(decrypted_image_unrefp) DecryptedImage *decrypted_image = NULL;
_cleanup_(dissected_image_unrefp) DissectedImage *dissected_image = NULL;
_cleanup_(verity_settings_done) VeritySettings verity = VERITY_SETTINGS_DEFAULT;
DissectImageFlags dissect_image_flags;
@@ -3170,7 +3165,7 @@ int verity_dissect_and_mount(
NULL,
&verity,
dissect_image_flags,
&decrypted_image);
NULL);
if (r < 0)
return log_debug_errno(r, "Failed to decrypt dissected image: %m");
@@ -3216,13 +3211,9 @@ int verity_dissect_and_mount(
return log_debug_errno(r, "Failed to compare image %s extension-release metadata with the root's os-release: %m", dissected_image->image_name);
}
if (decrypted_image) {
r = decrypted_image_relinquish(decrypted_image);
if (r < 0)
return log_debug_errno(r, "Failed to relinquish decrypted image: %m");
}
loop_device_relinquish(loop_device);
r = dissected_image_relinquish(dissected_image);
if (r < 0)
return log_debug_errno(r, "Failed to relinquish dissected image: %m");
return 0;
}