From patchwork Wed May 9 17:13:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Hansen X-Patchwork-Id: 10390253 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 F103960318 for ; Wed, 9 May 2018 17:19:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E03922851D for ; Wed, 9 May 2018 17:19:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D4B0D2851E; Wed, 9 May 2018 17:19:11 +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=unavailable 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 70D6A28521 for ; Wed, 9 May 2018 17:19:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6CCB16B0544; Wed, 9 May 2018 13:18:56 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 67E426B0545; Wed, 9 May 2018 13:18:56 -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 594766B0546; Wed, 9 May 2018 13:18:56 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f72.google.com (mail-pl0-f72.google.com [209.85.160.72]) by kanga.kvack.org (Postfix) with ESMTP id 16A906B0544 for ; Wed, 9 May 2018 13:18:56 -0400 (EDT) Received: by mail-pl0-f72.google.com with SMTP id a14-v6so4051687plt.7 for ; Wed, 09 May 2018 10:18:56 -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:subject:to:cc :from:date:references:in-reply-to:message-id; bh=eJx/kreRMD3vZXSy6KV7cY+SJmjshhYvPyBZWvIOQtA=; b=moJjmCwsiQEAu89Wp9SL96KherJYC54lQNTL2qzkH7P2XMGGEToVF7AMCudSK/Lwb1 OCbqi+QRzfdNjnmrnWynpOo7E92mclf12yE4nHYfbXgfa/ONP6r2FwDb06VrUvAgKFnY RtAtY8U2LiHE5jb1gqK++UKa9z0qkor5F1TAbJYWhd48NAEuUH+xUQX3iGcWc21SqSB/ 1z+iCOH1HXg3tOTPUxlCfgPQS2QPf2/x+Wz77lcIjE7KngpaNy3TVVKDRTm8tTSkfvFK HmPVEp6H1z2xrw/8Hk97Z1Z9yN1cZohP7MDtCkYrX/i0OV2LnDFB6NebEBp/cs6TdNRs Yg0Q== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dave.hansen@linux.intel.com designates 192.55.52.93 as permitted sender) smtp.mailfrom=dave.hansen@linux.intel.com X-Gm-Message-State: ALQs6tBVBgMi6YE7dMYr07zniKrBU5/CixbtxqRnFbPXQk6kzpBeeixy 8X0SL0KGTcO0Wpn5oPlGAwHlTVjQT0VQvJP7/w3SrokPswlxtzpbeTdDqg5ybOy8IvuSQS2fzeS gb4Cqt+RF+yVMQ943pvCQCN94HRLOr9dz6XABpx5l4f8IQQ4MFWrtwPPEstVVnVmHMw== X-Received: by 2002:a17:902:b7cb:: with SMTP id v11-v6mr21623859plz.266.1525886335806; Wed, 09 May 2018 10:18:55 -0700 (PDT) X-Google-Smtp-Source: AB8JxZp0BPirMTiw3aBEKVNG9dnJ8e0k8xi7a0PBI7n3CU6oKZbmH8oKg7f33+lSPzU+2YD2uA8/ X-Received: by 2002:a17:902:b7cb:: with SMTP id v11-v6mr21623823plz.266.1525886335113; Wed, 09 May 2018 10:18:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525886335; cv=none; d=google.com; s=arc-20160816; b=IJrrZomu5mu2GPphgNfZ9k0l/c1BqWqgZImFgBUHEuxyHwKxN8y+r4QvB7yp+5Y2qT kkZSCjmwwFOwMognJsrk/zsoWYPyhp+WC9q6cdZNRMjG8YOGG195ADu1qWxY0H7mKZnN 6/slUYXfSP0ENRiImuahRjRm0W0cAH5Ib0cd23kgKFN1JYQY/rjcs9PwcHrRj5NJ+gUx IcaRUJTgkFSH44RJnXsDEXYW9rC0FtGtyrdxgAkiJ6J+UG/SBiZqF3S9F8OLJW4QaJRg SCHg5rkkVTaTRMeM1LTJQILDpGZVTm9qjChTacaKgiQJb3ePY2Ce3KDKwWLd0Pfq48IL CcNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:in-reply-to:references:date:from:cc:to:subject :arc-authentication-results; bh=eJx/kreRMD3vZXSy6KV7cY+SJmjshhYvPyBZWvIOQtA=; b=vSMEV4Z4b4DcDaZxKRAghwT8S8md/OFBexGfPFBQVTvr92kW2rDqaJgBjB6TsFEj1V vSrIN/hDgZg7eHb3hNDgpg8Zgab46hxXoyqeq4TBUkwZVpGngOAGcYbQUGBto61D3eV7 LsgmYwRAe1ySod6QJzwiSUnT5o54GyW4w5QH0g7guV4jTHwf5K2pCka1S5www/2rTl5K w5DOqOEJRimIgAe2C953exoduEJkLMMla0zGvM3p9vDRXmF/a+X3nejdsR6utm5Eh5mk +DrASwGfaCFclsZND07GqWvGZh7zEp576+/KgXUw7UW70WHcQitkh5vZm5gb6B3TMIPB 8gRg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dave.hansen@linux.intel.com designates 192.55.52.93 as permitted sender) smtp.mailfrom=dave.hansen@linux.intel.com Received: from mga11.intel.com (mga11.intel.com. [192.55.52.93]) by mx.google.com with ESMTPS id 34-v6si26646768plm.495.2018.05.09.10.18.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 May 2018 10:18:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dave.hansen@linux.intel.com designates 192.55.52.93 as permitted sender) client-ip=192.55.52.93; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dave.hansen@linux.intel.com designates 192.55.52.93 as permitted sender) smtp.mailfrom=dave.hansen@linux.intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 May 2018 10:18:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,382,1520924400"; d="scan'208";a="40511721" Received: from viggo.jf.intel.com (HELO localhost.localdomain) ([10.54.39.119]) by orsmga006.jf.intel.com with ESMTP; 09 May 2018 10:18:54 -0700 Subject: [PATCH 07/13] x86/pkeys/selftests: Add PROT_EXEC test To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, Dave Hansen , linuxram@us.ibm.com, tglx@linutronix.de, dave.hansen@intel.com, mpe@ellerman.id.au, mingo@kernel.org, akpm@linux-foundation.org, shuah@kernel.org From: Dave Hansen Date: Wed, 09 May 2018 10:13:48 -0700 References: <20180509171336.76636D88@viggo.jf.intel.com> In-Reply-To: <20180509171336.76636D88@viggo.jf.intel.com> Message-Id: <20180509171348.9EEE4BEF@viggo.jf.intel.com> 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 From: Dave Hansen 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: Ram Pai Cc: Thomas Gleixner Cc: Dave Hansen Cc: Michael Ellermen Cc: Ingo Molnar Cc: Andrew Morton Cc: Shuah Khan --- b/tools/testing/selftests/x86/protection_keys.c | 44 ++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff -puN tools/testing/selftests/x86/protection_keys.c~pkeys-selftests-prot_exec tools/testing/selftests/x86/protection_keys.c --- a/tools/testing/selftests/x86/protection_keys.c~pkeys-selftests-prot_exec 2018-05-09 09:20:21.273698400 -0700 +++ b/tools/testing/selftests/x86/protection_keys.c 2018-05-09 09:20:21.276698400 -0700 @@ -1288,6 +1288,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; @@ -1312,6 +1355,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,