Re: Patch to support LUKS UUIDs in libblkid

[Karsten Hopp <karsten@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 1096 bytes --]

Theodore Tso schrieb:
> In addition to the comments already posted:
> 
>> +/* check it manually as using LUKS_read_phdr from libcryptsetup
>> + * prints too many warnings if it isn't a luks partition and would add a
>> + * dependency on the lib */
>> +static int probe_luks(struct blkid_probe *probe,
>> +		       struct blkid_magic *id __BLKID_ATTR((unused)), 
>> +		       unsigned char *buf)
>> +{
>> +	const char *luks_magic = id->bim_magic;
>> +	unsigned char *p_buf = buf;
>> +	unsigned char uuid[40];
>> +	if(strncmp(buf, luks_magic, strlen(luks_magic)) == 0)   /* ID matches, continue */
> 
> There's no point in doing this check, since it's replicating a check
> already done in the generic code.  The probe function won't be called
> if the bim_magic didn't match the specified offset. 
> 
> 						- Ted

Thanks everyone for the replys.
I'll attach a new patch with the suggested fixes.

    Karsten

--
  Karsten Hopp        | Mail: karsten@redhat.de
  Red Hat Deutschland | Tel: +49-711-96437-0
  Hauptstaetterstr.58 | Fax: +49-711-613590
  D-70178 Stuttgart   | http://www.redhat.de

[-- Attachment #2: e2fsprogs-1.39-luks.patch --]
[-- Type: text/x-patch, Size: 1616 bytes --]

e2fsprogs-1.39-luks.patch
Problem:        libblkid doesn't detect/report UUIDs of cryptsetup-luks partitions
Solution:       Add probe for luks UUID
Signed-off-by:  Karsten Hopp <karsten@redhat.com>

--- e2fsprogs-1.39/lib/blkid/ChangeLog.luksuuid	2007-06-11 13:40:14.000000000 +0200
+++ e2fsprogs-1.39/lib/blkid/ChangeLog	2007-06-11 13:40:14.000000000 +0200
@@ -0,0 +1,4 @@
+2007-05-22  Karsten Hopp  <karsten@redhat.com> 
+
+	* probe.c (probe_luks): Add support for cryptsetup-luks partitions
+
--- e2fsprogs-1.39/lib/blkid/probe.c.luksuuid	2007-06-11 13:40:14.000000000 +0200
+++ e2fsprogs-1.39/lib/blkid/probe.c	2007-06-11 13:46:28.000000000 +0200
@@ -468,6 +468,20 @@ static int probe_jfs(struct blkid_probe 
 	return 0;
 }
 
+static int probe_luks(struct blkid_probe *probe,
+		       struct blkid_magic *id __BLKID_ATTR((unused)), 
+		       unsigned char *buf)
+{
+	unsigned char *p_buf = buf;
+	unsigned char uuid[40];
+	/* 168 is the offset to the 40 character uuid: 
+	 * http://luks.endorphin.org/LUKS-on-disk-format.pdf */
+	p_buf += 168;
+	strncpy(uuid, p_buf, 40);
+	blkid_set_tag(probe->dev, "UUID", uuid, sizeof(uuid));
+	return 0;
+}
+
 static int probe_romfs(struct blkid_probe *probe,
 		       struct blkid_magic *id __BLKID_ATTR((unused)), 
 		       unsigned char *buf)
@@ -775,6 +789,7 @@ static struct blkid_magic type_array[] =
   { "ocfs2",	 2,	 0,  6,	"OCFSV2",		probe_ocfs2 },
   { "ocfs2",	 4,	 0,  6,	"OCFSV2",		probe_ocfs2 },
   { "ocfs2",	 8,	 0,  6,	"OCFSV2",		probe_ocfs2 },
+  { "crypt_LUKS",0,	 0,  6,	"LUKS\xba\xbe",		probe_luks },
   {   NULL,	 0,	 0,  0, NULL,			NULL }
 };