* grub-core/commands/verify.c (grub_pubkey_open): Trust procfs.

diff --git a/ChangeLog b/ChangeLog
index c32d4c6f4aae6195e7a4a04f51fb11d73f5d73bb..6d2f8c635ca1a1d668f628f378d64eb63db1e12d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-21  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/commands/verify.c (grub_pubkey_open): Trust procfs.
+
 2014-06-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/commands/verify.c (grub_pubkey_open): Fix memdisk

diff --git a/grub-core/commands/verify.c b/grub-core/commands/verify.c
index 6349ccfbaea6ecbe489ae2264ccb8f6994be309a..525bdd1873734fd591ce7d5ebdc5da77f69d52ed 100644 (file)
--- a/grub-core/commands/verify.c
+++ b/grub-core/commands/verify.c
@@ -835,7 +835,9 @@ grub_pubkey_open (grub_file_t io, const char *filename)
 
   if (!sec)
     return io;
-  if (io->device->disk && io->device->disk->dev->id == GRUB_DISK_DEVICE_MEMDISK_ID)
+  if (io->device->disk && 
+      (io->device->disk->dev->id == GRUB_DISK_DEVICE_MEMDISK_ID
+       || io->device->disk->dev->id == GRUB_DISK_DEVICE_PROCFS_ID))
     return io;
   fsuf = grub_malloc (grub_strlen (filename) + sizeof (".sig"));
   if (!fsuf)