From patchwork Mon May 21 06:42:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 10414033 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A11DF600CC for ; Mon, 21 May 2018 06:44:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 906842876B for ; Mon, 21 May 2018 06:44:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 853F328791; Mon, 21 May 2018 06:44:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D22132876B for ; Mon, 21 May 2018 06:44:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E2C1C6B026F; Mon, 21 May 2018 02:44:33 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E02C86B0270; Mon, 21 May 2018 02:44:33 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CCC9B6B0271; Mon, 21 May 2018 02:44:33 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f70.google.com (mail-pl0-f70.google.com [209.85.160.70]) by kanga.kvack.org (Postfix) with ESMTP id 8A45B6B026F for ; Mon, 21 May 2018 02:44:33 -0400 (EDT) Received: by mail-pl0-f70.google.com with SMTP id bd7-v6so9523259plb.20 for ; Sun, 20 May 2018 23:44:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:subject:to:cc:from:date :message-id:mime-version:content-transfer-encoding; bh=MB95B67o/V3RXB7Cdnyh44bCIvijip57kwsVPdFRDHs=; b=MMFiRbQezH3CF0Y8cT4lYjSXRwm62e0VJ3DzJBrjhsHekxTNJK5STmra/ChoCnpt4J c9u7pAzPlwZZLcZ2AobAdAlZpGyixXHZHBdzDhSmmuaAXzx8oQa16rXyhakC/22Zt/V3 ixJ5PzhuX7y5fdVOWJRJlFYgO/Wu1YAZyAxEeiTIvz/ZS1/c6NiAqNsL6X2ZNhiSseMn x6LKbMKK6o+zyeDUtSmtkbHhunJh7jc088nwq6mTSd+2/h0TQaJIrqUa+iKikn7fteHU tT5GLFSe2aCHrtM3JpjqsFmoepmVXALxekA7BKrAkv767XVveTQnL8lY8ylNIa2Nn2G1 flnw== X-Gm-Message-State: ALKqPwfWHYhc9vzkxIELvCFKw9Un+j3aWJHb13xrVT1X/Iwo9u1VAm/f SSzYz/qJcJNw41/yM1P7otCMNXZYM6h5bZ7k+addHzsXTQ4qAnqcE8brcNQtVTG8yzdZwbPPb6l vN5o3+l6wd/coGagYMm7afsPp0lTqf3bu8wFNj0UDXP6zYQx5Li3jf7SWPclExNE= X-Received: by 2002:a17:902:a507:: with SMTP id s7-v6mr19216425plq.258.1526885073240; Sun, 20 May 2018 23:44:33 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrbZfzD/8H6bR2Tr4GTe7HMm5j8zGk15gFKBZzcx9Lddrco3AvqaTcHLUVSAguIcegracYg X-Received: by 2002:a17:902:a507:: with SMTP id s7-v6mr19216396plq.258.1526885072586; Sun, 20 May 2018 23:44:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526885072; cv=none; d=google.com; s=arc-20160816; b=nj+fNRE7dyndAH98MrPuJRESNhQqNrXP7of492l1iaWoQYaNO6xq6mIJHLtRxs+kRv 9x7t2sGIDs+iDYT5N4KJHoU+grF1pABf3kcx+AeTOSJeesOEetEeGoCJR/1e4sZURroD YdMOmADj2sdRi5Cd6uC28JujhaZPZXvmT8VvWvTDUgY+rqp7um2eI2sGnOwFteqc5PWi fYdUXwhozYw7iOQDEZgXrmPHf2w7elwt05rMCCmSpArzpBF6ZLdLm8Ejs4mD8HizaDNO LBnBIJN9a8dbuBaPcpV4W47cvwKo4GddwjKcXyXNsLF3W4pdkycGwqFXzMPtB7D/KSiM VhdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:from:cc:to :subject:dkim-signature:arc-authentication-results; bh=MB95B67o/V3RXB7Cdnyh44bCIvijip57kwsVPdFRDHs=; b=n2sDTTVYZuLjohh++Li4E9O7w1AhIzfMGfJIHl1VpUN/tQs55EFbRxO5n91cqtIxbt BbvIs4qpWYgV2O4t845mr/YULhqJ+GfgoAsY7h5jlvjVY9YogNxYrLH2UDXSjbLOsmGr 8047zeypfN7/lxm5EIRUBQUvxMFTAUXOJ8nLel0ABMj7iPkYEx5CmRY36c7DQ3DicF8R bt9Z1vCVQYQfAZ/sFQt1zVPt3qdPt0tCxCYqXJqGjK/xTseF3epu6xd38fIFBflMVRmh z/OrW5xtIV9kfaUcmbRFRfOizxgM/yLa/iUCUZlOmEc/+Q3x1iBToLddjMuqt+tijunL mwUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gCg9K1NG; spf=pass (google.com: domain of srs0=nia/=ii=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=nia/=II=linuxfoundation.org=gregkh@kernel.org Received: from mail.kernel.org (mail.kernel.org. [198.145.29.99]) by mx.google.com with ESMTPS id s14-v6si10381431pgf.263.2018.05.20.23.44.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 May 2018 23:44:32 -0700 (PDT) Received-SPF: pass (google.com: domain of srs0=nia/=ii=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) client-ip=198.145.29.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gCg9K1NG; spf=pass (google.com: domain of srs0=nia/=ii=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=nia/=II=linuxfoundation.org=gregkh@kernel.org Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7CAD42087C; Mon, 21 May 2018 06:44:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1526885072; bh=tQjARkco58jWZp9rdXbcmLs6flnLC2B4Yo0WCGopnNE=; h=Subject:To:Cc:From:Date:From; b=gCg9K1NGaHqahZjYbbUFRUSqBpvnjUVlejUAqN818P9LK5WV1tjV/dN0o8KMBrtrC GAxcx5OT+sH1IlKWtGKFZSdvOav28edapwSjCdFK3vEJPqsF+iir/k/juixamRissk o9H05Ns3d2FhJMiiDsGCwQ2zRsY56fQ4pecAhCKE= Subject: Patch "x86/pkeys: Override pkey when moving away from PROT_EXEC" has been added to the 4.9-stable tree To: 20180509171351.084C5A71@viggo.jf.intel.com, akpm@linux-foundation.org, dave.hansen@intel.com, dave.hansen@linux.intel.com, gregkh@linuxfoundation.org, linux-mm@kvack.org, linuxram@us.ibm.com, mingo@kernel.org, mpe@ellerman.id.au, peterz@infradead.org, shakeelb@google.com, shuah@kernel.org, tglx@linutronix.de, torvalds@linux-foundation.org Cc: From: Date: Mon, 21 May 2018 08:42:35 +0200 Message-ID: <152688495526206@kroah.com> MIME-Version: 1.0 X-stable: commit X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP This is a note to let you know that I've just added the patch titled x86/pkeys: Override pkey when moving away from PROT_EXEC to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: x86-pkeys-override-pkey-when-moving-away-from-prot_exec.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. From 0a0b152083cfc44ec1bb599b57b7aab41327f998 Mon Sep 17 00:00:00 2001 From: Dave Hansen Date: Wed, 9 May 2018 10:13:51 -0700 Subject: x86/pkeys: Override pkey when moving away from PROT_EXEC From: Dave Hansen commit 0a0b152083cfc44ec1bb599b57b7aab41327f998 upstream. I got a bug report that the following code (roughly) was causing a SIGSEGV: mprotect(ptr, size, PROT_EXEC); mprotect(ptr, size, PROT_NONE); mprotect(ptr, size, PROT_READ); *ptr = 100; The problem is hit when the mprotect(PROT_EXEC) is implicitly assigned a protection key to the VMA, and made that key ACCESS_DENY|WRITE_DENY. The PROT_NONE mprotect() failed to remove the protection key, and the PROT_NONE-> PROT_READ left the PTE usable, but the pkey still in place and left the memory inaccessible. To fix this, we ensure that we always "override" the pkee at mprotect() if the VMA does not have execute-only permissions, but the VMA has the execute-only pkey. We had a check for PROT_READ/WRITE, but it did not work for PROT_NONE. This entirely removes the PROT_* checks, which ensures that PROT_NONE now works. Reported-by: Shakeel Butt Signed-off-by: Dave Hansen Cc: Andrew Morton Cc: Dave Hansen Cc: Linus Torvalds Cc: Michael Ellermen Cc: Peter Zijlstra Cc: Ram Pai Cc: Shuah Khan Cc: Thomas Gleixner Cc: linux-mm@kvack.org Cc: stable@vger.kernel.org Fixes: 62b5f7d013f ("mm/core, x86/mm/pkeys: Add execute-only protection keys support") Link: http://lkml.kernel.org/r/20180509171351.084C5A71@viggo.jf.intel.com Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- arch/x86/include/asm/pkeys.h | 12 +++++++++++- arch/x86/mm/pkeys.c | 21 +++++++++++---------- 2 files changed, 22 insertions(+), 11 deletions(-) Patches currently in stable-queue which might be from dave.hansen@linux.intel.com are queue-4.9/x86-pkeys-override-pkey-when-moving-away-from-prot_exec.patch queue-4.9/x86-pkeys-do-not-special-case-protection-key-0.patch --- a/arch/x86/include/asm/pkeys.h +++ b/arch/x86/include/asm/pkeys.h @@ -1,6 +1,8 @@ #ifndef _ASM_X86_PKEYS_H #define _ASM_X86_PKEYS_H +#define ARCH_DEFAULT_PKEY 0 + #define arch_max_pkey() (boot_cpu_has(X86_FEATURE_OSPKE) ? 16 : 1) extern int arch_set_user_pkey_access(struct task_struct *tsk, int pkey, @@ -14,7 +16,7 @@ extern int __execute_only_pkey(struct mm static inline int execute_only_pkey(struct mm_struct *mm) { if (!boot_cpu_has(X86_FEATURE_OSPKE)) - return 0; + return ARCH_DEFAULT_PKEY; return __execute_only_pkey(mm); } @@ -55,6 +57,14 @@ bool mm_pkey_is_allocated(struct mm_stru return false; if (pkey >= arch_max_pkey()) return false; + /* + * The exec-only pkey is set in the allocation map, but + * is not available to any of the user interfaces like + * mprotect_pkey(). + */ + if (pkey == mm->context.execute_only_pkey) + return false; + return mm_pkey_allocation_map(mm) & (1U << pkey); } --- a/arch/x86/mm/pkeys.c +++ b/arch/x86/mm/pkeys.c @@ -95,26 +95,27 @@ int __arch_override_mprotect_pkey(struct */ if (pkey != -1) return pkey; - /* - * Look for a protection-key-drive execute-only mapping - * which is now being given permissions that are not - * execute-only. Move it back to the default pkey. - */ - if (vma_is_pkey_exec_only(vma) && - (prot & (PROT_READ|PROT_WRITE))) { - return 0; - } + /* * The mapping is execute-only. Go try to get the * execute-only protection key. If we fail to do that, * fall through as if we do not have execute-only - * support. + * support in this mm. */ if (prot == PROT_EXEC) { pkey = execute_only_pkey(vma->vm_mm); if (pkey > 0) return pkey; + } else if (vma_is_pkey_exec_only(vma)) { + /* + * Protections are *not* PROT_EXEC, but the mapping + * is using the exec-only pkey. This mapping was + * PROT_EXEC and will no longer be. Move back to + * the default pkey. + */ + return ARCH_DEFAULT_PKEY; } + /* * This is a vanilla, non-pkey mprotect (or we failed to * setup execute-only), inherit the pkey from the VMA we