[LTP] [PATCH 4/4] syscalls: lchown03: Convert to new API
Andrea Cervesato
andrea.cervesato@suse.com
Thu Jul 17 13:46:58 CEST 2025
Hi!
On 7/2/25 12:25 PM, Ricardo B. Marlière via ltp wrote:
> From: Ricardo B. Marlière <rbm@suse.com>
>
> Signed-off-by: Ricardo B. Marlière <rbm@suse.com>
> ---
> testcases/kernel/syscalls/lchown/Makefile | 5 -
> testcases/kernel/syscalls/lchown/lchown03.c | 170 +++++++---------------------
> 2 files changed, 41 insertions(+), 134 deletions(-)
>
> diff --git a/testcases/kernel/syscalls/lchown/Makefile b/testcases/kernel/syscalls/lchown/Makefile
> index 7c76afea572e8ba6c5509714ba6f9f45a7b2d4d7..1a66088e3206b2073a3cac2e62a71115ece9b4e7 100644
> --- a/testcases/kernel/syscalls/lchown/Makefile
> +++ b/testcases/kernel/syscalls/lchown/Makefile
> @@ -3,13 +3,8 @@
>
> top_srcdir ?= ../../../..
>
> -# Remove after rewriting all tests to the new API.
> -USE_LEGACY_COMPAT_16_H := 1
> -
> include $(top_srcdir)/include/mk/testcases.mk
>
> -SRCS := $(sort $(wildcard $(abs_srcdir)/lchown*.c))
> -
> include $(abs_srcdir)/../utils/compat_16.mk
>
> include $(top_srcdir)/include/mk/generic_leaf_target.mk
> diff --git a/testcases/kernel/syscalls/lchown/lchown03.c b/testcases/kernel/syscalls/lchown/lchown03.c
> index ecb6ed64dfd472d56abbc5a4fe5da67a48919c58..95d843353af429b6706453b8a2e28bb1f628f65f 100644
> --- a/testcases/kernel/syscalls/lchown/lchown03.c
> +++ b/testcases/kernel/syscalls/lchown/lchown03.c
> @@ -1,153 +1,65 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * 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; if not, write the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
> - */
> -/*
> - * Test Description:
> - * Verify that,
> - * 1. lchown() fails with -1 return value and sets errno to ELOOP
> - * if too many symbolic links were encountered in resolving path.
> - * 2. lchown() fails with -1 return value and sets errno to EROFS
> - * if the file is on a read-only file system.
> + * Author: Zeng Linggang <zenglg.jy@cn.fujitsu.com>
> + * Copyright (c) 2025 SUSE LLC Ricardo B. Marlière <rbm@suse.com>
> */
>
> -#include <stdio.h>
> -#include <stdlib.h>
> -#include <unistd.h>
> -#include <fcntl.h>
> -#include <errno.h>
> -#include <string.h>
> -#include <signal.h>
> -#include <grp.h>
> -#include <pwd.h>
> -#include <sys/types.h>
> -#include <sys/stat.h>
> -#include <sys/mman.h>
> -#include <sys/mount.h>
> -
> -#include "test.h"
> -#include "safe_macros.h"
> -
> -/*
> - * Don't forget to remove USE_LEGACY_COMPAT_16_H from Makefile after
> - * rewriting all tests to the new API.
> +/*\
> + * Verify that lchown(2) fails with errno:
> + *
> + * - ELOOP, if too many symbolic links were encountered in resolving path.
> + * - EROFS, if the file is on a read-only file system.
> */
> -#include "compat_16.h"
>
> -#define DIR_MODE (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP| \
> - S_IXGRP|S_IROTH|S_IXOTH)
> -#define TEST_EROFS "mntpoint"
> +#include "tst_test.h"
> +#include "compat_tst_16.h"
>
> -static char test_eloop[PATH_MAX] = ".";
> -static const char *device;
> -static int mount_flag;
> +#define DIR_MODE \
> + (S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH)
Please remember to run "make check"
lchown03.c:19: WARNING: Symbolic permissions 'S_IRUSR | S_IWUSR |
S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH' are not pref
erred. Consider using octal permissions '0755'.
> +#define TEST_EROFS "mntpoint"
> +
> +static char *test_eloop;
>
> static struct test_case_t {
> char *pathname;
> int exp_errno;
> } test_cases[] = {
> - {test_eloop, ELOOP},
> - {TEST_EROFS, EROFS},
> + { NULL, ELOOP },
> + { TEST_EROFS, EROFS },
> };
>
> -TCID_DEFINE(lchown03);
> -int TST_TOTAL = ARRAY_SIZE(test_cases);
> -
> -static void setup(void);
> -static void lchown_verify(const struct test_case_t *);
> -static void cleanup(void);
> -
> -int main(int argc, char *argv[])
> +static void run(unsigned int i)
> {
> - int lc;
> - int i;
> -
> - tst_parse_opts(argc, argv, NULL, NULL);
> + uid_t user_id;
> + gid_t group_id;
> + struct test_case_t *tc = &test_cases[i];
>
> - setup();
> + UID16_CHECK((user_id = geteuid()), "lchown");
> + GID16_CHECK((group_id = getegid()), "lchown");
>
> - for (lc = 0; TEST_LOOPING(lc); lc++) {
> - tst_count = 0;
> - for (i = 0; i < TST_TOTAL; i++)
> - lchown_verify(&test_cases[i]);
> - }
> -
> - cleanup();
> - tst_exit();
> + TST_EXP_FAIL(lchown(tc->pathname, user_id, group_id), tc->exp_errno);
> }
>
> static void setup(void)
> {
> - int i;
> - const char *fs_type;
> -
> - tst_require_root();
> -
> - tst_sig(NOFORK, DEF_HANDLER, cleanup);
> -
> - TEST_PAUSE;
> -
> - tst_tmpdir();
> -
> - fs_type = tst_dev_fs_type();
> - device = tst_acquire_device(cleanup);
> -
> - if (!device)
> - tst_brkm(TCONF, cleanup, "Failed to acquire device");
> -
> - SAFE_MKDIR(cleanup, "test_eloop", DIR_MODE);
> - SAFE_SYMLINK(cleanup, "../test_eloop", "test_eloop/test_eloop");
> - for (i = 0; i < 43; i++)
> + strcpy(test_eloop, ".");
> + SAFE_MKDIR("test_eloop", DIR_MODE);
> + SAFE_SYMLINK("../test_eloop", "test_eloop/test_eloop");
> + for (int i = 0; i < 43; i++)
> strcat(test_eloop, "/test_eloop");
Please use a safer way to create strings, for example snprintf()
> -
> - tst_mkfs(cleanup, device, fs_type, NULL, NULL);
> - SAFE_MKDIR(cleanup, TEST_EROFS, DIR_MODE);
> - SAFE_MOUNT(cleanup, device, TEST_EROFS, fs_type, MS_RDONLY, NULL);
> - mount_flag = 1;
> -}
> -
> -static void lchown_verify(const struct test_case_t *test)
> -{
> - UID16_CHECK(geteuid(), "lchown", cleanup)
> - GID16_CHECK(getegid(), "lchown", cleanup)
> -
> - TEST(LCHOWN(cleanup, test->pathname, geteuid(), getegid()));
> -
> - if (TEST_RETURN != -1) {
> - tst_resm(TFAIL, "lchown() returned %ld, expected -1, errno=%d",
> - TEST_RETURN, test->exp_errno);
> - return;
> - }
> -
> - if (TEST_ERRNO == test->exp_errno) {
> - tst_resm(TPASS | TTERRNO, "lchown() failed as expected");
> - } else {
> - tst_resm(TFAIL | TTERRNO,
> - "lchown() failed unexpectedly; expected: %d - %s",
> - test->exp_errno,
> - strerror(test->exp_errno));
> - }
> + test_cases[0].pathname = test_eloop;
> }
>
> -static void cleanup(void)
> -{
> - if (mount_flag && tst_umount(TEST_EROFS) < 0)
> - tst_resm(TWARN | TERRNO, "umount device:%s failed", device);
> -
> - if (device)
> - tst_release_device(device);
> -
> - tst_rmdir();
> -}
> +static struct tst_test test = {
> + .tcnt = ARRAY_SIZE(test_cases),
> + .test = run,
> + .setup = setup,
> + .needs_root = 1,
> + .needs_rofs = 1,
> + .mntpoint = TEST_EROFS,
> + .bufs = (struct tst_buffers[]){
> + { &test_eloop, .size = PATH_MAX },
> + {},
> + },
> +};
>
- Andrea
More information about the ltp
mailing list