From patchwork Tue Nov 10 12:43:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 38060 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 8A6CDB6F2B for ; Tue, 10 Nov 2009 23:43:42 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.60) (envelope-from ) id 1N7q4M-0005AM-SL; Tue, 10 Nov 2009 12:43:34 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.60) (envelope-from ) id 1N7q4H-000590-6P for kernel-team@lists.ubuntu.com; Tue, 10 Nov 2009 12:43:29 +0000 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1N7q4H-0005nS-4U for ; Tue, 10 Nov 2009 12:43:29 +0000 Received: from p5b2e709e.dip.t-dialin.net ([91.46.112.158] helo=[192.168.2.122]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1N7q4G-0005Eq-Vb for kernel-team@lists.ubuntu.com; Tue, 10 Nov 2009 12:43:29 +0000 Message-ID: <4AF95FEF.1060505@canonical.com> Date: Tue, 10 Nov 2009 13:43:27 +0100 From: Stefan Bader User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: Ubuntu Kernel Team Subject: [Karmic] SRU-fix: Fix nx_enable reporting X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.8 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com As described in the patch, we got a regression in proposed which was caused by a SRU update. Though fixing the message fir 64bit it caused 32bit non-PAE suddenly to believe it had nx protection. Which then caused sleep problems (for the computer, not the programmer :)). I guess after being involved in testing, I should get two other ACKs for it and then respin, proposed. Thanks. -Stefan Acked-by: Colin King Acked-by: Andy Whitcroft From cf0516662862b64f42ae167d50894d1152d27743 Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Mon, 9 Nov 2009 13:58:54 -0800 Subject: [PATCH] UBUNTU: SAUCE: Fix nx_enable reporting BugLink: https://bugs.launchpad.net/bugs/454285 Submitted upstream. This fixes a regression caused by commit 8bf095f8b62c5fdfe55a8c95be775ea62be7bc10 Author: Kees Cook Date: Sun Oct 18 09:16:44 2009 -0700 UBUNTU: SAUCE: [x86] fix report of cs-limit nx-emulation The _PAGE_NX is 0 when compiled for 32bit without PAE, so the previous attempt to fix the misleading message on 64bit caused 32bit non-PAE to break (discovered by having problems on suspend/resume). Signed-off-by: Kees Cook Tested-by: Stefan Bader --- arch/x86/mm/init.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index 817fa01..6654c44 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -77,7 +77,7 @@ static void __init set_nx(void) #else static inline void set_nx(void) { - nx_enabled = ( (__supported_pte_mask & _PAGE_NX) == _PAGE_NX ); + nx_enabled = _PAGE_NX && ((__supported_pte_mask & _PAGE_NX) == _PAGE_NX); } #endif -- 1.6.3.3