From patchwork Thu Oct 4 21:21:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 189335 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2198A2C03D0 for ; Fri, 5 Oct 2012 07:26:09 +1000 (EST) Received: from localhost ([::1]:58381 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJsvn-0004rC-7j for incoming@patchwork.ozlabs.org; Thu, 04 Oct 2012 17:26:07 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56699) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJsvf-0004qA-43 for qemu-devel@nongnu.org; Thu, 04 Oct 2012 17:26:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TJsvd-0002d8-2q for qemu-devel@nongnu.org; Thu, 04 Oct 2012 17:25:59 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:43625) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJsvc-0002d4-Ns for qemu-devel@nongnu.org; Thu, 04 Oct 2012 17:25:56 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp2so999838pbb.4 for ; Thu, 04 Oct 2012 14:25:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :user-agent:x-gm-message-state; bh=UJDm5WvQzdWbOfrYyRVrGQm1bkCOhNhI9rgDR1U4R/Q=; b=DiNjys2gQIBCuZGHrV5EdAVr3f4tPH2JuNmfKQzOemdotqn7J3DVl9TIxn48ml3DrP 5z0+mCwljL/zWQLHsbsCotx1DvXcOMANCfHZyb8eVrbuXbENTKiivWxa3GLnMg75vL4P 4jiUWCQNgNpPW8BcT1WH2RAt4GTB6gtwTXK/PhwHCsJ4ZgQV/ijTVn2Yay8ZDK7KL7SJ yUhbtZIGxuYeOKlVkOXRUCQcEnNm7lbti07UKuGLQ04HvdgRTUH71pArq5rJL1LugRzO uV+6s5Pe3MrsDheW4MI8F4I9ZS1ti0JB4UGw2306v79gG/9yO5EK8Sy/elFWUl8Z0Sby HEHA== Received: by 10.66.82.101 with SMTP id h5mr16472141pay.15.1349385955802; Thu, 04 Oct 2012 14:25:55 -0700 (PDT) Received: from localhost (c-67-168-183-230.hsd1.wa.comcast.net. [67.168.183.230]) by mx.google.com with ESMTPS id ps2sm4898187pbb.0.2012.10.04.14.25.53 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 04 Oct 2012 14:25:54 -0700 (PDT) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Date: Thu, 4 Oct 2012 14:21:41 -0700 Message-Id: <20121004210641.663297238@linuxfoundation.org> X-Mailer: git-send-email 1.7.12.2.421.g261b511 In-Reply-To: <20121004210635.372689554@linuxfoundation.org> References: <20121004210635.372689554@linuxfoundation.org> User-Agent: quilt/0.60-2.1.2 X-Gm-Message-State: ALoCoQl8RhsrLW/OE5zQnaxw2L8I+7iO0xrpP9KTNAiL1zZDr+oUGUDyQlts3iHu1W0LziQRHQF4 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: Greg Kroah-Hartman , Marcelo Tosatti , Michael Tokarev , Borislav Petkov , Tomas Racek , qemu-devel@nongnu.org, Avi Kivity , Anthony Liguori , "H. Peter Anvin" , Ben Jencks , Ingo Molnar , alan@lxorguk.ukuu.org.uk, Alan Cox Subject: [Qemu-devel] [ 50/52] x86/alternatives: Fix p6 nops on non-modular kernels X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 3.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Avi Kivity 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 Signed-off-by: Avi Kivity Cc: Michael Tokarev Cc: Borislav Petkov Cc: Marcelo Tosatti Cc: qemu-devel@nongnu.org Cc: Anthony Liguori Cc: H. Peter Anvin Cc: Alan Cox Cc: Alan Cox Link: http://lkml.kernel.org/r/5034AE84.90708@redhat.com Signed-off-by: Ingo Molnar Cc: Ben Jencks Signed-off-by: Greg Kroah-Hartman --- 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,