linux-kernel - [tip:x86/pti] x86/alternatives: Fix optimize

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-612e8e9350fd19cae6900cf36ea0c6892d1a0dca@git.kernel.org>
Date:   Wed, 10 Jan 2018 10:39:50 -0800
From:   tip-bot for Borislav Petkov <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     ak@...ux.intel.com, tglx@...utronix.de, dave.hansen@...el.com,
        andi@...stfloor.org, dwmw2@...radead.org, hpa@...or.com,
        peterz@...radead.org, gregkh@...ux-foundation.org,
        tim.c.chen@...ux.intel.com, linux-kernel@...r.kernel.org,
        jikos@...nel.org, mingo@...nel.org, bp@...e.de, pjt@...gle.com,
        torvalds@...ux-foundation.org, thomas.lendacky@....com,
        luto@...nel.org
Subject: [tip:x86/pti] x86/alternatives: Fix optimize_nops() checking

Commit-ID:  612e8e9350fd19cae6900cf36ea0c6892d1a0dca
Gitweb:     https://git.kernel.org/tip/612e8e9350fd19cae6900cf36ea0c6892d1a0dca
Author:     Borislav Petkov <bp@...e.de>
AuthorDate: Wed, 10 Jan 2018 12:28:16 +0100
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Wed, 10 Jan 2018 19:36:22 +0100

x86/alternatives: Fix optimize_nops() checking

The alternatives code checks only the first byte whether it is a NOP, but
with NOPs in front of the payload and having actual instructions after it
breaks the "optimized' test.

Make sure to scan all bytes before deciding to optimize the NOPs in there.

Reported-by: David Woodhouse <dwmw2@...radead.org>
Signed-off-by: Borislav Petkov <bp@...e.de>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Cc: Tom Lendacky <thomas.lendacky@....com>
Cc: Andi Kleen <ak@...ux.intel.com>
Cc: Tim Chen <tim.c.chen@...ux.intel.com>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Jiri Kosina <jikos@...nel.org>
Cc: Dave Hansen <dave.hansen@...el.com>
Cc: Andi Kleen <andi@...stfloor.org>
Cc: Andrew Lutomirski <luto@...nel.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Greg Kroah-Hartman <gregkh@...ux-foundation.org>
Cc: Paul Turner <pjt@...gle.com>
Link: https://lkml.kernel.org/r/20180110112815.mgciyf5acwacphkq@pd.tnic

---
 arch/x86/kernel/alternative.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index 3344d33..e0b97e4 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -344,9 +344,12 @@ done:
 static void __init_or_module noinline optimize_nops(struct alt_instr *a, u8 *instr)
 {
 	unsigned long flags;
+	int i;
 
-	if (instr[0] != 0x90)
-		return;
+	for (i = 0; i < a->padlen; i++) {
+		if (instr[i] != 0x90)
+			return;
+	}
 
 	local_irq_save(flags);
 	add_nops(instr + (a->instrlen - a->padlen), a->padlen);