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

Commit 776d3cdc authored by Borislav Petkov's avatar Borislav Petkov
Browse files

x86/microcode/intel: Check if microcode was found before applying 



We should check the return value of the routines fishing out the proper
microcode and not try to apply if we haven't found a suitable blob.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parent d496a002

arch/x86/kernel/cpu/microcode/intel_early.c

+10 −4
Original line number Diff line number Diff line
@@ -727,8 +727,9 @@ _load_ucode_intel_bsp(struct mc_saved_data *mc_saved_data, 


	ret = load_microcode(mc_saved_data, mc_saved_in_initrd,

			     initrd_start_early, uci);

	if (ret != UCODE_OK)

		return;



	if (ret == UCODE_OK)

	apply_microcode_early(uci, true);

}
@@ -769,6 +770,7 @@ void load_ucode_intel_ap(void) 
	struct ucode_cpu_info uci;

	unsigned long *mc_saved_in_initrd_p;

	unsigned long initrd_start_addr;

	enum ucode_state ret;

#ifdef CONFIG_X86_32

	unsigned long *initrd_start_p;
@@ -791,8 +793,12 @@ void load_ucode_intel_ap(void) 
		return;



	collect_cpu_info_early(&uci);

	load_microcode(mc_saved_data_p, mc_saved_in_initrd_p,

	ret = load_microcode(mc_saved_data_p, mc_saved_in_initrd_p,

			     initrd_start_addr, &uci);



	if (ret != UCODE_OK)

		return;



	apply_microcode_early(&uci, true);

}