[PATCH] ARM64: Update __NR_compat_syscalls for statmount/listmount

[PATCH] ARM64: Update __NR_compat_syscalls for statmount/listmount

[Florian Fainelli]

Commit d8b0f5465012 ("wire up syscalls for statmount/listmount") added
two new system calls to arch/arm64/include/asm/unistd32.h but forgot to
update the __NR_compat_syscalls number, thus causing the following build
failures:

./arch/arm64/include/asm/unistd32.h:922:24: error: array index in initializer exceeds array bounds
  922 | #define __NR_statmount 457
      |                        ^~~
arch/arm64/kernel/sys32.c:130:34: note: in definition of macro '__SYSCALL'
  130 | #define __SYSCALL(nr, sym)      [nr] = __arm64_##sym,
      |                                  ^~

Bump up the number by two to accomodate for the new system calls added.

Fixes: d8b0f5465012 ("wire up syscalls for statmount/listmount")
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
---
 arch/arm64/include/asm/unistd.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h
index 531effca5f1f..b63f870debaf 100644
--- a/arch/arm64/include/asm/unistd.h
+++ b/arch/arm64/include/asm/unistd.h
@@ -39,7 +39,7 @@
 #define __ARM_NR_compat_set_tls		(__ARM_NR_COMPAT_BASE + 5)
 #define __ARM_NR_COMPAT_END		(__ARM_NR_COMPAT_BASE + 0x800)
 
-#define __NR_compat_syscalls		457
+#define __NR_compat_syscalls		459
 #endif
 
 #define __ARCH_WANT_SYS_CLONE
-- 
2.34.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] ARM64: Update __NR_compat_syscalls for statmount/listmount

[Will Deacon]

On Mon, Jan 08, 2024 at 05:09:04PM -0800, Florian Fainelli wrote:
> Commit d8b0f5465012 ("wire up syscalls for statmount/listmount") added
> two new system calls to arch/arm64/include/asm/unistd32.h but forgot to
> update the __NR_compat_syscalls number, thus causing the following build
> failures:
> 
> ./arch/arm64/include/asm/unistd32.h:922:24: error: array index in initializer exceeds array bounds
>   922 | #define __NR_statmount 457
>       |                        ^~~
> arch/arm64/kernel/sys32.c:130:34: note: in definition of macro '__SYSCALL'
>   130 | #define __SYSCALL(nr, sym)      [nr] = __arm64_##sym,
>       |                                  ^~
> 
> Bump up the number by two to accomodate for the new system calls added.
> 
> Fixes: d8b0f5465012 ("wire up syscalls for statmount/listmount")
> Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
> ---
>  arch/arm64/include/asm/unistd.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h
> index 531effca5f1f..b63f870debaf 100644
> --- a/arch/arm64/include/asm/unistd.h
> +++ b/arch/arm64/include/asm/unistd.h
> @@ -39,7 +39,7 @@
>  #define __ARM_NR_compat_set_tls		(__ARM_NR_COMPAT_BASE + 5)
>  #define __ARM_NR_COMPAT_END		(__ARM_NR_COMPAT_BASE + 0x800)
>  
> -#define __NR_compat_syscalls		457
> +#define __NR_compat_syscalls		459
>  #endif
>  
>  #define __ARCH_WANT_SYS_CLONE
> -- 
> 2.34.1

Acked-by: Will Deacon <will@kernel.org>

Will

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] ARM64: Update __NR_compat_syscalls for statmount/listmount

[Florian Fainelli]

[-- Attachment #1.1: Type: text/plain, Size: 1790 bytes --]

On 1/9/24 01:50, Will Deacon wrote:
> On Mon, Jan 08, 2024 at 05:09:04PM -0800, Florian Fainelli wrote:
>> Commit d8b0f5465012 ("wire up syscalls for statmount/listmount") added
>> two new system calls to arch/arm64/include/asm/unistd32.h but forgot to
>> update the __NR_compat_syscalls number, thus causing the following build
>> failures:
>>
>> ./arch/arm64/include/asm/unistd32.h:922:24: error: array index in initializer exceeds array bounds
>>    922 | #define __NR_statmount 457
>>        |                        ^~~
>> arch/arm64/kernel/sys32.c:130:34: note: in definition of macro '__SYSCALL'
>>    130 | #define __SYSCALL(nr, sym)      [nr] = __arm64_##sym,
>>        |                                  ^~
>>
>> Bump up the number by two to accomodate for the new system calls added.
>>
>> Fixes: d8b0f5465012 ("wire up syscalls for statmount/listmount")
>> Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
>> ---
>>   arch/arm64/include/asm/unistd.h | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h
>> index 531effca5f1f..b63f870debaf 100644
>> --- a/arch/arm64/include/asm/unistd.h
>> +++ b/arch/arm64/include/asm/unistd.h
>> @@ -39,7 +39,7 @@
>>   #define __ARM_NR_compat_set_tls		(__ARM_NR_COMPAT_BASE + 5)
>>   #define __ARM_NR_COMPAT_END		(__ARM_NR_COMPAT_BASE + 0x800)
>>   
>> -#define __NR_compat_syscalls		457
>> +#define __NR_compat_syscalls		459
>>   #endif
>>   
>>   #define __ARCH_WANT_SYS_CLONE
>> -- 
>> 2.34.1
> 
> Acked-by: Will Deacon <will@kernel.org>

Thanks Will, looks like Linus already fast tracked the change:

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f0a78b3e2a0c842cc7b4c2686f4a35681f02ca72
-- 
Florian


[-- Attachment #1.2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4221 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel