MahnoKropotkinvich/parted
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!54 libparted: Fix potential NULL dereference in ped_disk

Browse Source 
From: @fandeyuan 
Reviewed-by: @volcanodragon 
Signed-off-by: @volcanodragon
This commit is contained in:
openeuler-ci-bot 2024-03-29 06:36:00 +00:00 committed by Gitee
commit c2d8b5594a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
0011-libparted-Fix-potential-NULL-dereference-in-ped_disk.patch Normal file
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

6
parted.spec
View File

@ -16,7 +16,7 @@
Summary: The GNU disk partition manipulation program
Name: parted
Version: 3.4
Release: 5
Release: 6
URL: https://www.gnu.org/software/parted/
Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
License: GPLv3+
@ -36,6 +36,7 @@ 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
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,
@ -120,6 +121,9 @@ fi
%{_libdir}/pkgconfig/libparted*.pc
%changelog
* Fri Mar 29 2024 Deyuan Fan <fandeyuan@kylinos.cn> - 3.4-6
- libparted: Fix potential NULL dereference in ped_disk_next_partition
* Fri Dec 15 2023 wangzhiqiang <wangzhiqiang95@huawei.com> - 3.4-5
- remove patch which modify cyl-size