packages/gdisk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!16 [sync] PR-14: Synchronize Version

Browse Source 
From: @openeuler-sync-bot
Reviewed-by: @wubo009
Signed-off-by: @wubo009
This commit is contained in:
openeuler-ci-bot 2021-09-29 03:46:10 +00:00 committed by Gitee
commit 06e7cbb8b4
2 changed files with 94 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
0001-Fix-segfault-on-some-weird-data-structures.patch Normal file
View File

@ -0,0 +1,72 @@
From 81c8bbee46ad6ebacf72eae70ba5147f376205a4 Mon Sep 17 00:00:00 2001
From: Rod Smith <rodsmith@rodsbooks.com>
Date: Mon, 14 Sep 2020 10:08:18 -0400
Subject: [PATCH] Fix segfault on some weird data structures
---
NEWS | 6 ++++++
gpt.cc | 13 ++++++++++++-
support.h | 2 +-
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/NEWS b/NEWS
index 54c865e..bac3da3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+1.0.6 (?/??/2020):
+------------------
+
+- Fixed bug that could cause segfault if GPT header claimed partition
+ entries are oversized.
+
1.0.5 (2/17/2020):
------------------
diff --git a/gpt.cc b/gpt.cc
index fe8e956..1b4e10f 100644
--- a/gpt.cc
+++ b/gpt.cc
@@ -1041,6 +1041,14 @@ int GPTData::LoadHeader(struct GPTHeader *header, DiskIO & disk, uint64_t sector
} // if
*crcOk = CheckHeaderCRC(&tempHeader);
+ if (tempHeader.sizeOfPartitionEntries != sizeof(GPTPart)) {
+ cerr << "Warning: Partition table header claims that the size of partition table\n";
+ cerr << "entries is " << tempHeader.sizeOfPartitionEntries << " bytes, but this program ";
+ cerr << " supports only " << sizeof(GPTPart) << "-byte entries.\n";
+ cerr << "Adjusting accordingly, but partition table may be garbage.\n";
+ tempHeader.sizeOfPartitionEntries = sizeof(GPTPart);
+ }
+
if (allOK && (numParts != tempHeader.numParts) && *crcOk) {
allOK = SetGPTSize(tempHeader.numParts, 0);
}
@@ -1058,7 +1066,10 @@ int GPTData::LoadPartitionTable(const struct GPTHeader & header, DiskIO & disk,
uint32_t sizeOfParts, newCRC;
int retval;
- if (disk.OpenForRead()) {
+ if (header.sizeOfPartitionEntries != sizeof(GPTPart)) {
+ cerr << "Error! GPT header contains invalid partition entry size!\n";
+ retval = 0;
+ } else if (disk.OpenForRead()) {
if (sector == 0) {
retval = disk.Seek(header.partitionEntriesLBA);
} else {
diff --git a/support.h b/support.h
index 9a79b95..978bfe1 100644
--- a/support.h
+++ b/support.h
@@ -8,7 +8,7 @@
#ifndef __GPTSUPPORT
#define __GPTSUPPORT
-#define GPTFDISK_VERSION "1.0.5"
+#define GPTFDISK_VERSION "1.0.5.1"
#if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined (__APPLE__)
// Darwin (Mac OS) & FreeBSD: disk IOCTLs are different, and there is no lseek64
--
1.8.3.1

26
gdisk.spec
View File

@ -1,12 +1,15 @@
Name: gdisk
Version: 1.0.5
Release: 1
Release: 5
Summary: GPT fdisk(consisting of the gdisk,sgdisk,cgdisk) is a set of text-mode partitioning tools
License: GPLv2
URL: http://www.rodsbooks.com/gdisk
Source0: http://downloads.sourceforge.net/gptfdisk/gptfdisk-%{version}.tar.gz
BuildRequires:ncurses-devel util-linux-devel gcc-c++ popt-devel git gdb
Patch1: 0001-Fix-segfault-on-some-weird-data-structures.patch
BuildRequires:ncurses-devel util-linux-devel gcc-c++ popt-devel
%description
GPT fdisk(consisting of the gdisk,sgdisk,cgdisk) is a set of text-mode partitioning tools.
@ -20,12 +23,15 @@ Requires: man
This package contains the man page for GPT fdisk(consisting of the gdisk,sgdisk,cgdisk)
%prep
%autosetup -n gptfdisk-%{version} -p1 -Sgit
chmod 0644 gdisk_test.sh
%autosetup -n gptfdisk-%{version} -p1
%build
make CXXFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" LDFLAGS="%{build_ldflags}"
%check
make test
chmod 0644 gdisk_test.sh
%install
install -Dp -m 0755 cgdisk %{buildroot}%{_sbindir}/cgdisk
install -Dp -m 0644 cgdisk.8 %{buildroot}%{_mandir}/man8/cgdisk.8
@ -45,6 +51,18 @@ install -Dp -m 0644 fixparts.8 %{buildroot}%{_mandir}/man8/fixparts.8
%{_mandir}/man8/*
%changelog
* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 1.0.5-5
- DESC: delete -Sgit from %autosetup, and delete BuildRequires git
* Fri Jul 23 2021 zhouwenpei <zhouwenpei1@huawei.com> - 1.0.5-4
- remove unnecessary build require.
* Wed Nov 4 2020 lixiaokeng <lixiaokeng@huawei.com> - 1.0.5-3
- add make test
* Thu Oct 29 2020 Zhiqiang Liu <liuzhiqiang26@huawei.com> - 1.0.5-2
- backport one patch for solving potential segfault problem.
* Wed Jul 29 2020 yanglongkang <yanglongkang@huawei.com> - 1.0.5-1
- update to 1.0.5 version