Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FREELDR] xboxmem: Fix array out-of-bounds access (#1775)

Browse source 
Memory map array should be large enough to fit additional descriptors.

CORE-16216 CORE-16267
This commit is contained in:
Stanislav Motylkov 2019-08-07 13:06:37 +03:00 committed by Hermès BÉLUSCA - MAÏTO
parent 10c08e1d62
commit 2811d2f990
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot/freeldr/freeldr/arch/i386/pcmem.c
View file

@ -35,8 +35,6 @@ DBG_DEFAULT_CHANNEL(MEMORY);
#define ULONGLONG_ALIGN_UP_BY(size, align) \ #define ULONGLONG_ALIGN_UP_BY(size, align) \
(ULONGLONG_ALIGN_DOWN_BY(((ULONGLONG)(size) + align - 1), align)) (ULONGLONG_ALIGN_DOWN_BY(((ULONGLONG)(size) + align - 1), align))
#define MAX_BIOS_DESCRIPTORS 80ul
BIOS_MEMORY_MAP PcBiosMemoryMap[MAX_BIOS_DESCRIPTORS]; BIOS_MEMORY_MAP PcBiosMemoryMap[MAX_BIOS_DESCRIPTORS];
ULONG PcBiosMapCount; ULONG PcBiosMapCount;

3
boot/freeldr/freeldr/arch/i386/xboxmem.c
View file

@ -89,12 +89,13 @@ XboxMemInit(VOID)
AvailableMemoryMb = InstalledMemoryMb; AvailableMemoryMb = InstalledMemoryMb;
} }
FREELDR_MEMORY_DESCRIPTOR XboxMemoryMap[2]; FREELDR_MEMORY_DESCRIPTOR XboxMemoryMap[MAX_BIOS_DESCRIPTORS + 1];
PFREELDR_MEMORY_DESCRIPTOR PFREELDR_MEMORY_DESCRIPTOR
XboxMemGetMemoryMap(ULONG *MemoryMapSize) XboxMemGetMemoryMap(ULONG *MemoryMapSize)
{ {
TRACE("XboxMemGetMemoryMap()\n"); TRACE("XboxMemGetMemoryMap()\n");
/* FIXME: Obtain memory map via multiboot spec */
/* Synthesize memory map */ /* Synthesize memory map */

2
boot/freeldr/freeldr/include/arch/pc/pcbios.h
View file

@ -3,6 +3,8 @@
#ifndef __ASM__ #ifndef __ASM__
#define MAX_BIOS_DESCRIPTORS 80
typedef enum typedef enum
{ {
// ACPI 1.0. // ACPI 1.0.