[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v9 09/11] kern: check for NULL when closing devices and disks
From: |
Oliver Steffen |
Subject: |
[PATCH v9 09/11] kern: check for NULL when closing devices and disks |
Date: |
Fri, 26 May 2023 13:35:50 +0200 |
Add checks for NULL pointers to grub_device_close() and
grub_disk_close() to make these functions more robust.
Signed-off-by: Oliver Steffen <osteffen@redhat.com>
---
grub-core/kern/device.c | 3 +++
grub-core/kern/disk.c | 4 ++++
2 files changed, 7 insertions(+)
diff --git a/grub-core/kern/device.c b/grub-core/kern/device.c
index 92ce8a75e..670e213cf 100644
--- a/grub-core/kern/device.c
+++ b/grub-core/kern/device.c
@@ -71,6 +71,9 @@ grub_device_open (const char *name)
grub_err_t
grub_device_close (grub_device_t device)
{
+ if (device == NULL)
+ return GRUB_ERR_NONE;
+
if (device->disk)
grub_disk_close (device->disk);
diff --git a/grub-core/kern/disk.c b/grub-core/kern/disk.c
index eb0c7bb73..1eda58fe9 100644
--- a/grub-core/kern/disk.c
+++ b/grub-core/kern/disk.c
@@ -292,6 +292,10 @@ void
grub_disk_close (grub_disk_t disk)
{
grub_partition_t part;
+
+ if (disk == NULL)
+ return;
+
grub_dprintf ("disk", "Closing `%s'.\n", disk->name);
if (disk->dev && disk->dev->disk_close)
--
2.40.1
- [PATCH v9 00/11] Add basic Boot Loader Interface support, Oliver Steffen, 2023/05/26
- [PATCH v9 07/11] efi: Add grub_efi_set_variable_to_string(), Oliver Steffen, 2023/05/26
- [PATCH v9 05/11] types.h: Add GRUB_SSIZE_MAX, Oliver Steffen, 2023/05/26
- [PATCH v9 04/11] grub-core: Make use of guid printf format specifier, Oliver Steffen, 2023/05/26
- [PATCH v9 02/11] Unify GUID types, Oliver Steffen, 2023/05/26
- [PATCH v9 06/11] kern/misc, kern/efi: Extract UTF-8 to UTF-16 code, Oliver Steffen, 2023/05/26
- [PATCH v9 01/11] efi: Add grub_efi_set_variable_with_attributes(), Oliver Steffen, 2023/05/26
- [PATCH v9 03/11] kern/misc: Add a format specifier GUIDs, Oliver Steffen, 2023/05/26
- [PATCH v9 08/11] docs: Reword section headings, Oliver Steffen, 2023/05/26
- [PATCH v9 10/11] Add a module for the Boot Loader Interface, Oliver Steffen, 2023/05/26
- [PATCH v9 09/11] kern: check for NULL when closing devices and disks,
Oliver Steffen <=
- [PATCH v9 11/11] util/grub.d: Activate bli module on EFI, Oliver Steffen, 2023/05/26
- Re: [PATCH v9 00/11] Add basic Boot Loader Interface support, Daniel Kiper, 2023/05/30