From 4a307e8fe1298f88641a40c8a8008363aa4b9c17 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 12 May 2014 10:01:48 +0200 Subject: [PATCH 081/152] * grub-core/commands/verify.c (grub_pubkey_open): Fix memdisk check. --- ChangeLog | 5 +++++ grub-core/commands/verify.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3b61c0a..d0896d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-06-21 Vladimir Serbinenko + + * grub-core/commands/verify.c (grub_pubkey_open): Fix memdisk + check. + 2014-04-20 Vladimir Serbinenko * grub-core/kern/misc.c (__bzero): Don't compile in GRUB_UTIL. diff --git a/grub-core/commands/verify.c b/grub-core/commands/verify.c index a9dfd88..6349ccf 100644 --- a/grub-core/commands/verify.c +++ b/grub-core/commands/verify.c @@ -835,7 +835,7 @@ grub_pubkey_open (grub_file_t io, const char *filename) if (!sec) return io; - if (io->device->disk && io->device->disk->id == GRUB_DISK_DEVICE_MEMDISK_ID) + if (io->device->disk && io->device->disk->dev->id == GRUB_DISK_DEVICE_MEMDISK_ID) return io; fsuf = grub_malloc (grub_strlen (filename) + sizeof (".sig")); if (!fsuf) -- 1.9.3