1 From 02178bf3980410abdd57c9f1045ff27bc4f11d7e Mon Sep 17 00:00:00 2001
2 From: "Brian C. Lane" <bcl@redhat.com>
3 Date: Mon, 11 Apr 2016 15:10:51 -0700
4 Subject: [PATCH 36/36] libparted: Remove fdasd geometry code from
5 alloc_metadata (#1244833)
7 commit db20944f changed how the trailing_metadata_end is calculated in
8 dasd_alloc_metadata, removing the need for setting up the anchor struct.
9 But dasd_alloc_metadata can be called in various contexts, and the
10 arch_specific->fd may or may not be valid during these calls. This can
11 result in unpredictable crashes when it uses a stale fd and tries to run
12 the file image code in fdasd_get_geometry instead of the device code.
14 The solution is to just drop the unneeded code, and to remember that
15 arch_specific->fd should only be used when ped_device_open has first
18 Resolves: rhbz#1244833
19 (cherry picked from commit 9da2f460bebf9a8281fdd52536d3676b0914b8fd)
21 libparted/labels/dasd.c | 4 ----
22 1 file changed, 4 deletions(-)
24 diff --git a/libparted/labels/dasd.c b/libparted/labels/dasd.c
25 index bb32d66..f79a867 100644
26 --- a/libparted/labels/dasd.c
27 +++ b/libparted/labels/dasd.c
28 @@ -948,7 +948,6 @@ dasd_alloc_metadata (PedDisk* disk)
29 PedPartition* part = NULL; /* initialize solely to placate gcc */
30 PedPartition* new_part2;
31 PedSector trailing_meta_start, trailing_meta_end;
32 - struct fdasd_anchor anchor;
34 PED_ASSERT (disk != NULL);
35 PED_ASSERT (disk->dev != NULL);
36 @@ -998,10 +997,7 @@ dasd_alloc_metadata (PedDisk* disk)
37 backed up, then restored to a larger size disk, etc.
39 trailing_meta_start = part->geom.end + 1;
40 - fdasd_initialize_anchor(&anchor);
41 - fdasd_get_geometry(disk->dev, &anchor, arch_specific->fd);
42 trailing_meta_end = (long long) disk->dev->length - 1;
43 - fdasd_cleanup(&anchor);
44 if (trailing_meta_end >= trailing_meta_start) {
45 new_part2 = ped_partition_new (disk,PED_PARTITION_METADATA,
46 NULL, trailing_meta_start, trailing_meta_end);