[PATCH] [PATCH] Update the size of auxv to respect the new constant added in e92f469b0771e6db9688a58c0e34a8342da6a6bc

[Alexandre Ghiti]

On 29/03/2024 14:22, Conor Dooley wrote:
> On Fri, Mar 29, 2024 at 01:25:48PM +0100, Alexandre Ghiti wrote:
>> Hi Victor,
>>
>> On 02/01/2024 14:36, victor at torrio.net wrote:
>>> From: Victor Isaev <isv at google.com>
>>>
>>> Commit e92f469b0771 ("riscv: signal: Report signal frame size to
>>> userspace via auxv") has added a new constant AT_MINSIGSTKSZ but
>>> failed to increment the size of auxv, keeping AT_VECTOR_SIZE_ARCH
>>> at 9.
>>> This fix correctly increments AT_VECTOR_SIZE_ARCH to 10, following
>>> the approach in the commit 94b07c1f8c39 ("arm64: signal: Report
>>> signal frame size to userspace via auxv")
>>>
>>> Reported-by: Ivan Komarov <ivan.komarov at dfyz.info>
>>> Closes: https://lore.kernel.org/linux-riscv/CY3Z02NYV1C4.11BLB9PLVW9G1@fedora/
>>> Fixes: e92f469b0771 ("riscv: signal: Report signal frame size to userspace via auxv")
>>> Signed-off-by: Victor Isaev <isv at google.com>
>>>
>>> ---
>>>    arch/riscv/include/uapi/asm/auxvec.h | 2 +-
>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/arch/riscv/include/uapi/asm/auxvec.h b/arch/riscv/include/uapi/asm/auxvec.h
>>> index 10aaa83db89e..95050ebe9ad0 100644
>>> --- a/arch/riscv/include/uapi/asm/auxvec.h
>>> +++ b/arch/riscv/include/uapi/asm/auxvec.h
>>> @@ -34,7 +34,7 @@
>>>    #define AT_L3_CACHEGEOMETRY	47
>>>    /* entries in ARCH_DLINFO */
>>> -#define AT_VECTOR_SIZE_ARCH	9
>>> +#define AT_VECTOR_SIZE_ARCH	10
>>>    #define AT_MINSIGSTKSZ		51
>>>    #endif /* _UAPI_ASM_RISCV_AUXVEC_H */
>>
>> So we discussed this patch in the last Patchwork meeting, and it needs to be
>> merged as it is a valid fix. But, the subject is wrong and then the patch
>> can't be merged as-is, can you respin another version with the following
>> subject please:
>>
>> riscv: Fix the number of arch-specific auxiliary vectors
>>
>> Or something that best suits you. No pressure, but if you don't, I'll respin
>> myself a new version keeping your SoB of course.
> I think what you missed in the Patchwork meeting is that Palmer manually
> fixed this up and it is on fixes:
> https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git/commit/?h=fixes&id=13dddf9319808badd2c1f5d7007b4e82838a648e


Did not even cross my mind to check that the fixes branch had any update :)


>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv