Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

image-hd: set the first usable lba correctly #273

Merged
merged 2 commits into from
Nov 29, 2024
Merged

image-hd: set the first usable lba correctly #273

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1cf56c
image-hd: move some helper function to the top of the file
michaelolbrich Nov 8, 2024
1ccb8c3
image-hd: set the first usable lba correctly
michaelolbrich Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 39 additions & 24 deletions image-hd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,26 @@ ct_assert(sizeof(struct gpt_partition_entry) == 128);
#define GPT_PE_FLAG_HIDDEN (1ULL << 62)
#define GPT_PE_FLAG_NO_AUTO (1ULL << 63)

static unsigned long long roundup(unsigned long long value, unsigned long long align)
{
return ((value - 1)/align + 1) * align;
}

static unsigned long long rounddown(unsigned long long value, unsigned long long align)
{
return value - (value % align);
}

static unsigned long long min_ull(unsigned long long x, unsigned long long y)
{
return x < y ? x : y;
}

static unsigned long long max_ull(unsigned long long x, unsigned long long y)
{
return x > y ? x : y;
}

static unsigned long long partition_end(const struct partition *part)
{
return part->offset + part->size;
Expand Down Expand Up @@ -463,7 +483,7 @@ static int hdimage_insert_gpt(struct image *image, struct list_head *partitions)
const char *outfile = imageoutfile(image);
struct gpt_header header;
struct gpt_partition_entry table[GPT_ENTRIES];
unsigned long long smallest_offset = ~0ULL;
unsigned long long smallest_offset = ~0ULL, first_usable_offset = 0;
struct partition *part;
unsigned i, j;
int ret;
Expand Down Expand Up @@ -506,10 +526,25 @@ static int hdimage_insert_gpt(struct image *image, struct list_head *partitions)

i++;
}
if (smallest_offset == ~0ULL)
smallest_offset = hd->gpt_location + (GPT_SECTORS - 1)*512;
header.first_usable_lba = htole64(smallest_offset / 512);
/*
* Find the last non-partition data before the first partition.
* This can be a bootloader or the GPT partition table.
*/
list_for_each_entry(part, partitions, list) {
unsigned long long end;

if (part->in_partition_table)
continue;

/* ignore the backup partition table at the end of the disk */
if (strstr(part->name, "GPT backup"))
continue;

end = part->offset + part->size;
if (end <= smallest_offset && end > first_usable_offset)
first_usable_offset = end;
}
header.first_usable_lba = htole64(roundup(first_usable_offset, 512) / 512);

header.table_crc = htole32(crc32(table, sizeof(table)));

Expand Down Expand Up @@ -659,26 +694,6 @@ static int hdimage_generate(struct image *image)
return 0;
}

static unsigned long long roundup(unsigned long long value, unsigned long long align)
{
return ((value - 1)/align + 1) * align;
}

static unsigned long long rounddown(unsigned long long value, unsigned long long align)
{
return value - (value % align);
}

static unsigned long long min_ull(unsigned long long x, unsigned long long y)
{
return x < y ? x : y;
}

static unsigned long long max_ull(unsigned long long x, unsigned long long y)
{
return x > y ? x : y;
}

static bool image_has_hole_covering(const char *image,
unsigned long long start, unsigned long long end)
{
Expand Down
Loading