loader/linux: Only emit newc directory once

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 emitting 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>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

diff --git a/grub-core/loader/linux.c b/grub-core/loader/linux.c
index 3948302d2c434f94a2a8d0d65d05fefcb3b82728..cb2c3f6e4f062b95bdd539b774da0fb3d7d5239a 100644 (file)
--- 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)