From patchwork Sun Jun 17 11:23:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10468811 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 8E8236028E for ; Sun, 17 Jun 2018 11:36:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7FCC128897 for ; Sun, 17 Jun 2018 11:36:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 72A0128A1B; Sun, 17 Jun 2018 11:36:38 +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 C2A8928874 for ; Sun, 17 Jun 2018 11:36:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5F4E56B026C; Sun, 17 Jun 2018 07:36:29 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 501606B026D; Sun, 17 Jun 2018 07:36: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 215FA6B026E; Sun, 17 Jun 2018 07:36:29 -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 CBDCE6B026C for ; Sun, 17 Jun 2018 07:36:28 -0400 (EDT) Received: by mail-pf0-f200.google.com with SMTP id a13-v6so7084752pfo.22 for ; Sun, 17 Jun 2018 04:36:28 -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=8kEZWWqSrxi9p1gvk8xjsEjeeLI4b8lEMbrQOJn0A8Q=; b=NB/1RL+/q1hvT7wRqPvc0o7RkpxJmK+qkk3FK0FqRi8VExL+CpPXi9lLwiKhbI5+7J 6rT/NVb+y+OiIYNF6zmHuPmTbCdtNN2UQ5L1ygG8c0mMqmxp2SgI/GvwEc2kM5p5ipZo 6PtgFksHsQPPiY9QvTu9IOw4AsmXf216jb2toBsDSQZE79lgrO1/OIhF5NZObvSiFRkn JD0oVu08pqk+spa7OciKBlBUJ9D7l/Yz2q2eWmhIhWSV7zyPvKbrCl9syngzkw7kqsoo gsibzz84hLZOh6xgf0W6YWOyvqL+4iYO3juqrK8jJZu4mcB8gbLye/ufWWjYeaDxI0k+ g1LA== X-Gm-Message-State: APt69E0cxbH0xjQ7JDiOBs3aBYNcKZr3CRFZAxsq39J5QrldnObI9Qv9 ue0vr1vO44HfkLP8IXvhP0n1v8QaalrG8u3i7Hf66LW7rVnUQ6z0C6nCAPG6XCz4p0YwtnP5tbS h1D90fr12FKPR+/cIb9KNC+JJavptLpcL4N1K2JHfd59STya699b3i258wke7FW8= X-Received: by 2002:a65:6007:: with SMTP id m7-v6mr7441716pgu.92.1529235388505; Sun, 17 Jun 2018 04:36:28 -0700 (PDT) X-Google-Smtp-Source: ADUXVKI4ya89GKx2FXGYcfWK12wiWk64YGRgHHIKUPTJz2yFwxu+VY+8hk50VqhIurio4biO88r/ X-Received: by 2002:a65:6007:: with SMTP id m7-v6mr7441690pgu.92.1529235387786; Sun, 17 Jun 2018 04:36:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529235387; cv=none; d=google.com; s=arc-20160816; b=qZuI8XacXN00OBlIEiFmqfoZVPyCocO9JvwQmBKOvJHTwm5mjWNj35uJ0fLMQ7qy4S rd1emHZDhLbzwlpFiovcRvE8CxYR7r6m6MMDYXnXHirZ4dT2YN175FKuOk3A3HcDvi1l KP5X1W2lJHGIKPE+oeikgYVE2aS71uw3A6izdmpqPRtMurRvTe4Oi2tZ/QagYdBR/bfc VHJ+bQdRXShzLgaymmn95dWZ+q4lnF6mIAvk8tHGtpuwN9VZEseX8rUAlqAObYe97lAj Nhb7SSARhCRHuptk1b3x2jvIHhoQ2ov/jdHCyfEcFlAL6gxJt5aUV7qa43QUJE5DlWjH q5QQ== 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=8kEZWWqSrxi9p1gvk8xjsEjeeLI4b8lEMbrQOJn0A8Q=; b=zVLpp1l1+tuJifSTDk61q4MkEmd/evKcPV2leiTbOHqLe1WkxHF8Qt2BRLZmAJDg7p BsCdljAQVMqnTxpvxxDd9A/pL+w5XtGLyr1EzQwwAGBGX4S/CfTHk4t0b3JcX7okxii+ TsTJIoja4PSV7l+4NyZqptwunYOUXhYwAMTgre0RyTFDxEaCRCMmCJVrpBqpiJTaKs6i j4XLXFMi1JRNDQwgiEkOTDNDFJR1lRn0oZB0CmromqDUPepWNBiDOc0G3Fq4T0ounD2d T2kPN0bJaN65kNiigXEnClhye2fnlae1svoibfQ0D8i9aCuui/pD5jgk3TYKMkqnfEa6 GItQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KzoeV6Xn; spf=pass (google.com: domain of srs0=nxds=jd=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom="SRS0=nXdS=JD=linuxfoundation.org=gregkh@kernel.org" Received: from mail.kernel.org (mail.kernel.org. [198.145.29.99]) by mx.google.com with ESMTPS id x2-v6si9972674pgr.33.2018.06.17.04.36.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Jun 2018 04:36:27 -0700 (PDT) Received-SPF: pass (google.com: domain of srs0=nxds=jd=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=KzoeV6Xn; spf=pass (google.com: domain of srs0=nxds=jd=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom="SRS0=nXdS=JD=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 D383F208E0; Sun, 17 Jun 2018 11:36:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1529235387; bh=gaCM8QF2tSCGVoEA670u1mgOuZI24niacbrtpkCn2mw=; h=Subject:To:Cc:From:Date:From; b=KzoeV6XnDaStEhttTj3wg//c3IvU2Zk1b8Z3q1N8O3ko0RqCXr/8xNW6G3Ik9AKqV zp4sWL2LEXuNMI2QnpyKGWhrCUSkWf3Tfh0lAOTeIBBLBGZFj/tnNyA8Xx5uwOJhlZ FR94ikcqy09VfMi7VZkSmk1DIHcqR/clkp7/Zc78= Subject: Patch "x86/pkeys/selftests: Fix pointer math" has been added to the 4.14-stable tree To: 20180509171352.9BE09819@viggo.jf.intel.com, akpm@linux-foundation.org, alexander.levin@microsoft.com, 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, shuah@kernel.org, tglx@linutronix.de, torvalds@linux-foundation.org Cc: From: Date: Sun, 17 Jun 2018 13:23:31 +0200 Message-ID: <152923461115925@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/selftests: Fix pointer math to the 4.14-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-selftests-fix-pointer-math.patch and it can be found in the queue-4.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. From foo@baz Sun Jun 17 12:13:49 CEST 2018 From: Dave Hansen Date: Wed, 9 May 2018 10:13:52 -0700 Subject: x86/pkeys/selftests: Fix pointer math From: Dave Hansen [ Upstream commit 3d64f4ed15c3c53dba4c514bf59c334464dee373 ] We dump out the entire area of the siginfo where the si_pkey_ptr is supposed to be. But, we do some math on the poitner, which is a u32. We intended to do byte math, not u32 math on the pointer. Cast it over to a u8* so it works. Also, move this block of code to below th si_code check. It doesn't hurt anything, but the si_pkey field is gibberish for other signal types. 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/20180509171352.9BE09819@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 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) Patches currently in stable-queue which might be from dave.hansen@linux.intel.com are queue-4.14/x86-pkeys-selftests-factor-out-instruction-page.patch queue-4.14/x86-pkeys-selftests-fix-pointer-math.patch queue-4.14/x86-pkeys-selftests-adjust-the-self-test-to-fresh-distros-that-export-the-pkeys-abi.patch queue-4.14/x86-pkeys-selftests-add-a-test-for-pkey-0.patch queue-4.14/x86-pkeys-selftests-stop-using-assert.patch queue-4.14/x86-pkeys-selftests-save-off-prot-for-allocations.patch queue-4.14/x86-pkeys-selftests-remove-dead-debugging-code-fix-dprint_in_signal.patch queue-4.14/x86-mpx-selftests-adjust-the-self-test-to-fresh-distros-that-export-the-mpx-abi.patch queue-4.14/x86-pkeys-selftests-add-prot_exec-test.patch queue-4.14/x86-pkeys-selftests-allow-faults-on-unknown-keys.patch queue-4.14/x86-pkeys-selftests-give-better-unexpected-fault-error-messages.patch queue-4.14/x86-pkeys-selftests-fix-pkey-exhaustion-test-off-by-one.patch --- a/tools/testing/selftests/x86/protection_keys.c +++ b/tools/testing/selftests/x86/protection_keys.c @@ -303,13 +303,6 @@ void signal_handler(int signum, siginfo_ dump_mem(pkru_ptr - 128, 256); pkey_assert(*pkru_ptr); - si_pkey_ptr = (u32 *)(((u8 *)si) + si_pkey_offset); - dprintf1("si_pkey_ptr: %p\n", si_pkey_ptr); - dump_mem(si_pkey_ptr - 8, 24); - siginfo_pkey = *si_pkey_ptr; - pkey_assert(siginfo_pkey < NR_PKEYS); - last_si_pkey = siginfo_pkey; - if ((si->si_code == SEGV_MAPERR) || (si->si_code == SEGV_ACCERR) || (si->si_code == SEGV_BNDERR)) { @@ -317,6 +310,13 @@ void signal_handler(int signum, siginfo_ exit(4); } + si_pkey_ptr = (u32 *)(((u8 *)si) + si_pkey_offset); + dprintf1("si_pkey_ptr: %p\n", si_pkey_ptr); + dump_mem((u8 *)si_pkey_ptr - 8, 24); + siginfo_pkey = *si_pkey_ptr; + pkey_assert(siginfo_pkey < NR_PKEYS); + last_si_pkey = siginfo_pkey; + dprintf1("signal pkru from xsave: %08x\n", *pkru_ptr); /* need __rdpkru() version so we do not do shadow_pkru checking */ dprintf1("signal pkru from pkru: %08x\n", __rdpkru());