Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH v2 1/4] kselftests/arm64: add a basic Pointer
 Authentication test
To:     Amit Kachhap <amit.kachhap@arm.com>,
        Boyan Karatotev <boyan.karatotev@arm.com>,
        linux-arm-kernel@lists.infradead.org,
        linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org
Cc:     vincenzo.frascino@arm.com, Shuah Khan <shuah@kernel.org>,
        Catalin Marinas <catalin.marinas@arm.com>,
        Will Deacon <will@kernel.org>
References: <20200831110450.30188-1-boyan.karatotev@arm.com>
 <20200831110450.30188-2-boyan.karatotev@arm.com>
 <2e89a5ff-738b-5484-bd00-9ccdeccf9f60@arm.com>
From:   Boyan Karatotev <boian4o1@gmail.com>
Message-ID: <fa24987e-c8e9-0130-d2bc-ec114a729491@gmail.com>
Date:   Thu, 17 Sep 2020 14:38:01 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.12.0
MIME-Version: 1.0
In-Reply-To: <2e89a5ff-738b-5484-bd00-9ccdeccf9f60@arm.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 16/09/2020 1:11 pm, Amit Kachhap wrote:
> On 8/31/20 4:34 PM, Boyan Karatotev wrote:
>> PAuth signs and verifies return addresses on the stack. It does so by
>> +
>> +/* check that a corrupted PAC results in SIGSEGV */
>> +TEST_SIGNAL(corrupt_pac, SIGSEGV)
>> +{
>> +    ASSERT_PAUTH_ENABLED();
>> +
>> +    pac_corruptor();
>
> With 8.6-Pauth extension merged in arm tree [1]. It makes sense to
> verify PAC corruption for both SIGSEGV and SIGILL signals.
>
> Code something like below handles both the cases.
>
>
-----------------------------------------------------------------------------------
>
>  int exec_sign_all(struct signatures *signed_vals, size_t val)
> @@ -187,12 +188,29 @@ int exec_sign_all(struct signatures *signed_vals,
> size_t val)
>         return 0;
>  }
>
> -/* check that a corrupted PAC results in SIGSEGV */
> -TEST_SIGNAL(corrupt_pac, SIGSEGV)
> +sigjmp_buf jmpbuf;
> +void pac_signal_handler(int signum, siginfo_t *si, void *uc)
>  {
> -       ASSERT_PAUTH_ENABLED();
> +       if (signum == SIGSEGV || signum == SIGILL) {
> +               siglongjmp(jmpbuf, 1);
> +       }
> +}
> +
> +/* check that a corrupted PAC results in SIGSEGV or SIGILL */
> +TEST(corrupt_pac)
> +{
> +       struct sigaction sa;
>
> -       pac_corruptor();
> +       ASSERT_PAUTH_ENABLED();
> +       if (sigsetjmp(jmpbuf, 1) == 0) {
> +               sa.sa_sigaction = pac_signal_handler;
> +               sa.sa_flags = SA_SIGINFO;
> +               sigemptyset(&sa.sa_mask);
> +               sigaction(SIGSEGV, &sa, NULL);
> +               sigaction(SIGILL, &sa, NULL);
> +               pac_corruptor();
> +               ASSERT_TRUE(0) TH_LOG("SIGSEGV/SIGILL signal did not
> occur");
> +       }
>  }
>
>  /*
> @@ -265,7 +283,7 @@ TEST(single_thread_different_keys)
>
>                 tmp = n_same_single_set(&signed_vals, nkeys);
>
---------------------------------------------------------------------------------------
>
>
>
> Thanks,
> Amit Daniel
>
> [1]:
>
https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git/log/?h=for-next/ptrauth

Okay, I will add this and post it with the next version.

Regards,
Boyan