Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df91c351 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge tag 'efi-urgent' into x86/urgent 



 * Don't leak random kernel memory to EFI variable NVRAM when attempting
   to initiate garbage collection. Also, free the kernel memory when
   we're done with it instead of leaking - Ben Hutchings

Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parents b52e0a7c b8cb62f8

arch/x86/platform/efi/efi.c

+6 −1
Original line number Diff line number Diff line
@@ -1069,7 +1069,10 @@ efi_status_t efi_query_variable_store(u32 attributes, unsigned long size) 
		 * that by attempting to use more space than is available.

		 */

		unsigned long dummy_size = remaining_size + 1024;

		void *dummy = kmalloc(dummy_size, GFP_ATOMIC);

		void *dummy = kzalloc(dummy_size, GFP_ATOMIC);



		if (!dummy)

			return EFI_OUT_OF_RESOURCES;



		status = efi.set_variable(efi_dummy_name, &EFI_DUMMY_GUID,

					  EFI_VARIABLE_NON_VOLATILE |
@@ -1089,6 +1092,8 @@ efi_status_t efi_query_variable_store(u32 attributes, unsigned long size) 
					 0, dummy);

		}



		kfree(dummy);



		/*

		 * The runtime code may now have triggered a garbage collection

		 * run, so check the variable info again