From patchwork Mon Jun 18 08:13:48 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: 10469865 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 2CD036053C for ; Mon, 18 Jun 2018 08:28:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C72D28861 for ; Mon, 18 Jun 2018 08:28:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 107E1288F3; Mon, 18 Jun 2018 08:28:02 +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, 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 D3E7828861 for ; Mon, 18 Jun 2018 08:28:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BB59C6B000D; Mon, 18 Jun 2018 04:27:59 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B65426B000E; Mon, 18 Jun 2018 04:27:59 -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 A7CB56B0010; Mon, 18 Jun 2018 04:27:59 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f200.google.com (mail-pf0-f200.google.com [209.85.192.200]) by kanga.kvack.org (Postfix) with ESMTP id 5FC3C6B000D for ; Mon, 18 Jun 2018 04:27:59 -0400 (EDT) Received: by mail-pf0-f200.google.com with SMTP id u16-v6so8310721pfm.15 for ; Mon, 18 Jun 2018 01:27:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references:user-agent :mime-version; bh=jFQHtplz1KNn5hRp49pi6BEd3q1bp6o9j+GONDSQ49o=; b=cg5A7mMgL/QpFi8ZfwyJ7SGoATLbYPk+220Hn15G7i9O5OXr1baTmqULoF7Q1hELL7 rqwGwtAZVkzkNTkI3ZNQoZpbAqdpZSFjOkI2m7RVmqejJZWl97w36QlVxPFk+qdOrR18 omXG4lir9MZHb9bVADSXORUmMQ6Ln18I4ZmzW6uOsJljckZoLUJvS/OoJOMlmuBAt/bh 7Y7iCmJYZSZHkfPnID+UIZl4kNq+RNi6FSySJINNEYveddP9QCg/TrbzykpzUw0jkTak ZVB+p6V0EIFHPEKqAyZ6aiKsgN8IvRn9I21G5pnUwAipNBo6bLAz+eZaEUhvOjBd41/X mUrg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of gregkh@linuxfoundation.org designates 140.211.169.12 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org X-Gm-Message-State: APt69E2QeNHx1EOppWsCl9Cgve+xoL0Oup4vOOqUPVY/H1uI6MR0P5K5 giofVOgHlN38+lbR1GXXDaCABCHltjmmT9t6YAatrQeDsexunNoC62PtgQO8LsUUU41vURmZTzB paUfYJzze7wu2fIMssilQOQE1A8qWcB+wOxdP34ryr9JNf1g0DVGkyVlGY+QQhRFPRg== X-Received: by 2002:a63:7211:: with SMTP id n17-v6mr9803286pgc.94.1529310479052; Mon, 18 Jun 2018 01:27:59 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIlpeObc6yRDalMLA0sQeQmo09alY9Ogroda5hYeLGKpVGLbtPermDIpToynFXqjFFOyDHA X-Received: by 2002:a63:7211:: with SMTP id n17-v6mr9803252pgc.94.1529310478277; Mon, 18 Jun 2018 01:27:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529310478; cv=none; d=google.com; s=arc-20160816; b=NjSwSU2oiCCgBfGGO3ndG3Vqu+SRfFM2t/vvH4b+e87/GB8p6KyaBBzynGYIEMfeme 6q9Nt54McB7h5rZI54JQPSlGzbIaLPz+7fKmi7v6JvDakiRqdRp0ia1q60g0C6Ak9hwZ fYX04u+TANqzBmsnb1vFRFLVNe4YusFGGsr6W+ADrCD9iAVzoMPTBf7ZUCRaEt9fgRxN Qx4cLnb6FsOnpsUAIp2kE5DcfHDx5mme6sIhlTUD/rtIifhpLgHz5g+WKOXoohcu5rYb bDfARigcHIwP5mpWqbLC9N8yIUFQ0t89MGaPgTUp0OMx0gxbcRHEJV3ODqCHyuGgwJp9 LgZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=jFQHtplz1KNn5hRp49pi6BEd3q1bp6o9j+GONDSQ49o=; b=rcnRuuPyURvZymGielod2SkRhbrjeky1NJQOCrTavBAa34OkkcXY59msjuPamIPRVd dx5F1FZvqeQM3edNC9D5fXOd08bRrW7MlSVroDoB26PR5URoaAxbxpNPSP19xuzvVCPt zM1K308AGSM2QAe2nzrxwI48YCoiikgspd3Abv67kzZjafS9IpnazPGvsmMeb0HkKwoB kh0RqzwHAdPSoRKAPwS0aMnv/pUjvm/EeN9GAv7x0aiEJTdr5fasqXVOv8/qrFtUjFzI MDNC7foq/uijLvbBQpvmXmaYkkOIAfa+tjTvwsO0i2tye+gm3ascXmRhBCsYE7O7Bod/ ARuw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of gregkh@linuxfoundation.org designates 140.211.169.12 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org. [140.211.169.12]) by mx.google.com with ESMTPS id w13-v6si11556759pgo.542.2018.06.18.01.27.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jun 2018 01:27:58 -0700 (PDT) Received-SPF: pass (google.com: domain of gregkh@linuxfoundation.org designates 140.211.169.12 as permitted sender) client-ip=140.211.169.12; Authentication-Results: mx.google.com; spf=pass (google.com: domain of gregkh@linuxfoundation.org designates 140.211.169.12 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 4E4A8C5C; Mon, 18 Jun 2018 08:27:57 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dave Hansen , Andrew Morton , Dave Hansen , Linus Torvalds , Michael Ellermen , Peter Zijlstra , Ram Pai , Shuah Khan , Thomas Gleixner , linux-mm@kvack.org, Ingo Molnar , Sasha Levin Subject: [PATCH 4.16 243/279] x86/pkeys/selftests: Add PROT_EXEC test Date: Mon, 18 Jun 2018 10:13:48 +0200 Message-Id: <20180618080618.833101852@linuxfoundation.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180618080608.851973560@linuxfoundation.org> References: <20180618080608.851973560@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 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 4.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dave Hansen [ Upstream commit 6af17cf89e99b64cf1f660bf848755442ab2f047 ] Under the covers, implement executable-only memory with protection keys when userspace calls mprotect(PROT_EXEC). But, we did not have a selftest for that. Now we do. 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 Link: http://lkml.kernel.org/r/20180509171348.9EEE4BEF@viggo.jf.intel.com Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- tools/testing/selftests/x86/protection_keys.c | 44 ++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) --- a/tools/testing/selftests/x86/protection_keys.c +++ b/tools/testing/selftests/x86/protection_keys.c @@ -1303,6 +1303,49 @@ void test_executing_on_unreadable_memory expected_pk_fault(pkey); } +void test_implicit_mprotect_exec_only_memory(int *ptr, u16 pkey) +{ + void *p1; + int scratch; + int ptr_contents; + int ret; + + dprintf1("%s() start\n", __func__); + + p1 = get_pointer_to_instructions(); + lots_o_noops_around_write(&scratch); + ptr_contents = read_ptr(p1); + dprintf2("ptr (%p) contents@%d: %x\n", p1, __LINE__, ptr_contents); + + /* Use a *normal* mprotect(), not mprotect_pkey(): */ + ret = mprotect(p1, PAGE_SIZE, PROT_EXEC); + pkey_assert(!ret); + + dprintf2("pkru: %x\n", rdpkru()); + + /* Make sure this is an *instruction* fault */ + madvise(p1, PAGE_SIZE, MADV_DONTNEED); + lots_o_noops_around_write(&scratch); + do_not_expect_pk_fault("executing on PROT_EXEC memory"); + ptr_contents = read_ptr(p1); + dprintf2("ptr (%p) contents@%d: %x\n", p1, __LINE__, ptr_contents); + expected_pk_fault(UNKNOWN_PKEY); + + /* + * Put the memory back to non-PROT_EXEC. Should clear the + * exec-only pkey off the VMA and allow it to be readable + * again. Go to PROT_NONE first to check for a kernel bug + * that did not clear the pkey when doing PROT_NONE. + */ + ret = mprotect(p1, PAGE_SIZE, PROT_NONE); + pkey_assert(!ret); + + ret = mprotect(p1, PAGE_SIZE, PROT_READ|PROT_EXEC); + pkey_assert(!ret); + ptr_contents = read_ptr(p1); + do_not_expect_pk_fault("plain read on recently PROT_EXEC area"); +} + void test_mprotect_pkey_on_unsupported_cpu(int *ptr, u16 pkey) { int size = PAGE_SIZE; @@ -1327,6 +1370,7 @@ void (*pkey_tests[])(int *ptr, u16 pkey) test_kernel_gup_of_access_disabled_region, test_kernel_gup_write_to_write_disabled_region, test_executing_on_unreadable_memory, + test_implicit_mprotect_exec_only_memory, test_ptrace_of_child, test_pkey_syscalls_on_non_allocated_pkey, test_pkey_syscalls_bad_args,