Blob Blame History Raw
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Mon, 12 May 2014 10:01:48 +0200
Subject: [PATCH] * grub-core/commands/verify.c (grub_pubkey_open): Fix memdisk
 check.

---
 grub-core/commands/verify.c | 2 +-
 ChangeLog                   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/grub-core/commands/verify.c b/grub-core/commands/verify.c
index a9dfd885247..6349ccfbaea 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)
diff --git a/ChangeLog b/ChangeLog
index 3b61c0a996d..d0896d89e53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-21  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/commands/verify.c (grub_pubkey_open): Fix memdisk
+	check.
+
 2014-04-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/misc.c (__bzero): Don't compile in GRUB_UTIL.