diff options
author | Borislav Petkov <borislav.petkov@amd.com> | 2011-02-22 12:41:48 -0500 |
---|---|---|
committer | Borislav Petkov <borislav.petkov@amd.com> | 2011-06-15 09:13:49 -0400 |
commit | 86b445676d13f520ef9ab7aebe933aa6684ce84c (patch) | |
tree | 2ddc317f83becf24330065bf0b3468a2b6bee2e7 /arch/x86/kernel/microcode_amd.c | |
parent | 2c53b436a30867eb6b47dd7bab23ba638d1fb0d2 (diff) |
x86, microcode, AMD: Correct buf references
Both the equivalence table and the microcode patch types are u32. Access
them properly through the buf-ptr.
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Diffstat (limited to 'arch/x86/kernel/microcode_amd.c')
-rw-r--r-- | arch/x86/kernel/microcode_amd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c index c5610384ab16..d30d67cd33ad 100644 --- a/arch/x86/kernel/microcode_amd.c +++ b/arch/x86/kernel/microcode_amd.c | |||
@@ -157,7 +157,7 @@ static int apply_microcode_amd(int cpu) | |||
157 | static unsigned int verify_ucode_size(int cpu, const u8 *buf, unsigned int size) | 157 | static unsigned int verify_ucode_size(int cpu, const u8 *buf, unsigned int size) |
158 | { | 158 | { |
159 | struct cpuinfo_x86 *c = &cpu_data(cpu); | 159 | struct cpuinfo_x86 *c = &cpu_data(cpu); |
160 | unsigned int max_size, actual_size; | 160 | u32 max_size, actual_size; |
161 | 161 | ||
162 | #define F1XH_MPB_MAX_SIZE 2048 | 162 | #define F1XH_MPB_MAX_SIZE 2048 |
163 | #define F14H_MPB_MAX_SIZE 1824 | 163 | #define F14H_MPB_MAX_SIZE 1824 |
@@ -175,7 +175,7 @@ static unsigned int verify_ucode_size(int cpu, const u8 *buf, unsigned int size) | |||
175 | break; | 175 | break; |
176 | } | 176 | } |
177 | 177 | ||
178 | actual_size = buf[4] + (buf[5] << 8); | 178 | actual_size = *(u32 *)(buf + 4); |
179 | 179 | ||
180 | if (actual_size > size || actual_size > max_size) { | 180 | if (actual_size > size || actual_size > max_size) { |
181 | pr_err("section size mismatch\n"); | 181 | pr_err("section size mismatch\n"); |
@@ -191,7 +191,7 @@ get_next_ucode(int cpu, const u8 *buf, unsigned int size, unsigned int *mc_size) | |||
191 | struct microcode_header_amd *mc = NULL; | 191 | struct microcode_header_amd *mc = NULL; |
192 | unsigned int actual_size = 0; | 192 | unsigned int actual_size = 0; |
193 | 193 | ||
194 | if (buf[0] != UCODE_UCODE_TYPE) { | 194 | if (*(u32 *)buf != UCODE_UCODE_TYPE) { |
195 | pr_err("invalid type field in container file section header\n"); | 195 | pr_err("invalid type field in container file section header\n"); |
196 | goto out; | 196 | goto out; |
197 | } | 197 | } |