Aren/rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

part: Fix bug where an improper buffer size was allocated when indexing all partitions

Browse Source
This commit is contained in:
mintsuki 2021-02-08 18:52:57 +01:00
parent 8c76a0f406
commit 5ed2c2203a
4 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
limine-pxe.bin
View File

Binary file not shown.

BIN
limine.bin
View File

Binary file not shown.

BIN
stage2.map
View File

Binary file not shown.

43
stage2/lib/part.c
View File

@ -232,6 +232,8 @@ static struct part *part_index = NULL;
static size_t part_index_i = 0;
void part_create_index(void) {
size_t part_count = 0;
for (uint8_t drive = 0x80; drive < 0x8f; drive++) {
struct rm_regs r = {0};
struct bios_drive_params drive_params;
@ -252,29 +254,48 @@ void part_create_index(void) {
print(" ... %X total %u-byte sectors\n",
drive_params.lba_count, drive_params.bytes_per_sect);
size_t part_count = 0;
load_up:
for (int part = 0; ; part++) {
struct part p;
int ret = part_get(&p, drive, part);
if (ret == END_OF_TABLE)
if (ret == END_OF_TABLE || ret == INVALID_TABLE)
break;
if (ret == NO_PARTITION)
continue;
if (part_index)
part_index[part_index_i++] = p;
else
part_count++;
}
if (part_index)
return;
}
part_index = ext_mem_alloc(sizeof(struct part) * part_count);
goto load_up;
for (uint8_t drive = 0x80; drive < 0x8f; drive++) {
struct rm_regs r = {0};
struct bios_drive_params drive_params;
r.eax = 0x4800;
r.edx = drive;
r.ds = rm_seg(&drive_params);
r.esi = rm_off(&drive_params);
drive_params.buf_size = sizeof(struct bios_drive_params);
rm_int(0x13, &r, &r);
if (r.eflags & EFLAGS_CF)
continue;
for (int part = 0; ; part++) {
struct part p;
int ret = part_get(&p, drive, part);
if (ret == END_OF_TABLE || ret == INVALID_TABLE)
break;
if (ret == NO_PARTITION)
continue;
part_index[part_index_i++] = p;
}
}
}