grub2/0192-commands-nativedisk-Add-missing-device_close.patch
Peter Jones 8c6b1ac71e Reconcile with upstream once again.
Also include some minor fixes for gcc 5.1.1

Signed-off-by: Peter Jones <pjones@redhat.com>
2015-07-22 09:46:32 -04:00

34 lines
1.0 KiB
Diff

From bd50aa323d30d064563c213ab7ee8b8846981609 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sat, 24 Jan 2015 21:18:36 +0100
Subject: [PATCH 192/506] commands/nativedisk: Add missing device_close.
Found by: Coverity scan.
---
grub-core/commands/nativedisk.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/grub-core/commands/nativedisk.c b/grub-core/commands/nativedisk.c
index 33b6b99..b3bc463 100644
--- a/grub-core/commands/nativedisk.c
+++ b/grub-core/commands/nativedisk.c
@@ -57,6 +57,7 @@ get_uuid (const char *name, char **uuid, int getnative)
if (!dev->disk)
{
grub_dprintf ("nativedisk", "Skipping non-disk\n");
+ grub_device_close (dev);
return 0;
}
@@ -90,6 +91,7 @@ get_uuid (const char *name, char **uuid, int getnative)
case GRUB_DISK_DEVICE_MEMDISK_ID:
grub_dprintf ("nativedisk", "Skipping native disk %s\n",
dev->disk->name);
+ grub_device_close (dev);
return 0;
/* FIXME: those probably need special handling. */
--
2.4.3