rpms/parted/devel parted-2.1-mem-leak-fixes-rh556012.patch, NONE, 1.1 parted-1.9.0-align-default-rh361951.patch, 1.1, 1.2 parted.spec, 1.160, 1.161
Hans de Goede
jwrdegoede at fedoraproject.org
Sun Jan 17 15:57:08 UTC 2010
Author: jwrdegoede
Update of /cvs/pkgs/rpms/parted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12136
Modified Files:
parted-1.9.0-align-default-rh361951.patch parted.spec
Added Files:
parted-2.1-mem-leak-fixes-rh556012.patch
Log Message:
* Sun Jan 17 2010 Hans de Goede <hdegoede at redhat.com> 2.1-2
- Fix various memory leaks in error paths (#556012)
- Add %check section to the specfile, invoking make check
parted-2.1-mem-leak-fixes-rh556012.patch:
b/libparted/disk.c | 3 ++-
b/libparted/labels/dos.c | 10 +++++-----
b/libparted/labels/gpt.c | 5 ++---
libparted/labels/gpt.c | 13 ++++++++-----
4 files changed, 17 insertions(+), 14 deletions(-)
--- NEW FILE parted-2.1-mem-leak-fixes-rh556012.patch ---
>From 358c9846a014247605d8da47b6917cac1344de00 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Fri, 15 Jan 2010 20:14:38 +0100
Subject: [PATCH] dos: don't leak a constraint upon partition-add failure
* libparted/labels/dos.c (read_table): Free constraint upon failure.
---
libparted/labels/dos.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/libparted/labels/dos.c b/libparted/labels/dos.c
index 6b8d6cb..339acf4 100644
--- a/libparted/labels/dos.c
+++ b/libparted/labels/dos.c
@@ -873,7 +873,6 @@ read_table (PedDisk* disk, PedSector sector, int is_extended_table)
PedPartition* part;
PedPartitionType type;
PedSector lba_offset;
- PedConstraint* constraint_exact;
PED_ASSERT (disk != NULL, return 0);
PED_ASSERT (disk->dev != NULL, return 0);
@@ -944,10 +943,12 @@ read_table (PedDisk* disk, PedSector sector, int is_extended_table)
if (type != PED_PARTITION_EXTENDED)
part->fs_type = ped_file_system_probe (&part->geom);
- constraint_exact = ped_constraint_exact (&part->geom);
- if (!ped_disk_add_partition (disk, part, constraint_exact))
- goto error;
+ PedConstraint *constraint_exact
+ = ped_constraint_exact (&part->geom);
+ bool ok = ped_disk_add_partition (disk, part, constraint_exact);
ped_constraint_destroy (constraint_exact);
+ if (!ok)
+ goto error;
/* non-nested extended partition */
if (part->type == PED_PARTITION_EXTENDED) {
--
1.6.3.3
>From d0cec198183be0b9989e4bc729c2930c7cdfe545 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Fri, 15 Jan 2010 19:53:36 +0100
Subject: [PATCH] gpt: don't leak a constraint upon partition-add failure
* libparted/labels/gpt.c (gpt_read): Free constraint upon failure.
---
libparted/labels/gpt.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libparted/labels/gpt.c b/libparted/labels/gpt.c
index 76537fd..9d9876c 100644
--- a/libparted/labels/gpt.c
+++ b/libparted/labels/gpt.c
@@ -1020,7 +1020,6 @@ gpt_read (PedDisk *disk)
GuidPartitionEntry_t *pte
= (GuidPartitionEntry_t *) ((char *) ptes + i * p_ent_size);
PedPartition *part;
- PedConstraint *constraint_exact;
if (!guid_cmp (pte->PartitionTypeGuid, UNUSED_ENTRY_GUID))
continue;
@@ -1032,9 +1031,10 @@ gpt_read (PedDisk *disk)
part->fs_type = ped_file_system_probe (&part->geom);
part->num = i + 1;
- constraint_exact = ped_constraint_exact (&part->geom);
+ PedConstraint *constraint_exact = ped_constraint_exact (&part->geom);
if (!ped_disk_add_partition (disk, part, constraint_exact))
{
+ ped_constraint_destroy (constraint_exact);
ped_partition_destroy (part);
goto error_delete_all;
}
--
1.6.3.3
>From 952e4919befce199b096fd1bbde93ef7902239d3 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Fri, 15 Jan 2010 19:34:00 +0100
Subject: [PATCH] gpt: do not leak a GPT header on an error path
* libparted/labels/gpt.c (gpt_write): Avoid a leak by freeing the
header buffer after pth_get_raw call where it's used, but before
checking whether that pth_get_raw call succeeded.
Avoid another leak in identical just 10 lines down.
Add "FIXME: caution..." comments to warn about the duplication.
---
libparted/labels/gpt.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/libparted/labels/gpt.c b/libparted/labels/gpt.c
index fe1f300..76537fd 100644
--- a/libparted/labels/gpt.c
+++ b/libparted/labels/gpt.c
@@ -1208,11 +1208,13 @@ gpt_write (const PedDisk *disk)
goto error_free_ptes;
/* Write PTH and PTEs */
+ /* FIXME: Caution: this code is nearly identical to what's just below. */
if (_generate_header (disk, 0, ptes_crc, &gpt) != 0)
goto error_free_ptes;
- if ((pth_raw = pth_get_raw (disk->dev, gpt)) == NULL)
- goto error_free_ptes;
+ pth_raw = pth_get_raw (disk->dev, gpt);
pth_free (gpt);
+ if (pth_raw == NULL)
+ goto error_free_ptes;
int write_ok = ped_device_write (disk->dev, pth_raw, 1, 1);
free (pth_raw);
if (!write_ok)
@@ -1222,11 +1224,13 @@ gpt_write (const PedDisk *disk)
goto error_free_ptes;
/* Write Alternate PTH & PTEs */
+ /* FIXME: Caution: this code is nearly identical to what's just above. */
if (_generate_header (disk, 1, ptes_crc, &gpt) != 0)
goto error_free_ptes;
- if ((pth_raw = pth_get_raw (disk->dev, gpt)) == NULL)
- goto error_free_ptes;
+ pth_raw = pth_get_raw (disk->dev, gpt);
pth_free (gpt);
+ if (pth_raw == NULL)
+ goto error_free_ptes;
write_ok = ped_device_write (disk->dev, pth_raw, disk->dev->length - 1, 1);
free (pth_raw);
if (!write_ok)
--
1.6.3.3
>From 19b072592a7a551a861c200be58aef04a7546fb9 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Fri, 15 Jan 2010 18:56:37 +0100
Subject: [PATCH] libparted: avoid double-free on an OOM failure path
* libparted/disk.c (ped_disk_check): Don't double-free "fs_size".
---
libparted/disk.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/libparted/disk.c b/libparted/disk.c
index c14d005..2d27b7c 100644
--- a/libparted/disk.c
+++ b/libparted/disk.c
@@ -632,7 +632,9 @@ ped_disk_check (const PedDisk* disk)
walk->num, part_size, fs_size);
free (part_size);
+
free (fs_size);
+ fs_size = NULL;
if (choice != PED_EXCEPTION_IGNORE)
return 0;
--
1.6.3.3
parted-1.9.0-align-default-rh361951.patch:
parted-1.9.0/parted/parted.c | 2 +-
parted-2.1/tests/t2100-mkswap.sh | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
Index: parted-1.9.0-align-default-rh361951.patch
===================================================================
RCS file: /cvs/pkgs/rpms/parted/devel/parted-1.9.0-align-default-rh361951.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- parted-1.9.0-align-default-rh361951.patch 18 Dec 2009 09:42:14 -0000 1.1
+++ parted-1.9.0-align-default-rh361951.patch 17 Jan 2010 15:57:08 -0000 1.2
@@ -9,3 +9,33 @@
static const char* number_msg = N_(
"NUMBER is the partition number used by Linux. On MS-DOS disk labels, the "
+### Adjust mkswap test for above change
+diff -up parted-2.1/tests/t2100-mkswap.sh~ parted-2.1/tests/t2100-mkswap.sh
+--- parted-2.1/tests/t2100-mkswap.sh~ 2010-01-17 15:52:31.000000000 +0100
++++ parted-2.1/tests/t2100-mkswap.sh 2010-01-17 16:26:19.000000000 +0100
+@@ -74,13 +74,13 @@ test_expect_success \
+ 'parted -s $dev2 mkfs 1 "linux-swap(v1)" > out 2>&1'
+ test_expect_success 'expect no output' 'compare out /dev/null'
+
+-# partition starts at offset 16384; swap UUID is 1036 bytes in
++# partition starts at offset 512; swap UUID is 1036 bytes in
+ test_expect_success \
+ 'extract UUID 1' \
+- 'od -t x1 -An -j17420 -N16 $dev > uuid1'
++ 'od -t x1 -An -j1548 -N16 $dev > uuid1'
+ test_expect_success \
+ 'extract UUID 2' \
+- 'od -t x1 -An -j17420 -N16 $dev2 > uuid2'
++ 'od -t x1 -An -j1548 -N16 $dev2 > uuid2'
+ test_expect_failure \
+ 'two linux-swap file systems have different UUIDs' \
+ 'compare uuid1 uuid2'
+@@ -92,7 +92,7 @@ test_expect_success 'expect no output' '
+
+ test_expect_success \
+ 'extract new UUID 2' \
+- 'od -t x1 -An -j17420 -N16 $dev2 > uuid2-new'
++ 'od -t x1 -An -j1548 -N16 $dev2 > uuid2-new'
+ test_expect_success \
+ 'check preserves linux-swap UUID' \
+ 'compare uuid2 uuid2-new'
Index: parted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parted/devel/parted.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- parted.spec 11 Jan 2010 14:03:07 -0000 1.160
+++ parted.spec 17 Jan 2010 15:57:08 -0000 1.161
@@ -4,7 +4,7 @@
Summary: The GNU disk partition manipulation program
Name: parted
Version: 2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv3+
Group: Applications/System
URL: http://www.gnu.org/software/parted
@@ -12,6 +12,7 @@ URL: http://www.gnu.org/software/par
Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
Patch0: parted-1.9.0-align-default-rh361951.patch
Patch1: parted-2.1-blkid_topology_get_physical_sector_size.patch
+Patch2: parted-2.1-mem-leak-fixes-rh556012.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: e2fsprogs-devel
@@ -53,6 +54,7 @@ Parted library, you need to install this
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
iconv -f ISO-8859-1 -t UTF8 AUTHORS > tmp; touch -r AUTHORS tmp; mv tmp AUTHORS
@@ -87,6 +89,11 @@ popd
%find_lang %{name}
+%check
+export LD_LIBRARY_PATH=$(pwd)/libparted/.libs
+make check
+
+
%clean
%{__rm} -rf %{buildroot}
@@ -123,6 +130,10 @@ fi
%changelog
+* Sun Jan 17 2010 Hans de Goede <hdegoede at redhat.com> 2.1-2
+- Fix various memory leaks in error paths (#556012)
+- Add %%check section to the specfile, invoking make check
+
* Mon Jan 11 2010 Hans de Goede <hdegoede at redhat.com> 2.1-1
- New upstream release 2.1
- Drop all our patches (all merged upstream)
More information about the scm-commits
mailing list