[2/2] sysdeps: tst-bz21269: handle ENOSYS & skip appropriately
Checks
| Context |
Check |
Description |
| redhat-pt-bot/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
| redhat-pt-bot/TryBot-32bit |
success
|
Build for i686
|
| linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 |
success
|
Testing passed
|
| linaro-tcwg-bot/tcwg_glibc_check--master-arm |
success
|
Testing passed
|
| linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 |
success
|
Testing passed
|
| linaro-tcwg-bot/tcwg_glibc_build--master-arm |
success
|
Testing passed
|
Commit Message
SYS_modify_ldt requires CONFIG_MODIFY_LDT_SYSCALL to be set in the kernel, which
some distributions may disable for hardening. Check if that's the case (unset)
and mark the test as UNSUPPORTED if so.
Signed-off-by: Sam James <sam@gentoo.org>
---
sysdeps/unix/sysv/linux/i386/tst-bz21269.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
Comments
On 8/5/23 02:00, Sam James via Libc-alpha wrote:
> SYS_modify_ldt requires CONFIG_MODIFY_LDT_SYSCALL to be set in the kernel, which
> some distributions may disable for hardening. Check if that's the case (unset)
> and mark the test as UNSUPPORTED if so.
>
> Signed-off-by: Sam James <sam@gentoo.org>
> ---
> sysdeps/unix/sysv/linux/i386/tst-bz21269.c | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/sysdeps/unix/sysv/linux/i386/tst-bz21269.c b/sysdeps/unix/sysv/linux/i386/tst-bz21269.c
> index f508ef8f16..345b4ebc45 100644
> --- a/sysdeps/unix/sysv/linux/i386/tst-bz21269.c
> +++ b/sysdeps/unix/sysv/linux/i386/tst-bz21269.c
> @@ -52,7 +52,16 @@ xset_thread_area (struct user_desc *u_info)
> static void
> xmodify_ldt (int func, const void *ptr, unsigned long bytecount)
> {
> - TEST_VERIFY_EXIT (syscall (SYS_modify_ldt, func, ptr, bytecount) == 0);
> + long ret = syscall (SYS_modify_ldt, func, ptr, bytecount);
> +
> + if (ret == -1)
> + {
> + if (errno == ENOSYS)
> + FAIL_UNSUPPORTED ("modify_ldt not supported");
> + FAIL_EXIT1 ("semget failed (errno=%d)", errno);
...How are semget and modify_ldt related here ?
> + }
> +
> + return 0;
> }
>
> static int
> On 5 Aug 2023, at 16:41, Gabriel Ravier <gabravier@gmail.com> wrote:
>
> On 8/5/23 02:00, Sam James via Libc-alpha wrote:
>> SYS_modify_ldt requires CONFIG_MODIFY_LDT_SYSCALL to be set in the kernel, which
>> some distributions may disable for hardening. Check if that's the case (unset)
>> and mark the test as UNSUPPORTED if so.
>>
>> Signed-off-by: Sam James <sam@gentoo.org>
>> ---
>> sysdeps/unix/sysv/linux/i386/tst-bz21269.c | 11 ++++++++++-
>> 1 file changed, 10 insertions(+), 1 deletion(-)
>>
>> diff --git a/sysdeps/unix/sysv/linux/i386/tst-bz21269.c b/sysdeps/unix/sysv/linux/i386/tst-bz21269.c
>> index f508ef8f16..345b4ebc45 100644
>> --- a/sysdeps/unix/sysv/linux/i386/tst-bz21269.c
>> +++ b/sysdeps/unix/sysv/linux/i386/tst-bz21269.c
>> @@ -52,7 +52,16 @@ xset_thread_area (struct user_desc *u_info)
>> static void
>> xmodify_ldt (int func, const void *ptr, unsigned long bytecount)
>> {
>> - TEST_VERIFY_EXIT (syscall (SYS_modify_ldt, func, ptr, bytecount) == 0);
>> + long ret = syscall (SYS_modify_ldt, func, ptr, bytecount);
>> +
>> + if (ret == -1)
>> + {
>> + if (errno == ENOSYS)
>> + FAIL_UNSUPPORTED ("modify_ldt not supported");
>> + FAIL_EXIT1 ("semget failed (errno=%d)", errno);
> ...How are semget and modify_ldt related here ?
>> + }
>> +
Copy-paste error last night I didn't clean up ;)
Thanks!
>> + return 0;
>> }
>> static int
>
>
@@ -52,7 +52,16 @@ xset_thread_area (struct user_desc *u_info)
static void
xmodify_ldt (int func, const void *ptr, unsigned long bytecount)
{
- TEST_VERIFY_EXIT (syscall (SYS_modify_ldt, func, ptr, bytecount) == 0);
+ long ret = syscall (SYS_modify_ldt, func, ptr, bytecount);
+
+ if (ret == -1)
+ {
+ if (errno == ENOSYS)
+ FAIL_UNSUPPORTED ("modify_ldt not supported");
+ FAIL_EXIT1 ("semget failed (errno=%d)", errno);
+ }
+
+ return 0;
}
static int