Fix potential NULL dereference in ped_disk_next_partition

(cherry picked from commit 8ab6258a689bd75b8915162dcab9908298fb982b)
This commit is contained in:
volcanodragon 2024-04-07 17:06:33 +08:00 committed by openeuler-sync-bot
parent 529d2791ee
commit 6e729c5487
3 changed files with 36 additions and 3 deletions

View File

@ -0,0 +1,30 @@
From 31db44c74a96f8e2b495205d18525449e9b29543 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Wed, 15 Feb 2023 10:13:58 -0800
Subject: [PATCH 19/24] libparted: Fix potential NULL dereference in
ped_disk_next_partition
---
libparted/disk.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libparted/disk.c b/libparted/disk.c
index 345b9e7..8eba2c2 100644
--- a/libparted/disk.c
+++ b/libparted/disk.c
@@ -1552,8 +1552,11 @@ ped_disk_next_partition (const PedDisk* disk, const PedPartition* part)
return part->part_list ? part->part_list : part->next;
if (part->next)
return part->next;
- if (part->type & PED_PARTITION_LOGICAL)
+ if (part->type & PED_PARTITION_LOGICAL) {
+ if (!ped_disk_extended_partition (disk))
+ return NULL;
return ped_disk_extended_partition (disk)->next;
+ }
return NULL;
}
--
2.33.0

View File

@ -16,7 +16,7 @@
Summary: The GNU disk partition manipulation program
Name: parted
Version: 3.5
Release: 2
Release: 3
URL: https://www.gnu.org/software/parted/
Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
License: GPLv3+
@ -35,8 +35,8 @@ Patch6: 0006-scsi_get_product_info-fix-memleak-and-avoid-to-use-N.patch
Patch7: 0007-fat_op_context_new-free-ctx-remap-and-goto-correct-l.patch
Patch8: 0008-hfsplus_cache_from_extent-fix-memleak.patch
Patch9: 0009-fat_clobber-set-boot_sector-NULL-and-free-boot_secto.patch
Patch9000: 9000-parted-remove-patch-which-modifid-cyl-size.patch
Patch10:0010-parted-remove-patch-which-modifid-cyl-size.patch
Patch11:0011-libparted-Fix-potential-NULL-dereference-in-ped_disk.patch
%description
The GNU Parted program allows you to create, destroy, resize, move,
@ -121,6 +121,9 @@ fi
%{_libdir}/pkgconfig/libparted*.pc
%changelog
* Sun Apr 7 2024 volcanodragon <linfeilong@huawei.com> - 3.5-3
- libparted: Fix potential NULL dereference in ped_disk_next_partition
* Thu Dec 14 2023 lingsheng <lingsheng@xfusion.com> - 3.5-2
- remove patch which modifid cyl-size