From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932180AbcCHIOW (ORCPT ); Tue, 8 Mar 2016 03:14:22 -0500 Received: from torg.zytor.com ([198.137.202.12]:40682 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932366AbcCHION (ORCPT ); Tue, 8 Mar 2016 03:14:13 -0500 Date: Tue, 8 Mar 2016 00:14:01 -0800 From: tip-bot for Borislav Petkov Message-ID: Cc: linux-kernel@vger.kernel.org, bp@suse.de, tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org Reply-To: tglx@linutronix.de, hpa@zytor.com, bp@suse.de, linux-kernel@vger.kernel.org, mingo@kernel.org In-Reply-To: <1457345404-28884-6-git-send-email-bp@alien8.de> References: <1457345404-28884-6-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/microcode] x86/microcode/intel: Drop orig_sum from ext signature checksum Git-Commit-ID: 4ace2e7a48ab426eaa9745ace4c50c6a7adb3992 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 4ace2e7a48ab426eaa9745ace4c50c6a7adb3992 Gitweb: http://git.kernel.org/tip/4ace2e7a48ab426eaa9745ace4c50c6a7adb3992 Author: Borislav Petkov AuthorDate: Mon, 7 Mar 2016 11:10:04 +0100 Committer: Thomas Gleixner CommitDate: Tue, 8 Mar 2016 09:08:45 +0100 x86/microcode/intel: Drop orig_sum from ext signature checksum It is 0 because for !0 values we would have exited already. Signed-off-by: Borislav Petkov Link: http://lkml.kernel.org/r/1457345404-28884-6-git-send-email-bp@alien8.de Signed-off-by: Thomas Gleixner --- arch/x86/kernel/cpu/microcode/intel_lib.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/cpu/microcode/intel_lib.c b/arch/x86/kernel/cpu/microcode/intel_lib.c index 23b1d92..2ce1a7d 100644 --- a/arch/x86/kernel/cpu/microcode/intel_lib.c +++ b/arch/x86/kernel/cpu/microcode/intel_lib.c @@ -130,9 +130,9 @@ int microcode_sanity_check(void *mc, int print_err) for (i = 0; i < ext_sigcount; i++) { ext_sig = (void *)ext_header + EXT_HEADER_SIZE + EXT_SIGNATURE_SIZE * i; - sum = orig_sum - - (mc_header->sig + mc_header->pf + mc_header->cksum) - + (ext_sig->sig + ext_sig->pf + ext_sig->cksum); + + sum = (mc_header->sig + mc_header->pf + mc_header->cksum) - + (ext_sig->sig + ext_sig->pf + ext_sig->cksum); if (sum) { if (print_err) pr_err("Bad extended signature checksum, aborting.\n");