linux-kernel - [tip:x86/pti] x86/alternatives: Fixup alternative_call

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] [day] [month] [year] [list]

Message-ID: <tip-bd6271039ee6f0c9b468148fc2d73e0584af6b4f@git.kernel.org>
Date:   Tue, 27 Mar 2018 00:51:53 -0700
From:   tip-bot for Alexey Dobriyan <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     adobriyan@...il.com, bp@...e.de, mingo@...nel.org,
        tglx@...utronix.de, hpa@...or.com, linux-kernel@...r.kernel.org
Subject: [tip:x86/pti] x86/alternatives: Fixup alternative_call_2

Commit-ID:  bd6271039ee6f0c9b468148fc2d73e0584af6b4f
Gitweb:     https://git.kernel.org/tip/bd6271039ee6f0c9b468148fc2d73e0584af6b4f
Author:     Alexey Dobriyan <adobriyan@...il.com>
AuthorDate: Sun, 14 Jan 2018 15:05:04 +0300
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Tue, 27 Mar 2018 09:47:53 +0200

x86/alternatives: Fixup alternative_call_2

The following pattern fails to compile while the same pattern
with alternative_call() does:

	if (...)
		alternative_call_2(...);
	else
		alternative_call_2(...);

as it expands into

	if (...)
	{
	};	<===
	else
	{
	};

Signed-off-by: Alexey Dobriyan <adobriyan@...il.com>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Acked-by: Borislav Petkov <bp@...e.de>
Link: https://lkml.kernel.org/r/20180114120504.GA11368@avx2

---
 arch/x86/include/asm/alternative.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
index cf5961ca8677..4cd6a3b71824 100644
--- a/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
@@ -218,13 +218,11 @@ static inline int alternatives_text_reserved(void *start, void *end)
  */
 #define alternative_call_2(oldfunc, newfunc1, feature1, newfunc2, feature2,   \
 			   output, input...)				      \
-{									      \
 	asm volatile (ALTERNATIVE_2("call %P[old]", "call %P[new1]", feature1,\
 		"call %P[new2]", feature2)				      \
 		: output, ASM_CALL_CONSTRAINT				      \
 		: [old] "i" (oldfunc), [new1] "i" (newfunc1),		      \
-		  [new2] "i" (newfunc2), ## input);			      \
-}
+		  [new2] "i" (newfunc2), ## input)
 
 /*
  * use this macro(s) if you need more than one output parameter