linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: tip-bot for Borislav Petkov <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, mingo@kernel.org,
	tglx@linutronix.de, hpa@zytor.com, bp@suse.de
Subject: [tip:x86/microcode] x86/microcode/intel: Merge two consecutive if-statements
Date: Tue, 8 Mar 2016 00:13:20 -0800	[thread overview]
Message-ID: <tip-7d0161569a3b66aaa01520002c3e5fd7126d071f@git.kernel.org> (raw)
In-Reply-To: <1457345404-28884-4-git-send-email-bp@alien8.de>

Commit-ID:  7d0161569a3b66aaa01520002c3e5fd7126d071f
Gitweb:     http://git.kernel.org/tip/7d0161569a3b66aaa01520002c3e5fd7126d071f
Author:     Borislav Petkov <bp@suse.de>
AuthorDate: Mon, 7 Mar 2016 11:10:02 +0100
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Tue, 8 Mar 2016 09:08:45 +0100

x86/microcode/intel: Merge two consecutive if-statements

Merge the two consecutive "if (ext_table_size)". No functional change.

Signed-off-by: Borislav Petkov <bp@suse.de>
Link: http://lkml.kernel.org/r/1457345404-28884-4-git-send-email-bp@alien8.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/x86/kernel/cpu/microcode/intel_lib.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/x86/kernel/cpu/microcode/intel_lib.c b/arch/x86/kernel/cpu/microcode/intel_lib.c
index 2b2d135..ffb1bbf 100644
--- a/arch/x86/kernel/cpu/microcode/intel_lib.c
+++ b/arch/x86/kernel/cpu/microcode/intel_lib.c
@@ -68,6 +68,9 @@ int microcode_sanity_check(void *mc, int print_err)
 	}
 	ext_table_size = total_size - (MC_HEADER_SIZE + data_size);
 	if (ext_table_size) {
+		u32 ext_table_sum = 0;
+		u32 *ext_tablep;
+
 		if ((ext_table_size < EXT_HEADER_SIZE)
 		 || ((ext_table_size - EXT_HEADER_SIZE) % EXT_SIGNATURE_SIZE)) {
 			if (print_err)
@@ -81,12 +84,9 @@ int microcode_sanity_check(void *mc, int print_err)
 			return -EFAULT;
 		}
 		ext_sigcount = ext_header->count;
-	}
 
-	/* check extended table checksum */
-	if (ext_table_size) {
-		u32 ext_table_sum = 0;
-		u32 *ext_tablep = (u32 *)ext_header;
+		/* check extended table checksum */
+		ext_tablep = (u32 *)ext_header;
 
 		i = ext_table_size / sizeof(u32);
 		while (i--)

  reply	other threads:[~2016-03-08  8:13 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-07 10:09 [PATCH 0/5] x86/microcode/intel: Microcode verification cleanups Borislav Petkov
2016-03-07 10:10 ` [PATCH 1/5] x86/microcode/intel: Change checksum variables to u32 Borislav Petkov
2016-03-07 10:10 ` [PATCH 2/5] x86/microcode/intel: Get rid of DWSIZE Borislav Petkov
2016-03-08  8:12   ` [tip:x86/microcode] " tip-bot for Borislav Petkov
2016-03-07 10:10 ` [PATCH 3/5] x86/microcode/intel: Merge two consecutive if-statements Borislav Petkov
2016-03-08  8:13   ` tip-bot for Borislav Petkov [this message]
2016-03-07 10:10 ` [PATCH 4/5] x86/microcode/intel: Improve microcode sanity-checking error messages Borislav Petkov
2016-03-08  8:13   ` [tip:x86/microcode] " tip-bot for Borislav Petkov
2016-03-07 10:10 ` [PATCH 5/5] x86/microcode/intel: Drop orig_sum from ext signature checksum Borislav Petkov
2016-03-08  8:14   ` [tip:x86/microcode] " tip-bot for Borislav Petkov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-7d0161569a3b66aaa01520002c3e5fd7126d071f@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=bp@suse.de \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).