|
 |
011fe81 |
From 61fdf8bebdeaed4b601f0eca847282780380191f Mon Sep 17 00:00:00 2001
|
|
|
011fe81 |
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
011fe81 |
Date: Thu, 15 May 2014 14:36:48 +0200
|
|
|
58fe9aa |
Subject: [PATCH 082/152] * grub-core/commands/verify.c
|
|
|
011fe81 |
(grub_pubkey_open): Trust procfs.
|
|
|
011fe81 |
|
|
|
011fe81 |
---
|
|
|
011fe81 |
ChangeLog | 4 ++++
|
|
|
011fe81 |
grub-core/commands/verify.c | 4 +++-
|
|
|
011fe81 |
2 files changed, 7 insertions(+), 1 deletion(-)
|
|
|
011fe81 |
|
|
|
011fe81 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
011fe81 |
index d0896d8..2a94ad9 100644
|
|
|
011fe81 |
--- a/ChangeLog
|
|
|
011fe81 |
+++ b/ChangeLog
|
|
|
011fe81 |
@@ -1,5 +1,9 @@
|
|
|
011fe81 |
2014-06-21 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
011fe81 |
|
|
|
011fe81 |
+ * grub-core/commands/verify.c (grub_pubkey_open): Trust procfs.
|
|
|
011fe81 |
+
|
|
|
011fe81 |
+2014-06-21 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
011fe81 |
+
|
|
|
011fe81 |
* grub-core/commands/verify.c (grub_pubkey_open): Fix memdisk
|
|
|
011fe81 |
check.
|
|
|
011fe81 |
|
|
|
011fe81 |
diff --git a/grub-core/commands/verify.c b/grub-core/commands/verify.c
|
|
|
011fe81 |
index 6349ccf..525bdd1 100644
|
|
|
011fe81 |
--- a/grub-core/commands/verify.c
|
|
|
011fe81 |
+++ b/grub-core/commands/verify.c
|
|
|
011fe81 |
@@ -835,7 +835,9 @@ grub_pubkey_open (grub_file_t io, const char *filename)
|
|
|
011fe81 |
|
|
|
011fe81 |
if (!sec)
|
|
|
011fe81 |
return io;
|
|
|
011fe81 |
- if (io->device->disk && io->device->disk->dev->id == GRUB_DISK_DEVICE_MEMDISK_ID)
|
|
|
011fe81 |
+ if (io->device->disk &&
|
|
|
011fe81 |
+ (io->device->disk->dev->id == GRUB_DISK_DEVICE_MEMDISK_ID
|
|
|
011fe81 |
+ || io->device->disk->dev->id == GRUB_DISK_DEVICE_PROCFS_ID))
|
|
|
011fe81 |
return io;
|
|
|
011fe81 |
fsuf = grub_malloc (grub_strlen (filename) + sizeof (".sig"));
|
|
|
011fe81 |
if (!fsuf)
|
|
|
011fe81 |
--
|
|
|
37b39b7 |
1.9.3
|
|
|
011fe81 |
|