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;
Date:   Tue, 22 Dec 2020 20:04:22 -0800 (PST)
Subject:     Re: [PATCH] riscv: return -ENOSYS for syscall -1
In-Reply-To: <20201222162219.GA710211@cisco>
CC:     schwab@suse.de, linux-riscv@lists.infradead.org,
        linux-kernel@vger.kernel.org,
        Paul Walmsley <paul.walmsley@sifive.com>,
        david.abdurachmanov@sifive.com
From:   Palmer Dabbelt <palmer@dabbelt.com>
To:     tycho@tycho.pizza
Message-ID: <mhng-866c451a-5886-441b-9914-acc31fe9dc71@palmerdabbelt-glaptop>
Mime-Version: 1.0 (MHng)
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk

On Tue, 22 Dec 2020 08:22:19 PST (-0800), tycho@tycho.pizza wrote:
> On Mon, Dec 21, 2020 at 11:52:00PM +0100, Andreas Schwab wrote:
>> Properly return -ENOSYS for syscall -1 instead of leaving the return value
>> uninitialized.  This fixes the strace teststuite.
>>
>> Fixes: 5340627e3fe0 ("riscv: add support for SECCOMP and SECCOMP_FILTER")
>> Signed-off-by: Andreas Schwab <schwab@suse.de>
>> ---
>>  arch/riscv/kernel/entry.S | 9 +--------
>>  1 file changed, 1 insertion(+), 8 deletions(-)
>>
>> diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S
>> index 524d918f3601..d07763001eb0 100644
>> --- a/arch/riscv/kernel/entry.S
>> +++ b/arch/riscv/kernel/entry.S
>> @@ -186,14 +186,7 @@ check_syscall_nr:
>>  	 * Syscall number held in a7.
>>  	 * If syscall number is above allowed value, redirect to ni_syscall.
>>  	 */
>> -	bge a7, t0, 1f
>> -	/*
>> -	 * Check if syscall is rejected by tracer, i.e., a7 == -1.
>> -	 * If yes, we pretend it was executed.
>> -	 */
>> -	li t1, -1
>> -	beq a7, t1, ret_from_syscall_rejected
>> -	blt a7, t1, 1f
>> +	bgeu a7, t0, 1f
>
> IIUC, this is all dead code anyway for the path where seccomp actually
> rejects the syscall, since it should do the rejection directly in
> handle_syscall_trace_enter(), which is called above this hunk. So it
> seems good to me.
>
> Reviewed-by: Tycho Andersen <tycho@tycho.pizza>

Thanks, this is on fixes.