From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx493DDaUnkRy1agdpBFdmo/zkdyC6x3lrt+xr/N5cVOnwa6ejP7BCOBOjUycZADZNJpcmJ5q ARC-Seal: i=1; a=rsa-sha256; t=1522168709; cv=none; d=google.com; s=arc-20160816; b=XZtGAyxhRojMMTvCG4fKWBKrMmDwNArJNzzD6oir7xXVNQRL20O1UycSdR8gD025Qj I1Qg18mdkSkPsDIL5qGAKMrWLCcpQYuVysS7DRRtvoGrMsdXpTQOoAFBseSUGbhjThGF 7P1jFBxV+/Kv2gZZGhOpH3X+DdAP5uJq9Jp+8JRndP1z2WvEfFTf8gbmmBLcSUNykhJC pXq9B+UG5l+delu3Ax6g8rWPAxLQs7eFfLi2nUQxoy2NMmJKQFtB2HOYPYSFjk2lnwKF cSLdOtB/rZQSOMCLCYtZBkTN5BArpZRd/8SJ7I+p3y/FSvby5u8RqdLfW9lcoxWad5hy 082Q== 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=nZWe5EZQw20X0j/oKV28yHCFp+RJSXYirC0IxIpGAwI=; b=dPcVThSbULwdWHRnsVCMM1xnKDX1nCSTgtlGHbTIGzdb6Umjbaz0nWQoXM0wSFS94g cov6Xdp6D0Ssvk75QdaOEzJtxRIxzdAf8ZuQ/jj612u/rU8i0nvEBMkxt+iVq0EwTyaV SerGmBs7LagMoIwQcW5Chn8nQpXpeI4dNiJRRbhQH7e+AK9kbXEceeYZMYrMYkq9xzN5 Y09Gl7Yb0HLjM5RL4gmM3Vrq13V6e4q9ettI5oJTZdfJFEbNurSK3oFG1/vxeZwBJr9+ bu4sI/dHLAAAioHMjmtGZFX70qRKbiB5ECqywKN2TxTjzS0sNf0F06Ffd9urX/0x+AbP P83A== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dave Hansen , Thomas Gleixner , Andy Lutomirski , Borislav Petkov , Brian Gerst , Denys Vlasenko , "H. Peter Anvin" , Josh Poimboeuf , Linus Torvalds , Peter Zijlstra , Ingo Molnar Subject: [PATCH 4.14 098/101] x86/pkeys/selftests: Rename si_pkey to siginfo_pkey Date: Tue, 27 Mar 2018 18:28:10 +0200 Message-Id: <20180327162756.002131626@linuxfoundation.org> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180327162749.993880276@linuxfoundation.org> References: <20180327162749.993880276@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1596109279559846402?= X-GMAIL-MSGID: =?utf-8?q?1596109576436216559?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dave Hansen commit 91c49c2deb96ffc3c461eaae70219d89224076b7 upstream. 'si_pkey' is now #defined to be the name of the new siginfo field that protection keys uses. Rename it not to conflict. Signed-off-by: Dave Hansen Acked-by: Thomas Gleixner Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20171111001231.DFFC8285@viggo.jf.intel.com Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- tools/testing/selftests/x86/protection_keys.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) --- a/tools/testing/selftests/x86/protection_keys.c +++ b/tools/testing/selftests/x86/protection_keys.c @@ -250,7 +250,7 @@ void signal_handler(int signum, siginfo_ unsigned long ip; char *fpregs; u32 *pkru_ptr; - u64 si_pkey; + u64 siginfo_pkey; u32 *si_pkey_ptr; int pkru_offset; fpregset_t fpregset; @@ -292,9 +292,9 @@ void signal_handler(int signum, siginfo_ 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); - si_pkey = *si_pkey_ptr; - pkey_assert(si_pkey < NR_PKEYS); - last_si_pkey = si_pkey; + 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) || @@ -306,7 +306,7 @@ void signal_handler(int signum, siginfo_ 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()); - dprintf1("si_pkey from siginfo: %jx\n", si_pkey); + dprintf1("pkey from siginfo: %jx\n", siginfo_pkey); *(u64 *)pkru_ptr = 0x00000000; dprintf1("WARNING: set PRKU=0 to allow faulting instruction to continue\n"); pkru_faults++;