linux-kernel - [ 067/108] x86/alternatives: Fix p6 nops on non-modular kernels

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: <20121007225843.966679575@decadent.org.uk>
Date:	Sun, 07 Oct 2012 23:59:41 +0100
From:	Ben Hutchings <ben@...adent.org.uk>
To:	linux-kernel@...r.kernel.org, stable@...r.kernel.org
Cc:	akpm@...ux-foundation.org, alan@...rguk.ukuu.org.uk,
	Avi Kivity <avi@...hat.com>, Tomas Racek <tracek@...hat.com>,
	Michael Tokarev <mjt@....msk.ru>,
	Borislav Petkov <borislav.petkov@....com>,
	Marcelo Tosatti <mtosatti@...hat.com>,
	Anthony Liguori <anthony@...emonkey.ws>,
	"H. Peter Anvin" <hpa@...ux.intel.com>,
	Alan Cox <alan@...ux.intel.com>, Ingo Molnar <mingo@...nel.org>
Subject: [ 067/108] x86/alternatives: Fix p6 nops on non-modular kernels

3.2-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Avi Kivity <avi@...hat.com>

commit cb09cad44f07044d9810f18f6f9a6a6f3771f979 upstream.

Probably a leftover from the early days of self-patching, p6nops
are marked __initconst_or_module, which causes them to be
discarded in a non-modular kernel.  If something later triggers
patching, it will overwrite kernel code with garbage.

Reported-by: Tomas Racek <tracek@...hat.com>
Signed-off-by: Avi Kivity <avi@...hat.com>
Cc: Michael Tokarev <mjt@....msk.ru>
Cc: Borislav Petkov <borislav.petkov@....com>
Cc: Marcelo Tosatti <mtosatti@...hat.com>
Cc: qemu-devel@...gnu.org
Cc: Anthony Liguori <anthony@...emonkey.ws>
Cc: H. Peter Anvin <hpa@...ux.intel.com>
Cc: Alan Cox <alan@...rguk.ukuu.org.uk>
Cc: Alan Cox <alan@...ux.intel.com>
Link: http://lkml.kernel.org/r/5034AE84.90708@redhat.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
Signed-off-by: Ben Hutchings <ben@...adent.org.uk>
---
 arch/x86/kernel/alternative.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index afb7ff7..ced4534 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -165,7 +165,7 @@ static const unsigned char * const k7_nops[ASM_NOP_MAX+2] =
 #endif
 
 #ifdef P6_NOP1
-static const unsigned char  __initconst_or_module p6nops[] =
+static const unsigned char p6nops[] =
 {
 	P6_NOP1,
 	P6_NOP2,


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/