From patchwork Sun Jun 17 11:23:53 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: 10468853 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 05FB5600CC for ; Sun, 17 Jun 2018 11:49:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E9847287AD for ; Sun, 17 Jun 2018 11:49:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DE542287BD; Sun, 17 Jun 2018 11:49:44 +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 3F91E287AD for ; Sun, 17 Jun 2018 11:49:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6C9C86B0286; Sun, 17 Jun 2018 07:49:41 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 69FC16B0288; Sun, 17 Jun 2018 07:49:41 -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 5B5A46B0289; Sun, 17 Jun 2018 07:49:41 -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 181DE6B0286 for ; Sun, 17 Jun 2018 07:49:41 -0400 (EDT) Received: by mail-pl0-f72.google.com with SMTP id b65-v6so7198466plb.5 for ; Sun, 17 Jun 2018 04:49:41 -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=UwY2aYcEEx0vFc5f/62E0CRc1UzWqAU91Bg0msSoCgY=; b=GHhCvqOV/8nomDHOQmX8i3W+e+L7m8AFStvggu5vtLz1ojy7idMqGRmqjJns5EzVT4 NVUUjS/aYfHroEdwLtA6UjCDQjU2uAveox21UsaaglVxijMT9QOoxNxoDUS+XFJOLO1I sKS/QTblUrcrqOlbymWyxNiCr+sHqAUCdiN2z/tZsOkoNSmFJQ/f3UqOj0kZsHJ8I/49 tuFOZk4lKGhJ31OjwTHPhDEp7xoVH8n38AFBaBA81KyZXbKIN7hxx0Kfmc+J0E2Xqrpj lEvOcN15cNA2whHF7ZWEaiFVDBWnNOPjyHA+b4eZNj0Y+LMn0+dXS5TSTIaZXyhU3jf0 AmgA== X-Gm-Message-State: APt69E314dSqmT8kiSIQ8/ZwPaE2ra13MPj63+n6ukWkmJO4oSadB1Ej ixlCsLvwydK5bB8Bh8Cv+aOm9Oh7v7VexAQE19xRs2p06eAuLF9oJlEmzqFQ0iR6ktcYTs9cntH BOz9BCeJ0j7L5hZj2lRvz8BZ+PNilrETTJ1h9+HdkyClmQPQY00H9gjI0jG4MHxI= X-Received: by 2002:a63:bf0b:: with SMTP id v11-v6mr7447910pgf.29.1529236180756; Sun, 17 Jun 2018 04:49:40 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIc7npysZJwu/a9bfMdH7jFO4UuNvJ3XDNgjQJYTpnlS+isFuGKqN3vF8vedb3njGgTpL9X X-Received: by 2002:a63:bf0b:: with SMTP id v11-v6mr7447890pgf.29.1529236180115; Sun, 17 Jun 2018 04:49:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529236180; cv=none; d=google.com; s=arc-20160816; b=ZtMP/kwKEcwh8GfO09m7c+qXFgGd5CkGXcYraq45MhpZPYvbxeADmBMDXg23zKRWL3 ZZPTahtf71MIda04xhSrmCR4c/RYKpqNR/nurJeS8x/MZpx+RxGOAj0wL4HKIG0qmlcu n0ssQMYBRDlvwuD8aJDPzK+et0h9NILZr2LTvUZOhQz0OYfP12I+M7vIoZ8/sCKVGfax oDe6/9N2LJOqc7DQqKoVbrvW8PVcsMym4HO6VY7DdPMQQkhphTB5dkMRky6vqv/VQHsv 1crU3gH//OVPmgllsTQbDYNGPeN3ZFwFGbne8hH/LOJfzfl/vZIbrwdAh3p8Lfj3f5Zx t0DA== 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=UwY2aYcEEx0vFc5f/62E0CRc1UzWqAU91Bg0msSoCgY=; b=iShv2jc29skAbppHVfa357uGZqVJPezsn2zSC5VWiVFLhevQvWXXREVcy3crPmRCs8 tkg995LH6m/17Vx4sKz93JH6FU88VwJ5OmZinP5tSA5d0mkvty1NSgMKuRxWWkRIDKLj YpnvaVSK2H5Y0vF4SsAZQiQffPNWHDiIOV8kKF1GcYhfeRbKA/woUGTuBaiaCxTJxbL6 9UCrRKuJikuvLT+VNYVnWXB2rrk/pMZXIcbAtZiCl2rS142+g+LO9v/B4ahSQyPrn+KF gRfta8RDre1zMlXPR+2lfyKnVMTqV09fddzSA/6H5AHFaVWbZY3nleX1WAR24oRLgvJo oaZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=sN8XoPLv; 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 z4-v6si12932750pfl.31.2018.06.17.04.49.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Jun 2018 04:49:40 -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=sN8XoPLv; 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 3FDE5208E2; Sun, 17 Jun 2018 11:49:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1529236179; bh=z2UKrl+mhzYb0Gs8lWX6l9VFWCJ0u4F/Nq1Ts+pvvqE=; h=Subject:To:Cc:From:Date:From; b=sN8XoPLvLg0Jk7HaT/eP2sLdk6tzAcA8CNtVnzmK2zDBHmMsdSZLQa294LFg9AQGE r3sbu+Z8267dRh1xCYByXTDn1ac6xkDsn+TcG/0ERP/hbTFzJqFUaZL6QxTdQFmLTf KRe9Q7mBSuSlaMtOh5Fm9+H4PeXgWExJOnuYxLYU= Subject: Patch "x86/pkeys/selftests: Fix pointer math" has been added to the 4.16-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:53 +0200 Message-ID: <152923463314434@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.16-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.16 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:07:34 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.16/x86-pkeys-selftests-factor-out-instruction-page.patch queue-4.16/x86-pkeys-selftests-fix-pointer-math.patch queue-4.16/x86-pkeys-selftests-adjust-the-self-test-to-fresh-distros-that-export-the-pkeys-abi.patch queue-4.16/x86-pkeys-selftests-add-a-test-for-pkey-0.patch queue-4.16/x86-pkeys-selftests-stop-using-assert.patch queue-4.16/x86-pkeys-selftests-save-off-prot-for-allocations.patch queue-4.16/x86-pkeys-selftests-remove-dead-debugging-code-fix-dprint_in_signal.patch queue-4.16/x86-mpx-selftests-adjust-the-self-test-to-fresh-distros-that-export-the-mpx-abi.patch queue-4.16/x86-pkeys-selftests-add-prot_exec-test.patch queue-4.16/x86-pkeys-selftests-allow-faults-on-unknown-keys.patch queue-4.16/x86-pkeys-selftests-give-better-unexpected-fault-error-messages.patch queue-4.16/x86-pkeys-selftests-avoid-printf-in-signal-deadlocks.patch queue-4.16/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());