lkml.org 
[lkml]   [2018]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 63/67] x86/pkeys/selftests: Rename si_pkey to siginfo_pkey
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Dave Hansen <dave.hansen@linux.intel.com>

    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 <dave.hansen@linux.intel.com>
    Acked-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Andy Lutomirski <luto@kernel.org>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Brian Gerst <brgerst@gmail.com>
    Cc: Denys Vlasenko <dvlasenk@redhat.com>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Cc: Josh Poimboeuf <jpoimboe@redhat.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Link: http://lkml.kernel.org/r/20171111001231.DFFC8285@viggo.jf.intel.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    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
    @@ -249,7 +249,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;
    @@ -291,9 +291,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) ||
    @@ -305,7 +305,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++;

    \
     
     \ /
      Last update: 2018-03-27 18:34    [W:4.233 / U:0.368 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site