[LTP] [PATCH v4 3/3] syscalls/modify_ldt01: Refactor into new API
Andrea Cervesato
andrea.cervesato@suse.com
Mon Mar 31 10:33:04 CEST 2025
Hi!
LGTM
One more thing about test cases below, then we can merge the patch I guess.
On 3/28/25 20:33, Ricardo B. Marliere via ltp wrote:
> From: Ricardo B. Marlière <rbm@suse.com>
>
> Now that we're using the wrapped modify_ldt() from the lapi/ldt.h which
> uses tst_syscall(), it does not make sense to keep the first block of the
> original test. Also, merge modify_ldt03 into modify_ldt01.
>
> Signed-off-by: Ricardo B. Marlière <rbm@suse.com>
> ---
> testcases/kernel/syscalls/modify_ldt/.gitignore | 5 +-
> .../kernel/syscalls/modify_ldt/modify_ldt01.c | 258 ++++-----------------
> .../kernel/syscalls/modify_ldt/modify_ldt03.c | 105 ---------
> 3 files changed, 50 insertions(+), 318 deletions(-)
>
> diff --git a/testcases/kernel/syscalls/modify_ldt/.gitignore b/testcases/kernel/syscalls/modify_ldt/.gitignore
> index c0b8bbf5875af453b4880ef4b717fdb40d109ee7..c8817b2c3a811afdf40841dc1b81e4b2c034e7d8 100644
> --- a/testcases/kernel/syscalls/modify_ldt/.gitignore
> +++ b/testcases/kernel/syscalls/modify_ldt/.gitignore
> @@ -1,3 +1,2 @@
> -/modify_ldt01
> -/modify_ldt02
> -/modify_ldt03
> +modify_ldt01
> +modify_ldt02
> diff --git a/testcases/kernel/syscalls/modify_ldt/modify_ldt01.c b/testcases/kernel/syscalls/modify_ldt/modify_ldt01.c
> index 684e53772414ae468b4f168578596eabb27ef18b..958156f5dec1b0869433b3cafb387926a1791f71 100644
> --- a/testcases/kernel/syscalls/modify_ldt/modify_ldt01.c
> +++ b/testcases/kernel/syscalls/modify_ldt/modify_ldt01.c
> @@ -1,230 +1,68 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> - *
> - * Copyright (c) International Business Machines Corp., 2001
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License as published by
> - * the Free Software Foundation; either version 2 of the License, or
> - * (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
> - * the GNU General Public License for more details.
> - *
> - * You should have received a copy of the GNU General Public License
> - * along with this program; if not, write to the Free Software
> - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> + * Copyright (c) International Business Machines Corp., 2001
> + * 07/2001 Ported by Wayne Boyer
> + * Copyright (c) 2025 SUSE LLC Ricardo B. Marlière <rbm@suse.com>
> */
>
> -/*
> - * NAME
> - * modify_ldt01.c
> - *
> - * DESCRIPTION
> - * Testcase to check the error conditions for modify_ldt(2)
> +/*\
> + * Verify that modify_ldt() calls:
> *
> - * CALLS
> - * modify_ldt()
> - *
> - * ALGORITHM
> - * block1:
> - * Invoke modify_ldt() with a func value which is neither
> - * 0 or 1. Verify that ENOSYS is set.
> - * block2:
> - * Invoke mprotect() with ptr == NULL. Verify that EINVAL
> - * is set.
> - * block3:
> - * Create an LDT segment.
> - * Try to read from an invalid pointer.
> - * Verify that EFAULT is set.
> - *
> - * USAGE
> - * modify_ldt01
> - *
> - * HISTORY
> - * 07/2001 Ported by Wayne Boyer
> - *
> - * RESTRICTIONS
> - * None
> + * - Fails with EINVAL, when writing (func=1) to an invalid pointer
> + * - Fails with EFAULT, when reading (func=0) from an invalid pointer
> + * - Passes when reading (func=0) from a valid pointer
> */
>
> -#include "config.h"
> -#include "test.h"
> -
> -TCID_DEFINE(modify_ldt01);
> -int TST_TOTAL = 1;
> +#include "tst_test.h"
>
> -#if defined(__i386__) && defined(HAVE_MODIFY_LDT)
> -
> -#ifdef HAVE_ASM_LDT_H
> -#include <asm/ldt.h>
> -#endif
> -extern int modify_ldt(int, void *, unsigned long);
> -
> -#include <asm/unistd.h>
> -#include <errno.h>
> -
> -/* Newer ldt.h files use user_desc, instead of modify_ldt_ldt_s */
> -#ifdef HAVE_STRUCT_USER_DESC
> -typedef struct user_desc modify_ldt_s;
> -#elif HAVE_STRUCT_MODIFY_LDT_LDT_S
> -typedef struct modify_ldt_ldt_s modify_ldt_s;
> -#else
> -typedef struct modify_ldt_ldt_t {
> - unsigned int entry_number;
> - unsigned long int base_addr;
> - unsigned int limit;
> - unsigned int seg_32bit:1;
> - unsigned int contents:2;
> - unsigned int read_exec_only:1;
> - unsigned int limit_in_pages:1;
> - unsigned int seg_not_present:1;
> - unsigned int useable:1;
> - unsigned int empty:25;
> -} modify_ldt_s;
> -#endif
> -
> -int create_segment(void *, size_t);
> -void cleanup(void);
> -void setup(void);
> -
> -int main(int ac, char **av)
> -{
> - int lc;
> +#ifdef __i386__
> +#include "lapi/ldt.h"
> +#include "common.h"
>
> +static void *ptr;
> +static char *buf;
> +static struct tcase {
> + int tfunc;
> void *ptr;
> - int retval, func;
> -
> - int seg[4];
> -
> - tst_parse_opts(ac, av, NULL, NULL);
> -
> - setup();
> -
> - for (lc = 0; TEST_LOOPING(lc); lc++) {
> -
> - /* reset tst_count in case we are looping */
> - tst_count = 0;
> -
> - /*
> - * Check for ENOSYS.
> - */
> - ptr = malloc(10);
> - func = 100;
> - retval = modify_ldt(func, ptr, sizeof(ptr));
> - if (retval < 0) {
> - if (errno != ENOSYS) {
> - tst_resm(TFAIL, "modify_ldt() set invalid "
> - "errno, expected ENOSYS, got: %d",
> - errno);
> - } else {
> - tst_resm(TPASS,
> - "modify_ldt() set expected errno");
> - }
> - } else {
> - tst_resm(TFAIL, "modify_ldt error: "
> - "unexpected return value %d", retval);
> - }
> -
> - free(ptr);
> -
> - /*
> - * Check for EINVAL
> - */
> - ptr = 0;
> -
> - retval = modify_ldt(1, ptr, sizeof(ptr));
> - if (retval < 0) {
> - if (errno != EINVAL) {
> - tst_resm(TFAIL, "modify_ldt() set invalid "
> - "errno, expected EINVAL, got: %d",
> - errno);
> - } else {
> - tst_resm(TPASS,
> - "modify_ldt() set expected errno");
> - }
> - } else {
> - tst_resm(TFAIL, "modify_ldt error: "
> - "unexpected return value %d", retval);
> - }
> -
> - /*
> - * Create a new LDT segment.
> - */
> - if (create_segment(seg, sizeof(seg)) == -1) {
> - tst_brkm(TBROK, cleanup, "Creation of segment failed");
> - }
> -
> - /*
> - * Check for EFAULT
> - */
> - ptr = sbrk(0);
> -
> - retval = modify_ldt(0, ptr + 0xFFF, sizeof(ptr));
> - if (retval < 0) {
> - if (errno != EFAULT) {
> - tst_resm(TFAIL, "modify_ldt() set invalid "
> - "errno, expected EFAULT, got: %d",
> - errno);
> - } else {
> - tst_resm(TPASS,
> - "modify_ldt() set expected errno");
> - }
> - } else {
> - tst_resm(TFAIL, "modify_ldt error: "
> - "unexpected return value %d", retval);
> - }
> - }
> - cleanup();
> - tst_exit();
> -}
> -
> -/*
> - * create_segment() -
> - */
> -int create_segment(void *seg, size_t size)
> + unsigned long bytecount;
> + int exp_errno;
> +} tcases[] = {
> + { 1, (void *)0, 0, EINVAL },
We could extend EINVAL according to the man pages:
EINVAL ptr is 0, or func is 1 and bytecount is not equal to the
size of the structure user_desc, or func is 1 or 0x11 and
the new LDT entry has invalid values.
It should quite easy to achieve. We need 3 more use cases:
1. func = 1 and bytecount != sizeof(struct user_desc)
2. func = 1 and user_desc has some invalid values
3. same as 2. but func = 0x11
> + { 0, &ptr, sizeof(ptr), EFAULT },
> + { 0, &buf, sizeof(buf), 0 },
> +};
> +
> +void run(unsigned int i)
> {
> - modify_ldt_s entry;
> + struct tcase *tc = &tcases[i];
>
> - entry.entry_number = 0;
> - entry.base_addr = (unsigned long)seg;
> - entry.limit = size;
> - entry.seg_32bit = 1;
> - entry.contents = 0;
> - entry.read_exec_only = 0;
> - entry.limit_in_pages = 0;
> - entry.seg_not_present = 0;
> -
> - return modify_ldt(1, &entry, sizeof(entry));
> + if (tc->exp_errno)
> + TST_EXP_FAIL(modify_ldt(tc->tfunc, tc->ptr, tc->bytecount),
> + tc->exp_errno);
> + else
> + TST_EXP_POSITIVE(modify_ldt(tc->tfunc, tc->ptr, tc->bytecount));
> }
>
> void setup(void)
> {
> + int seg[4];
>
> - tst_sig(FORK, DEF_HANDLER, cleanup);
> -
> - TEST_PAUSE;
> -}
> -
> -void cleanup(void)
> -{
> -
> + ptr = sbrk(0) + 0xFFF;
> + create_segment(seg, sizeof(seg));
> + tcases[1].ptr = ptr;
> }
>
> -#elif HAVE_MODIFY_LDT
> -int main(void)
> -{
> - tst_brkm(TCONF,
> - NULL,
> - "modify_ldt is available but not tested on the platform than __i386__");
> -}
> +static struct tst_test test = {
> + .test = run,
> + .tcnt = ARRAY_SIZE(tcases),
> + .setup = setup,
> + .bufs =
> + (struct tst_buffers[]){
> + { &buf, .size = sizeof(struct user_desc) },
> + {},
> + },
> +};
>
> #else
> -int main(void)
> -{
> - tst_resm(TINFO, "modify_ldt01 test only for ix86");
> - tst_exit();
> -}
> -
> -#endif /* defined(__i386__) */
> +TST_TEST_TCONF("Test supported only on i386");
> +#endif /* __i386__ */
> diff --git a/testcases/kernel/syscalls/modify_ldt/modify_ldt03.c b/testcases/kernel/syscalls/modify_ldt/modify_ldt03.c
> deleted file mode 100644
> index 01730e0e14ae98a934e7b66c9058454506bbe064..0000000000000000000000000000000000000000
> --- a/testcases/kernel/syscalls/modify_ldt/modify_ldt03.c
> +++ /dev/null
> @@ -1,105 +0,0 @@
> -/*
> - * Copyright (c) 2014 Fujitsu Ltd.
> - * Author: Zeng Linggang <zenglg.jy@cn.fujitsu.com>
> - *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms of version 2 of the GNU General Public License as
> - * published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it would be useful, but
> - * WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
> - *
> - * You should have received a copy of the GNU General Public License along
> - * with this program.
> - */
> -/*
> - * DESCRIPTION
> - * Basic test for modify_ldt(2) using func=0 argument.
> - */
> -
> -#include "config.h"
> -#include "test.h"
> -
> -char *TCID = "modify_ldt03";
> -int TST_TOTAL = 1;
> -
> -#if defined(__i386__) && defined(HAVE_MODIFY_LDT)
> -
> -#ifdef HAVE_ASM_LDT_H
> -# include <asm/ldt.h>
> -#endif
> -extern int modify_ldt(int, void *, unsigned long);
> -
> -#include <asm/unistd.h>
> -#include <string.h>
> -#include <sys/wait.h>
> -#include <errno.h>
> -#include "safe_macros.h"
> -
> -#ifdef HAVE_STRUCT_USER_DESC
> -# define SIZE sizeof(struct user_desc)
> -#else
> -# define SIZE 16
> -#endif
> -
> -static char buf[SIZE];
> -static void cleanup(void);
> -static void setup(void);
> -
> -int main(int ac, char **av)
> -{
> - int lc;
> -
> - tst_parse_opts(ac, av, NULL, NULL);
> -
> - setup();
> -
> - for (lc = 0; TEST_LOOPING(lc); lc++) {
> -
> - tst_count = 0;
> -
> - TEST(modify_ldt(0, buf, SIZE));
> -
> - if (TEST_RETURN < 0) {
> - tst_resm(TFAIL | TTERRNO,
> - "modify_ldt() failed with errno: %s",
> - strerror(TEST_ERRNO));
> - } else {
> - tst_resm(TPASS, "modify_ldt() tested success");
> - }
> - }
> -
> - cleanup();
> - tst_exit();
> -}
> -
> -static void setup(void)
> -{
> - tst_sig(NOFORK, DEF_HANDLER, cleanup);
> -
> - TEST_PAUSE;
> -}
> -
> -static void cleanup(void)
> -{
> -}
> -
> -#elif HAVE_MODIFY_LDT
> -
> -int main(void)
> -{
> - tst_brkm(TCONF,
> - NULL, "modify_ldt is available but not tested on the platform than "
> - "__i386__");
> -}
> -
> -#else /* if defined(__i386__) */
> -
> -int main(void)
> -{
> - tst_resm(TINFO, "modify_ldt03 test only for ix86");
> - tst_exit();
> -}
> -
> -#endif /* if defined(__i386__) */
>
Kind regards,
Andrea Cervesato
More information about the ltp
mailing list