diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-02-19 13:32:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-19 13:32:42 +0100 |
| commit | 1fbe23e0dea54e30f39f26ae90150ea7ebb48f79 (patch) | |
| tree | a84deaf377b40a2f047e1ee2b8b3f3ea78c8b030 /arch/x86/kernel/cpu/microcode/intel.c | |
| parent | a267b0a349bb021c010e36a2a13e1e16657b1b0f (diff) | |
| parent | 35a9ff4eec7a1725ac4364972fc6c156e4feedd0 (diff) | |
| download | linux-1fbe23e0dea54e30f39f26ae90150ea7ebb48f79.tar.bz2 | |
Merge tag 'microcode_fixes_for-3.21' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/urgent
Pull microcode fixes from Borislav Petkov:
- Two fixes hardening microcode data handling. (Quentin Casasnovas)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/microcode/intel.c')
| -rw-r--r-- | arch/x86/kernel/cpu/microcode/intel.c | 5 |
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; |