From patchwork Mon Jun 18 08:13:46 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: 10469841 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 A89BC6032A for ; Mon, 18 Jun 2018 08:27:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 991DD28865 for ; Mon, 18 Jun 2018 08:27:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D8BC288B8; Mon, 18 Jun 2018 08:27:30 +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 1E71C28865 for ; Mon, 18 Jun 2018 08:27:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4D8206B0008; Mon, 18 Jun 2018 04:27:29 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 4AEA46B0010; Mon, 18 Jun 2018 04:27:29 -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 3C4AC6B0266; Mon, 18 Jun 2018 04:27:29 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f197.google.com (mail-pf0-f197.google.com [209.85.192.197]) by kanga.kvack.org (Postfix) with ESMTP id EEC766B0008 for ; Mon, 18 Jun 2018 04:27:28 -0400 (EDT) Received: by mail-pf0-f197.google.com with SMTP id j25-v6so1258670pfi.20 for ; Mon, 18 Jun 2018 01:27:28 -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=nPggWGxEJPJl2vpe8AK3YPVgVoXnbi3zoWGZB1rSDWs=; b=X8WJ1iOdjgo2m26Ss9ZsZV0tCCD7VgNrPDDnd1y2Jp/1fXKoltifDkGIk9CNvQeg9N RCHmlh33wKZ69sSMci2yfDym+yHmRgs/LEDZeE5QoaYMHiNkA8KLUQMnJAxmlvj8+uAx QxyELT34SdBggkrrGCLzZZEjyp/lln3ZjYa2OSbN21NxsFmZlyw+JPZrGWyvpVeuQHtl snSFzx85kzREV6dCjsXQW8yCdZoJTKBXOV45qp5Vv9nlH/pM9ChcVSn30TYzYFeTQUOy zCovzYswShOXaS83dE+4jL4fgkPhQ/acuJiBrlZBvQ7I2+Zz3xcsqUGFE9Je4c9qESMH CUJA== 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: APt69E3B6YpqYkcum0n7fa1JCfeHUHkxCDnd6YPRK822Rkn1Fhm09kSO Zhx+YtwbatxnbObePygy5CLsPSfmVO9Yi8mlMWHzeQsWwIo61xGV0azMvYG+Wm9tsBlrDLCy7tx FekbKSIRF2aaBQYt9V0v1gOZBmH4XxiRxLEhyvEdPtkWIw2XGoH9I1SI4YI7Zq8LRrg== X-Received: by 2002:a62:e310:: with SMTP id g16-v6mr12555946pfh.25.1529310448641; Mon, 18 Jun 2018 01:27:28 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJyr2r7RQcpHSKsqCSIYEcf7rDqXBHHxKg0ymZUAzkHFGeTjup4U9npwOOBi38pP1eTvnA3 X-Received: by 2002:a62:e310:: with SMTP id g16-v6mr12555899pfh.25.1529310447730; Mon, 18 Jun 2018 01:27:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529310447; cv=none; d=google.com; s=arc-20160816; b=Sxs/3D49WuQrzGzpe/axIddcjT4lj5M8l+wUtVVKhA2T+Ojyz/Dy3gPcJUU09nqUk/ yzpjYB5Sb7oBTravHOSRpUF/4+KmP3ZjDuMVB115LD0+dzgjlXyAB82hUXBH3PJLosfo VtZw/CWCWJ220w2P35lcG1euZ8DZ9RtQw4kSNaeV0KZaY5BC6vuILoVPG71C+l5jU45o Ru0LnmXDSmiTFiugK/9ckPLUO6NlVDvnESrSpJDnCKK7SpGfTHR4PiZsdupxSJtbYRVy kKz/DDDHJyihzj2zbGD3jWhU57/wv1dEzkcmm5exMDZRYyOOzKKM/8xcoeSMGwiGHf2F 8OHA== 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=nPggWGxEJPJl2vpe8AK3YPVgVoXnbi3zoWGZB1rSDWs=; b=CsdegYO+8PtwvtZ8bK9iBYgNomOcV3D7cJA8TUeU0A0u2OkmMf/Ck9yi7ah9i/5Vml /40o1PmkqdNujrVMGHSOrAApMiTq/jHpVUPDPw5zVeBuYHYZUUepI2ITS62iRuK2CnHu 0KLGml2GSBOMLfOyi6E0KWRT75a7KvtnABHBkRZTmZd+xh+DpNIWBvyx0QrwdvPhywD7 f+xtoYDV4MMtqzi2aOrlFv1Cn8Zzfj22UzfwJR46T41X5ZJseCopovTkVOIn8P3CH6Py SZqF+VWiUG/R4yKXMcvQHsWVIAE7+YCx4q6JjGX7YNxbTZxdz5tqVnv49ucfW1V22ZH+ w2gA== 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 q2-v6si14502872plh.136.2018.06.18.01.27.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jun 2018 01:27:27 -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 EC9EBC7A; Mon, 18 Jun 2018 08:27:26 +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 241/279] x86/pkeys/selftests: Allow faults on unknown keys Date: Mon, 18 Jun 2018 10:13:46 +0200 Message-Id: <20180618080618.756215501@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 7e7fd67ca39335a49619729821efb7cbdd674eb0 ] The exec-only pkey is allocated inside the kernel and userspace is not told what it is. So, allow PK faults to occur that have an unknown key. 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/20180509171345.7FC7DA00@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 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) --- a/tools/testing/selftests/x86/protection_keys.c +++ b/tools/testing/selftests/x86/protection_keys.c @@ -921,13 +921,21 @@ void *malloc_pkey(long size, int prot, u } int last_pkru_faults; +#define UNKNOWN_PKEY -2 void expected_pk_fault(int pkey) { dprintf2("%s(): last_pkru_faults: %d pkru_faults: %d\n", __func__, last_pkru_faults, pkru_faults); dprintf2("%s(%d): last_si_pkey: %d\n", __func__, pkey, last_si_pkey); pkey_assert(last_pkru_faults + 1 == pkru_faults); - pkey_assert(last_si_pkey == pkey); + + /* + * For exec-only memory, we do not know the pkey in + * advance, so skip this check. + */ + if (pkey != UNKNOWN_PKEY) + pkey_assert(last_si_pkey == pkey); + /* * The signal handler shold have cleared out PKRU to let the * test program continue. We now have to restore it.