aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/kernel/cpu/microcode/intel.c
diff options
context:
space:
mode:
authorChris Zankel <[email protected]>2015-04-14 03:51:35 +0000
committerChris Zankel <[email protected]>2015-04-14 03:51:35 +0000
commit7ead5b7e4a3cf4a16579a8f164022345b93fe972 (patch)
tree0a9b9497f53d1593c9e2ac197b2e686ea74a9975 /arch/x86/kernel/cpu/microcode/intel.c
parent834a316eeebcb75316c0a7d9088fa638c52dc584 (diff)
parent39a8804455fb23f09157341d3ba7db6d7ae6ee76 (diff)
Merge tag 'v4.0' into for_next
Linux 4.0
Diffstat (limited to 'arch/x86/kernel/cpu/microcode/intel.c')
-rw-r--r--arch/x86/kernel/cpu/microcode/intel.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
index c6826d1e8082..746e7fd08aad 100644
--- a/arch/x86/kernel/cpu/microcode/intel.c
+++ b/arch/x86/kernel/cpu/microcode/intel.c
@@ -196,6 +196,11 @@ static enum ucode_state generic_load_microcode(int cpu, void *data, size_t size,
struct microcode_header_intel mc_header;
unsigned int mc_size;
+ if (leftover < sizeof(mc_header)) {
+ pr_err("error! Truncated header in microcode data file\n");
+ break;
+ }
+
if (get_ucode_data(&mc_header, ucode_ptr, sizeof(mc_header)))
break;