Commit d6d0f36c authored Jul 28, 2020 by Arvind Sankar Committed by Ingo Molnar Jul 31, 2020

x86/kaslr: Make the type of number of slots/slot areas consistent

The number of slots can be 'unsigned int', since on 64-bit, the maximum
amount of memory is 2^52, the minimum alignment is 2^21, so the slot
number cannot be greater than 2^31. But in case future processors have
more than 52 physical address bits, make it 'unsigned long'.

The slot areas are limited by MAX_SLOT_AREA, currently 100. It is
indexed by an int, but the number of areas is stored as 'unsigned long'.
Change both to 'unsigned int' for consistency.

Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20200728225722.67457-15-nivedita@alum.mit.edu

parent 3870d971

arch/x86/boot/compressed/kaslr.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -508,17 +508,15 @@ static bool mem_avoid_overlap(struct mem_vector *img,

		struct slot_area {
		unsigned long addr;
		int num;
		unsigned long num;
		};

		#define MAX_SLOT_AREA 100

		static struct slot_area slot_areas[MAX_SLOT_AREA];

		static unsigned int slot_area_index;
		static unsigned long slot_max;

		static unsigned long slot_area_index;

		static void store_slot_info(struct mem_vector *region, unsigned long image_size)
		{
		struct slot_area slot_area;
		@@ -588,7 +586,7 @@ process_gb_huge_pages(struct mem_vector *region, unsigned long image_size)
		static unsigned long slots_fetch_random(void)
		{
		unsigned long slot;
		int i;
		unsigned int i;

		/* Handle case of no slots stored. */
		if (slot_max == 0)

Admin message