grub-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] loader/linux: Only emit newc directory once


From: Glenn Washburn
Subject: [PATCH] loader/linux: Only emit newc directory once
Date: Wed, 28 Jun 2023 02:25:16 -0500

When creating at runtime a newc initrd via arguments to initrd with "newc:"
prefixes, only emit a directory path record once. The original code
intended to do that by bailing out of emiting the record when the record
to be created matches an existing record. However, this does not happen
because grub_memcmp() is improperly checked.

Generating duplicate newc directory records does not cause any problems
because the linux unpacker will skip it once it sees the directory already
exists. This fix saves a little processing and makes the generated newc
cpio archive a little smaller.

Fixes: 92750e4c60 (Add ability to generate newc additions on runtime.)
Signed-off-by: Glenn Washburn <development@efficientek.com>
---
 grub-core/loader/linux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grub-core/loader/linux.c b/grub-core/loader/linux.c
index 3948302d2c43..cb2c3f6e4f06 100644
--- a/grub-core/loader/linux.c
+++ b/grub-core/loader/linux.c
@@ -114,7 +114,7 @@ insert_dir (const char *name, struct dir **root,
        break;
 
       for (cur = *root; cur; cur = cur->next)
-       if (grub_memcmp (cur->name, cb, ce - cb)
+       if (grub_memcmp (cur->name, cb, ce - cb) == 0
            && cur->name[ce - cb] == 0)
          break;
       if (!cur)
-- 
2.34.1




reply via email to

[Prev in Thread] Current Thread [Next in Thread]