picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

dm-util: use CRYPT_DEACTIVATE_DEFERRED instead of ioctl

Browse source
This commit is contained in:
Luca Boccassi 2020-07-14 15:07:21 +01:00
parent 002674387c
commit 536879480a
4 changed files with 2 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/home/homework-luks.c
View file

@ -1295,7 +1295,7 @@ int home_activate_luks(
loop_device_relinquish(setup.loop);
r = dm_deferred_remove(setup.dm_name);
r = crypt_deactivate_by_name(NULL, setup.dm_name, CRYPT_DEACTIVATE_DEFERRED);
if (r < 0)
log_warning_errno(r, "Failed to relinquish DM device, ignoring: %m");

2
src/shared/dissect-image.c
View file

@ -1437,7 +1437,7 @@ int decrypted_image_relinquish(DecryptedImage *d) {
if (p->relinquished)
continue;
r = dm_deferred_remove(p->name);
r = crypt_deactivate_by_name(NULL, p->name, CRYPT_DEACTIVATE_DEFERRED);
if (r < 0)
return log_debug_errno(r, "Failed to mark %s for auto-removal: %m", p->name);

34
src/shared/dm-util.c
View file

@ -5,37 +5,3 @@
#include "dm-util.h"
#include "fd-util.h"
#include "string-util.h"
int dm_deferred_remove(const char *name) {
struct dm_ioctl dm = {
.version = {
DM_VERSION_MAJOR,
DM_VERSION_MINOR,
DM_VERSION_PATCHLEVEL
},
.data_size = sizeof(dm),
.flags = DM_DEFERRED_REMOVE,
};
_cleanup_close_ int fd = -1;
assert(name);
/* Unfortunately, libcryptsetup doesn't provide a proper API for this, hence call the ioctl()
* directly. */
if (strlen(name) >= sizeof(dm.name))
return -ENODEV; /* A device with a name longer than this cannot possibly exist */
fd = open("/dev/mapper/control", O_RDWR|O_CLOEXEC);
if (fd < 0)
return -errno;
strncpy_exact(dm.name, name, sizeof(dm.name));
if (ioctl(fd, DM_DEV_REMOVE, &dm))
return -errno;
return 0;
}

2
src/shared/dm-util.h
View file

@ -1,4 +1,2 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#pragma once
int dm_deferred_remove(const char *name);