Avoid NULL deref in grub_device_open.

	* grub-core/kern/device.c (grub_device_open): Don't dereference
	a NULL pointer upon failed grub_env_get.

diff --git a/ChangeLog b/ChangeLog
index e3ed5d13a43c6336ac95dc6b839126a75378deb6..a7f6ce738f9a69cb4b1ab494d25cf6d912e7a0a3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-23  Jim Meyering  <meyering@redhat.com>
+
+       avoid NULL deref in grub_device_open
+       * grub-core/kern/device.c (grub_device_open): Don't dereference
+       a NULL pointer upon failed grub_env_get.
+
 2011-06-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Support non-512B sectors and agglomerate reads.

diff --git a/grub-core/kern/device.c b/grub-core/kern/device.c
index 3db14f50e09c31462948af233fc430d7b3754642..50f49ae6b1b7759f2a42cc57b4d9e53692e28288 100644 (file)
--- a/grub-core/kern/device.c
+++ b/grub-core/kern/device.c
@@ -35,7 +35,7 @@ grub_device_open (const char *name)
   if (! name)
     {
       name = grub_env_get ("root");
-      if (*name == '\0')
+      if (name == NULL || *name == '\0')
        {
          grub_error (GRUB_ERR_BAD_DEVICE, "no device is set");
          goto fail;