From patchwork Mon Jun 18 08:14:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10470137 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 B91046029B for ; Mon, 18 Jun 2018 08:38:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA0D92842E for ; Mon, 18 Jun 2018 08:38:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9E9FE28705; Mon, 18 Jun 2018 08:38:16 +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 1F88C2842E for ; Mon, 18 Jun 2018 08:38:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B61AC6B0271; Mon, 18 Jun 2018 04:38:14 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id AE8E96B0272; Mon, 18 Jun 2018 04:38:14 -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 9D9896B0273; Mon, 18 Jun 2018 04:38:14 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg0-f72.google.com (mail-pg0-f72.google.com [74.125.83.72]) by kanga.kvack.org (Postfix) with ESMTP id 5AEEE6B0271 for ; Mon, 18 Jun 2018 04:38:14 -0400 (EDT) Received: by mail-pg0-f72.google.com with SMTP id r8-v6so4971391pgq.2 for ; Mon, 18 Jun 2018 01:38:14 -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=GCsnEgX3Cw52P1IhhokKUbuKPVrkVjnvIjZXhU9YOuU=; b=BxpGBjoYGqAXW/sJkaQfmENk8S23zY2X2W88GDx+jPHshG0v5SnDaeGb7zU9jE4/HC 1hJiIuJ+uvUOUBpM/j8hcNWlv4oysjr8fMygo/7PdySHhmodhkwzHx19HZTUs2k8Pi/v NS9aInhzcQNb9seqnw3HWRsH6JcHZgMYU7aSJyBzzjSjZ301NzAFzfiWg18emokMU7CC oyL0jP4KZXDd4eSYsr2JrvJeXxldraV35viz+vcoGQLvPpf3VGy3a7cBcBUAj/0tb3K4 a7o8/Cdmdh/tfSpiTVFYxq48ZJBxDZO7r9z32GIZTz9hMvI9WkjYbQKpK4g2qfR7bfac N6PQ== 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: APt69E2RWkOzAsRVc+ClFp/RyNGS3cesos18rJurCcAPYNmQng0Dbs7f s6lUJ4DJHzSKBp2yQnlBylzSV3hhwmXYjsDurnLNhgoT+Ds7fELp/rKa6a+b04H8EDKXVItqucy yhsdhu8cGobSB4Y3LZJFNtIt8ujDeQSbm8V2E16EvR1FeNEBkHIhNEDZTVrc32x07wg== X-Received: by 2002:a63:5f8b:: with SMTP id t133-v6mr10214038pgb.68.1529311094032; Mon, 18 Jun 2018 01:38:14 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIrVz8xw8OGMiwsspauBQ86J8P/Qwux8OioD85MDTjJhfXrAWzdFMINtWbdo2l9GNLG4DTe X-Received: by 2002:a63:5f8b:: with SMTP id t133-v6mr10214012pgb.68.1529311093356; Mon, 18 Jun 2018 01:38:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529311093; cv=none; d=google.com; s=arc-20160816; b=kzGejoe3CDP8w7pSPh3Gne5D6XyuDfNbLHVr0Y2/exNT/aKG17NuwYuZAciuqDMMyv kSD/wWK3/mgGJfA1MPygBBuUJZluk8nlHhMHx3rGP74BOGwfwx0iJqy8CfCaqItuxgyO 3L/rTOkik3Ab7Bzmiz1mdP9kCN/Xg40dd7YpayFuDAOJG/c0YYFPCYE+3CRw3gxSzvG5 yQdsIwWwkrEGZSsCc3ctAJUDBi1T8Y1s/lvXOU2zhb78OI1lmLxKvSIliPySTvbq6Doz 8YHIV7Gt3hoM09jXfMTkX5zuPNrALfD5OC7Fg/cLo4QO3ssnhCsmrkpuupaV8KbpWmxB hzmA== 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=GCsnEgX3Cw52P1IhhokKUbuKPVrkVjnvIjZXhU9YOuU=; b=Xdh/e+OipydwvMYhc7GnK8Vx2bhm93lSc/rGDo4yVDaRiyKQ9pyMAHLIsFQqmyHueQ n5Wd1GVv4r/eoliXHONLwr/U0XTm+Q2UJayuN6UQ1bklWmJ4GHjwPI2j5Spygvwr3mPR LHXgEzvXz2+mpRaf4HGRSrl0RDr3qMFOpj4albaFsHUTm7ZjH3K6Q/GpmDnzqL0qG00S Yy/3JZ32hzuVLMCTOy8tKwd4ngecFqpygC/hJMWdzuvIy2dqlXSpSZpoYTOIC/EnpXdG xZmn11dybWd4c5uNqIGDcdkTYP+LlEdFwKeksGfvwrSyXJbmKw7E+A1iz5kZ6WzZ/3sF R7gA== 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 x16-v6si13466942pfh.354.2018.06.18.01.38.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jun 2018 01:38:13 -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 899FFC5C; Mon, 18 Jun 2018 08:38:12 +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.14 160/189] x86/pkeys/selftests: Add PROT_EXEC test Date: Mon, 18 Jun 2018 10:14:16 +0200 Message-Id: <20180618081215.655070976@linuxfoundation.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180618081209.254234434@linuxfoundation.org> References: <20180618081209.254234434@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.14-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,