linux-kernel - [ 50/52] 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: <20121004210641.663297238@linuxfoundation.org>
Date:	Thu,  4 Oct 2012 14:21:41 -0700
From:	Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To:	linux-kernel@...r.kernel.org, stable@...r.kernel.org
Cc:	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	alan@...rguk.ukuu.org.uk, Tomas Racek <tracek@...hat.com>,
	Avi Kivity <avi@...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>, Ben Jencks <ben@...ncks.net>,
	qemu-devel@...gnu.org
Subject: [ 50/52] x86/alternatives: Fix p6 nops on non-modular kernels

3.4-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>
Cc: Ben Jencks <ben@...ncks.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>

---
 arch/x86/kernel/alternative.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -160,7 +160,7 @@ static const unsigned char * const k7_no
 #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/