From: Karel Zak <kzak@redhat.com>
Date: Wed, 25 Nov 2020 14:45:23 +0000 (+0100)
Subject: libblkid: initialize magic strings in robust way
X-Git-Tag: v2.37-rc1~265
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e0a3b59da9a7fd313c4ddf20f24c7a708d42fc3;p=thirdparty%2Futil-linux.git

libblkid: initialize magic strings in robust way

It is the worst habit to depend on the order of the members of the
structure ...

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libblkid/src/superblocks/cramfs.c b/libblkid/src/superblocks/cramfs.c
index 6d01b0baa8..2c41cc5deb 100644
--- a/libblkid/src/superblocks/cramfs.c
+++ b/libblkid/src/superblocks/cramfs.c
@@ -53,8 +53,8 @@ const struct blkid_idinfo cramfs_idinfo =
 	.probefunc	= probe_cramfs,
 	.magics		=
 	{
-		{ "\x45\x3d\xcd\x28", 4, 0, 0 },
-		{ "\x28\xcd\x3d\x45", 4, 0, 0 },
+		{ .magic = "\x45\x3d\xcd\x28", .len = 4 },
+		{ .magic = "\x28\xcd\x3d\x45", .len = 4 },
 		{ NULL }
 	}
 };
diff --git a/libblkid/src/superblocks/swap.c b/libblkid/src/superblocks/swap.c
index 94f51aa11d..1e0ab9a5e9 100644
--- a/libblkid/src/superblocks/swap.c
+++ b/libblkid/src/superblocks/swap.c
@@ -125,16 +125,16 @@ const struct blkid_idinfo swap_idinfo =
 	.minsz		= 10 * 4096,	/* 10 pages */
 	.magics		=
 	{
-		{ "SWAP-SPACE", 10, 0,  0xff6 },
-		{ "SWAPSPACE2", 10, 0,  0xff6 },
-		{ "SWAP-SPACE", 10, 0, 0x1ff6 },
-		{ "SWAPSPACE2", 10, 0, 0x1ff6 },
-		{ "SWAP-SPACE", 10, 0, 0x3ff6 },
-		{ "SWAPSPACE2", 10, 0, 0x3ff6 },
-		{ "SWAP-SPACE", 10, 0, 0x7ff6 },
-		{ "SWAPSPACE2", 10, 0, 0x7ff6 },
-		{ "SWAP-SPACE", 10, 0, 0xfff6 },
-		{ "SWAPSPACE2", 10, 0, 0xfff6 },
+		{ .magic = "SWAP-SPACE", .len = 10, .sboff = 0xff6 },
+		{ .magic = "SWAPSPACE2", .len = 10, .sboff = 0xff6 },
+		{ .magic = "SWAP-SPACE", .len = 10, .sboff = 0x1ff6 },
+		{ .magic = "SWAPSPACE2", .len = 10, .sboff = 0x1ff6 },
+		{ .magic = "SWAP-SPACE", .len = 10, .sboff = 0x3ff6 },
+		{ .magic = "SWAPSPACE2", .len = 10, .sboff = 0x3ff6 },
+		{ .magic = "SWAP-SPACE", .len = 10, .sboff = 0x7ff6 },
+		{ .magic = "SWAPSPACE2", .len = 10, .sboff = 0x7ff6 },
+		{ .magic = "SWAP-SPACE", .len = 10, .sboff = 0xfff6 },
+		{ .magic = "SWAPSPACE2", .len = 10, .sboff = 0xfff6 },
 		{ NULL }
 	}
 };
@@ -148,33 +148,31 @@ const struct blkid_idinfo swsuspend_idinfo =
 	.minsz		= 10 * 4096,	/* 10 pages */
 	.magics		=
 	{
-		{ TOI_MAGIC_STRING, TOI_MAGIC_STRLEN, 0, 0 },
-		{ "S1SUSPEND", 9, 0, 0xff6 },
-		{ "S2SUSPEND", 9, 0, 0xff6 },
-		{ "ULSUSPEND", 9, 0, 0xff6 },
-		{ "LINHIB0001",10,0, 0xff6 },
-
-		{ "S1SUSPEND", 9, 0, 0x1ff6 },
-		{ "S2SUSPEND", 9, 0, 0x1ff6 },
-		{ "ULSUSPEND", 9, 0, 0x1ff6 },
-		{ "LINHIB0001",10,0, 0x1ff6 },
-
-		{ "S1SUSPEND", 9, 0, 0x3ff6 },
-		{ "S2SUSPEND", 9, 0, 0x3ff6 },
-		{ "ULSUSPEND", 9, 0, 0x3ff6 },
-		{ "LINHIB0001",10,0, 0x3ff6 },
-
-		{ "S1SUSPEND", 9, 0, 0x7ff6 },
-		{ "S2SUSPEND", 9, 0, 0x7ff6 },
-		{ "ULSUSPEND", 9, 0, 0x7ff6 },
-		{ "LINHIB0001",10,0, 0x7ff6 },
-
-		{ "S1SUSPEND", 9, 0, 0xfff6 },
-		{ "S2SUSPEND", 9, 0, 0xfff6 },
-		{ "ULSUSPEND", 9, 0, 0xfff6 },
-		{ "LINHIB0001",10,0, 0xfff6 },
-
+		{ .magic = TOI_MAGIC_STRING, .len = TOI_MAGIC_STRLEN },
+		{ .magic = "S1SUSPEND", .len = 9, .sboff = 0xff6 },
+		{ .magic = "S2SUSPEND", .len = 9, .sboff = 0xff6 },
+		{ .magic = "ULSUSPEND", .len = 9, .sboff = 0xff6 },
+		{ .magic = "LINHIB0001", .len = 10, .sboff = 0xff6 },
+
+		{ .magic = "S1SUSPEND", .len = 9, .sboff = 0x1ff6 },
+		{ .magic = "S2SUSPEND", .len = 9, .sboff = 0x1ff6 },
+		{ .magic = "ULSUSPEND", .len = 9, .sboff = 0x1ff6 },
+		{ .magic = "LINHIB0001", .len = 10, .sboff = 0x1ff6 },
+
+		{ .magic = "S1SUSPEND", .len = 9, .sboff = 0x3ff6 },
+		{ .magic = "S2SUSPEND", .len = 9, .sboff = 0x3ff6 },
+		{ .magic = "ULSUSPEND", .len = 9, .sboff = 0x3ff6 },
+		{ .magic = "LINHIB0001", .len = 10, .sboff = 0x3ff6 },
+
+		{ .magic = "S1SUSPEND", .len = 9, .sboff = 0x7ff6 },
+		{ .magic = "S2SUSPEND", .len = 9, .sboff = 0x7ff6 },
+		{ .magic = "ULSUSPEND", .len = 9, .sboff = 0x7ff6 },
+		{ .magic = "LINHIB0001", .len = 10, .sboff = 0x7ff6 },
+
+		{ .magic = "S1SUSPEND", .len = 9, .sboff = 0xfff6 },
+		{ .magic = "S2SUSPEND", .len = 9, .sboff = 0xfff6 },
+		{ .magic = "ULSUSPEND", .len = 9, .sboff = 0xfff6 },
+		{ .magic = "LINHIB0001", .len = 10, .sboff = 0xfff6 },
 		{ NULL }
 	}
 };
-