shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-25 23:21:33 +03:00
Code

cryptsetup: unescape ID_PART_ENTRY_NAME udev property before using it

Browse Source 
Fixes: #18729
This commit is contained in:
Lennart Poettering 2021-02-22 17:38:02 +01:00
parent 930aa88f04
commit fadd34dd5a
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/cryptsetup/cryptsetup.c
View File

@ -419,7 +419,6 @@ static int parse_options(const char *options) {
static char* disk_description(const char *path) { static char* disk_description(const char *path) {
static const char name_fields[] = static const char name_fields[] =
"ID_PART_ENTRY_NAME\0"
"DM_NAME\0" "DM_NAME\0"
"ID_MODEL_FROM_DATABASE\0" "ID_MODEL_FROM_DATABASE\0"
"ID_MODEL\0"; "ID_MODEL\0";
@ -427,6 +426,7 @@ static char* disk_description(const char *path) {
_cleanup_(sd_device_unrefp) sd_device *device = NULL; _cleanup_(sd_device_unrefp) sd_device *device = NULL;
const char *i, *name; const char *i, *name;
struct stat st; struct stat st;
int r;
assert(path); assert(path);
@ -439,6 +439,24 @@ static char* disk_description(const char *path) {
if (sd_device_new_from_stat_rdev(&device, &st) < 0) if (sd_device_new_from_stat_rdev(&device, &st) < 0)
return NULL; return NULL;
if (sd_device_get_property_value(device, "ID_PART_ENTRY_NAME", &name) >= 0) {
_cleanup_free_ char *unescaped = NULL;
/* ID_PART_ENTRY_NAME uses \x style escaping, using libblkid's blkid_encode_string(). Let's
* reverse this here to make the string more human friendly in case people embed spaces or
* other weird stuff. */
r = cunescape(name, UNESCAPE_RELAX, &unescaped);
if (r < 0) {
log_debug_errno(r, "Failed to unescape ID_PART_ENTRY_NAME, skipping device: %m");
return NULL;
}
if (!isempty(unescaped) && !string_has_cc(unescaped, NULL))
return TAKE_PTR(unescaped);
}
/* These need no unescaping. */
NULSTR_FOREACH(i, name_fields) NULSTR_FOREACH(i, name_fields)
if (sd_device_get_property_value(device, i, &name) >= 0 && if (sd_device_get_property_value(device, i, &name) >= 0 &&
!isempty(name)) !isempty(name))