android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/microcode/AMD: Make find_proper_container() sane again

Browse Source 
Fixup signature and retvals, return the container struct through the
passed in pointer, not as a function return value.

Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Jürgen Gross <jgross@suse.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Link: http://lkml.kernel.org/r/20161218164414.9649-2-bp@alien8.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Borislav Petkov 2016-12-18 17:44:11 +01:00 committed by Thomas Gleixner
parent b0b3a37b90
commit 8feaa64a9a
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/x86/kernel/cpu/microcode/amd.c
View File

@ -116,10 +116,11 @@ static inline u16 find_equiv_id(struct equiv_cpu_entry *equiv_cpu_table,
/* /*
* This scans the ucode blob for the proper container as we can have multiple * This scans the ucode blob for the proper container as we can have multiple
* containers glued together. * containers glued together. Returns the equivalence ID from the equivalence
* table or 0 if none found.
*/ */
static struct container static u16
find_proper_container(u8 *ucode, size_t size, u16 *ret_id) find_proper_container(u8 *ucode, size_t size, struct container *ret_cont)
{ {
struct container ret = { NULL, 0 }; struct container ret = { NULL, 0 };
u32 eax, ebx, ecx, edx; u32 eax, ebx, ecx, edx;
@ -138,7 +139,7 @@ find_proper_container(u8 *ucode, size_t size, u16 *ret_id)
if (header[0] != UCODE_MAGIC || if (header[0] != UCODE_MAGIC ||
header[1] != UCODE_EQUIV_CPU_TABLE_TYPE || /* type */ header[1] != UCODE_EQUIV_CPU_TABLE_TYPE || /* type */
header[2] == 0) /* size */ header[2] == 0) /* size */
return ret; return eq_id;
eax = 0x00000001; eax = 0x00000001;
ecx = 0; ecx = 0;
@ -163,8 +164,9 @@ find_proper_container(u8 *ucode, size_t size, u16 *ret_id)
* ucode update loop below * ucode update loop below
*/ */
left = ret.size - offset; left = ret.size - offset;
*ret_id = eq_id;
return ret; *ret_cont = ret;
return eq_id;
} }
/* /*
@ -189,7 +191,7 @@ find_proper_container(u8 *ucode, size_t size, u16 *ret_id)
ucode = data; ucode = data;
} }
return ret; return eq_id;
} }
static int __apply_microcode_amd(struct microcode_amd *mc_amd) static int __apply_microcode_amd(struct microcode_amd *mc_amd)
@ -237,7 +239,7 @@ apply_microcode_early_amd(void *ucode, size_t size, bool save_patch)
if (check_current_patch_level(&rev, true)) if (check_current_patch_level(&rev, true))
return (struct container){ NULL, 0 }; return (struct container){ NULL, 0 };
ret = find_proper_container(ucode, size, &eq_id); eq_id = find_proper_container(ucode, size, &ret);
if (!eq_id) if (!eq_id)
return (struct container){ NULL, 0 }; return (struct container){ NULL, 0 };
@ -443,7 +445,7 @@ int __init save_microcode_in_initrd_amd(unsigned int fam)
return -EINVAL; return -EINVAL;
} }
cont = find_proper_container(cp.data, cp.size, &eq_id); eq_id = find_proper_container(cp.data, cp.size, &cont);
if (!eq_id) { if (!eq_id) {
cont.size = -1; cont.size = -1;
return -EINVAL; return -EINVAL;