dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

repart: Store dm_name in DecryptedPartitionTarget

Browse Source 
This means we don't have to do a fallible allocation in the
DecryptedPartitionTarget destructor. Also use log_warning_error_errno()
for the failure we ignore in the destructor.
This commit is contained in:
Daan De Meyer
2023-06-13 15:52:03 +02:00
parent 17f5942f8a
commit fd9b68d925
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/partition/repart.c
View File

@@ -3157,35 +3157,28 @@ static int context_wipe_and_discard(Context *context) {
typedef struct DecryptedPartitionTarget {
int fd;
char *dm_name;
char *volume;
struct crypt_device *device;
} DecryptedPartitionTarget;
static DecryptedPartitionTarget* decrypted_partition_target_free(DecryptedPartitionTarget *t) {
#ifdef HAVE_LIBCRYPTSETUP
_cleanup_free_ char *name = NULL;
int r;
if (!t)
return NULL;
r = path_extract_filename(t->volume, &name);
if (r < 0) {
assert(r == -ENOMEM);
log_oom();
}
safe_close(t->fd);
if (name) {
/* udev or so might access out block device in the background while we are done. Let's hence
* force detach the volume. We sync'ed before, hence this should be safe. */
r = sym_crypt_deactivate_by_name(t->device, name, CRYPT_DEACTIVATE_FORCE);
if (r < 0)
log_error_errno(r, "Failed to deactivate LUKS device: %m");
}
/* udev or so might access out block device in the background while we are done. Let's hence
* force detach the volume. We sync'ed before, hence this should be safe. */
r = sym_crypt_deactivate_by_name(t->device, t->dm_name, CRYPT_DEACTIVATE_FORCE);
if (r < 0)
log_warning_errno(r, "Failed to deactivate LUKS device, ignoring: %m");
sym_crypt_free(t->device);
free(t->dm_name);
free(t->volume);
free(t);
#endif
@@ -3662,6 +3655,7 @@ static int partition_encrypt(Context *context, Partition *p, PartitionTarget *ta
*t = (DecryptedPartitionTarget) {
.fd = TAKE_FD(dev_fd),
.dm_name = TAKE_PTR(dm_name),
.volume = TAKE_PTR(vol),
.device = TAKE_PTR(cd),
};