85 lines
2.7 KiB
Diff
85 lines
2.7 KiB
Diff
From e49de00f4a22f91ec5af08d97e30a198cd64e00d Mon Sep 17 00:00:00 2001
|
|
From: Milan Broz <gmazyland@gmail.com>
|
|
Date: Fri, 16 Feb 2024 16:44:12 +0100
|
|
Subject: [PATCH] libblkid: Check offset in LUKS2 header
|
|
|
|
LUKS2 binary header contains offset field that describes where
|
|
the header should be located.
|
|
|
|
If this offset is not correct, blkid should tread this header
|
|
as invalid.
|
|
|
|
This patch fixes problem when both swap and LUKS headers are
|
|
present (LUKS header was swapped out) and detected LUKS header
|
|
is at a wrong offset.
|
|
As LUKS has higher priority, it confuses detection.
|
|
|
|
Signed-off-by: Milan Broz <gmazyland@gmail.com>
|
|
Reference:https://github.com/util-linux/util-linux/commit/e49de00f4a22f91ec5af08d97e30a198cd64e00d
|
|
Conflict:Delete binary file
|
|
---
|
|
libblkid/src/superblocks/luks.c | 20 +++++++++++++++++---
|
|
1 file changed, 17 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/libblkid/src/superblocks/luks.c b/libblkid/src/superblocks/luks.c
|
|
index 0230b34..4623c98 100644
|
|
--- a/libblkid/src/superblocks/luks.c
|
|
+++ b/libblkid/src/superblocks/luks.c
|
|
@@ -1,6 +1,6 @@
|
|
/*
|
|
* Copyright (C) 2008 Karel Zak <kzak@redhat.com>
|
|
- * Copyright (C) 2018 Milan Broz <gmazyland@gmail.com>
|
|
+ * Copyright (C) 2018-2024 Milan Broz <gmazyland@gmail.com>
|
|
*
|
|
* Inspired by libvolume_id by
|
|
* Kay Sievers <kay.sievers@vrfy.org>
|
|
@@ -15,6 +15,7 @@
|
|
#include <errno.h>
|
|
#include <ctype.h>
|
|
#include <stdint.h>
|
|
+#include <stdbool.h>
|
|
|
|
#include "superblocks.h"
|
|
|
|
@@ -96,6 +97,19 @@ static int luks_attributes(blkid_probe pr, struct luks2_phdr *header, uint64_t o
|
|
return BLKID_PROBE_OK;
|
|
}
|
|
|
|
+static bool luks_valid(struct luks2_phdr *header, const char *magic, uint64_t offset)
|
|
+{
|
|
+ if (memcmp(header->magic, magic, LUKS_MAGIC_L))
|
|
+ return false;
|
|
+
|
|
+ /* LUKS2 header is not at expected offset */
|
|
+ if (be16_to_cpu(header->version) == 2 &&
|
|
+ be64_to_cpu(header->hdr_offset) != offset)
|
|
+ return false;
|
|
+
|
|
+ return true;
|
|
+}
|
|
+
|
|
static int probe_luks(blkid_probe pr, const struct blkid_idmag *mag __attribute__((__unused__)))
|
|
{
|
|
struct luks2_phdr *header;
|
|
@@ -105,7 +119,7 @@ static int probe_luks(blkid_probe pr, const struct blkid_idmag *mag __attribute_
|
|
if (!header)
|
|
return errno ? -errno : BLKID_PROBE_NONE;
|
|
|
|
- if (!memcmp(header->magic, LUKS_MAGIC, LUKS_MAGIC_L)) {
|
|
+ if (luks_valid(header, LUKS_MAGIC, 0)) {
|
|
/* LUKS primary header was found. */
|
|
return luks_attributes(pr, header, 0);
|
|
}
|
|
@@ -118,7 +132,7 @@ static int probe_luks(blkid_probe pr, const struct blkid_idmag *mag __attribute_
|
|
if (!header)
|
|
return errno ? -errno : BLKID_PROBE_NONE;
|
|
|
|
- if (!memcmp(header->magic, LUKS_MAGIC_2, LUKS_MAGIC_L))
|
|
+ if (luks_valid(header, LUKS_MAGIC_2, secondary_offsets[i]))
|
|
return luks_attributes(pr, header, secondary_offsets[i]);
|
|
}
|
|
|
|
--
|
|
2.33.0
|
|
|