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

Commit 140f74fc authored by Borislav Petkov's avatar Borislav Petkov
Browse files

x86/microcode/intel: Sanitize microcode_pointer() 



Shorten variable names and rename it to what it does.

No functionality change.

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

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

+9 −14
Original line number Original line Diff line number Diff line
@@ -66,16 +66,14 @@ load_microcode_early(struct microcode_intel **saved, 
	return UCODE_OK;

	return UCODE_OK;

}

}





static void

static inline void

microcode_pointer(struct microcode_intel **mc_saved,

copy_initrd_ptrs(struct microcode_intel **mc_saved, unsigned long *initrd,

		  unsigned long *mc_saved_in_initrd,

		  unsigned long off, int num_saved)

		  unsigned long initrd_start, int mc_saved_count)

{

{

	int i;

	int i;





	for (i = 0; i < mc_saved_count; i++)

	for (i = 0; i < num_saved; i++)

		mc_saved[i] = (struct microcode_intel *)

		mc_saved[i] = (struct microcode_intel *)(initrd[i] + off);

			      (mc_saved_in_initrd[i] + initrd_start);

}

}





#ifdef CONFIG_X86_32

#ifdef CONFIG_X86_32
@@ -99,17 +97,14 @@ microcode_phys(struct microcode_intel **mc_saved_tmp, 
#endif

#endif





static enum ucode_state

static enum ucode_state

load_microcode(struct mc_saved_data *mc_saved_data,

load_microcode(struct mc_saved_data *mc_saved_data, unsigned long *initrd,

	       unsigned long *mc_saved_in_initrd,

	       unsigned long initrd_start, struct ucode_cpu_info *uci)

	       unsigned long initrd_start,

	       struct ucode_cpu_info *uci)

{

{

	struct microcode_intel *mc_saved_tmp[MAX_UCODE_COUNT];

	struct microcode_intel *mc_saved_tmp[MAX_UCODE_COUNT];

	unsigned int count = mc_saved_data->mc_saved_count;

	unsigned int count = mc_saved_data->mc_saved_count;





	if (!mc_saved_data->mc_saved) {

	if (!mc_saved_data->mc_saved) {

		microcode_pointer(mc_saved_tmp, mc_saved_in_initrd,

		copy_initrd_ptrs(mc_saved_tmp, initrd, initrd_start, count);

				  initrd_start, count);





		return load_microcode_early(mc_saved_tmp, count, uci);

		return load_microcode_early(mc_saved_tmp, count, uci);

	} else {

	} else {
@@ -672,7 +667,7 @@ int __init save_microcode_in_initrd_intel(void) 
	if (count == 0)

	if (count == 0)

		return ret;

		return ret;





	microcode_pointer(mc_saved, mc_saved_in_initrd, initrd_start, count);

	copy_initrd_ptrs(mc_saved, mc_saved_in_initrd, initrd_start, count);

	ret = save_microcode(&mc_saved_data, mc_saved, count);

	ret = save_microcode(&mc_saved_data, mc_saved, count);

	if (ret)

	if (ret)

		pr_err("Cannot save microcode patches from initrd.\n");

		pr_err("Cannot save microcode patches from initrd.\n");