Hi! > Add new error number tests for linkat(2): > * ENAMETOOLONG > * EEXIST > * ELOOP > * EACCES > * EMLINK > * EROFS > > Signed-off-by: Zeng Linggang <[email protected]> > --- > runtest/syscalls | 1 + > testcases/kernel/syscalls/.gitignore | 1 + > testcases/kernel/syscalls/linkat/linkat02.c | 296 > ++++++++++++++++++++++++++++ > 3 files changed, 298 insertions(+) > create mode 100644 testcases/kernel/syscalls/linkat/linkat02.c > > diff --git a/runtest/syscalls b/runtest/syscalls > index afa7976..4a6b891 100644 > --- a/runtest/syscalls > +++ b/runtest/syscalls > @@ -487,6 +487,7 @@ link07 link07 > > #linkat test cases > linkat01 linkat01 > +linkat02 linkat02 -D DEVICE -T DEVICE_FS_TYPE
Please update the entry to the new format. > listen01 listen01 > > diff --git a/testcases/kernel/syscalls/.gitignore > b/testcases/kernel/syscalls/.gitignore > index 91cf0f1..d1a8547 100644 > --- a/testcases/kernel/syscalls/.gitignore > +++ b/testcases/kernel/syscalls/.gitignore > @@ -445,6 +445,7 @@ > /link/link06 > /link/link07 > /linkat/linkat01 > +/linkat/linkat02 > /listen/listen01 > /llseek/llseek01 > /llseek/llseek02 > diff --git a/testcases/kernel/syscalls/linkat/linkat02.c > b/testcases/kernel/syscalls/linkat/linkat02.c > new file mode 100644 > index 0000000..af5162a > --- /dev/null > +++ b/testcases/kernel/syscalls/linkat/linkat02.c > @@ -0,0 +1,296 @@ > +/* > + * Copyright (c) 2014 Fujitsu Ltd. > + * Author: Zeng Linggang <[email protected]> > + * > + * 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. > + */ > +/* > + * Test that linkat() fails and sets the proper errno values. > + */ > + > +#define _GNU_SOURCE > + > +#include <sys/types.h> > +#include <sys/stat.h> > +#include <fcntl.h> > +#include <unistd.h> > +#include <error.h> > +#include <stdlib.h> > +#include <errno.h> > +#include <string.h> > +#include <signal.h> > +#include <pwd.h> > +#include <sys/mount.h> > + > +#include "test.h" > +#include "usctest.h" > +#include "linux_syscall_numbers.h" > +#include "safe_macros.h" > + > +#ifndef AT_FDCWD > +# define AT_FDCWD -100 > +#endif > +#ifndef AT_SYMLINK_FOLLOW > +# define AT_SYMLINK_FOLLOW 0x400 > +#endif Please put these two defines into include/lapi/fcntl.h > +#define DIR_MODE (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP| \ > + S_IXGRP|S_IROTH|S_IXOTH) > +#define TEST_FILE "testfile" > +#define TEST_EXIST "testexist" > +#define TEST_ELOOP "testeloop" > +#define TEST_EACCES "./tmp/testeeacces" > +#define TEST_EACCES2 "./tmp/testeeacces2" > +#define TEST_EROFS "mntpoint" > +#define TEST_EROFS2 "mntpoint/testerofs2" > +#define TEST_EMLINK "mntpoint/testemlink" > +#define BASENAME "mntpoint/basename" > + > +static long link_max; > +static char lname[PATH_MAX]; > +static char nametoolong[PATH_MAX+2]; > +static char *fstype = "ext2"; > +static char *device; > +static int dflag; > +static int mount_flag; > + > +static void setup(void); > +static void cleanup(void); > + > +static void setup_eacces(void); > +static void setup_erofs(void); > +static void cleanup_erofs(void); > +static void cleanup_eacces(void); > +static void setup_emlink(void); > +static void cleanup_emlink(void); > +static void help(void); > + > +static option_t options[] = { > + {"T:", NULL, &fstype}, > + {"D:", &dflag, &device}, > + {NULL, NULL, NULL} > +}; > + > +static struct test_struct { > + const char *oldfn; > + const char *newfn; This isn't wrong but fn is usually short for function. Perhaps oldfname and newfname would be a bit clearer. > + int flags; > + int expected_errno; > + void (*setupfunc) (); > + void (*cleanfunc) (); > +} test_cases[] = { > + {TEST_FILE, nametoolong, 0, ENAMETOOLONG, NULL, NULL}, > + {nametoolong, TEST_FILE, 0, ENAMETOOLONG, NULL, NULL}, > + {TEST_EXIST, TEST_EXIST, 0, EEXIST, NULL, NULL}, > + {TEST_ELOOP, TEST_FILE, AT_SYMLINK_FOLLOW, ELOOP, NULL, NULL}, > + {TEST_EACCES, TEST_EACCES2, 0, EACCES, setup_eacces, cleanup_eacces}, > + {TEST_EROFS, TEST_EROFS2, 0, EROFS, setup_erofs, cleanup_erofs}, > + {TEST_EMLINK, lname, 0, EMLINK, setup_emlink, cleanup_emlink}, > +}; > + > +char *TCID = "linkat02"; > +int TST_TOTAL = ARRAY_SIZE(test_cases); > + > +static struct passwd *ltpuser; > +static void verify_linkat(struct test_struct *); > + > +static int exp_enos[] = { ENAMETOOLONG, EEXIST, ELOOP, > + EACCES, EROFS, EMLINK, 0 }; > + > +int main(int ac, char **av) > +{ > + int lc; > + char *msg; > + int i; > + > + msg = parse_opts(ac, av, options, help); > + if (msg != NULL) > + tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); > + > + if (!dflag) { You can remove the dflag and use !device instead. > + tst_brkm(TBROK, NULL, > + "you must specify the device used for mounting with " > + "-D option"); > + } > + > + setup(); > + > + TEST_EXP_ENOS(exp_enos); > + > + for (lc = 0; TEST_LOOPING(lc); lc++) { > + > + tst_count = 0; > + > + for (i = 0; i < TST_TOTAL; i++) > + verify_linkat(&test_cases[i]); > + > + } > + > + cleanup(); > + tst_exit(); > +} > + > +static void verify_linkat(struct test_struct *desc) > +{ > + if (desc->setupfunc != NULL) > + desc->setupfunc(); > + > + TEST(ltp_syscall(__NR_linkat, AT_FDCWD, desc->oldfn, > + AT_FDCWD, desc->newfn, desc->flags)); > + > + if (desc->cleanfunc != NULL) > + desc->cleanfunc(); > + > + if (TEST_RETURN != -1) { > + tst_resm(TFAIL, > + "linkat(%s, %s, %s, %s, %d) succeeded unexpectedly", > + "AT_FDCWD", desc->oldfn, > + "AT_FDCWD", desc->newfn, desc->flags); > + return; > + } > + > + if (TEST_ERRNO == desc->expected_errno) { > + tst_resm(TPASS | TTERRNO, "linkat failed as expected"); > + } else { > + tst_resm(TFAIL | TTERRNO, > + "linkat failed unexpectedly; expected: " > + "%d - %s", desc->expected_errno, > + strerror(desc->expected_errno)); > + } > +} > + > +static void setup(void) > +{ > + if ((tst_kvercmp(2, 6, 16)) < 0) > + tst_brkm(TCONF, NULL, "This test needs kernel 2.6.16 or newer"); > + > + tst_sig(NOFORK, DEF_HANDLER, cleanup); > + > + tst_tmpdir(); > + > + TEST_PAUSE; > + > + ltpuser = SAFE_GETPWNAM(cleanup, "nobody"); > + > + SAFE_TOUCH(cleanup, TEST_FILE, 0644, NULL); > + > + memset(nametoolong, 'a', PATH_MAX+1); > + > + SAFE_TOUCH(cleanup, TEST_EXIST, 0644, NULL); > + > + SAFE_SYMLINK(cleanup, TEST_ELOOP, "test_file_eloop2"); > + SAFE_SYMLINK(cleanup, "test_file_eloop2", TEST_ELOOP); > + > + SAFE_MKDIR(cleanup, "./tmp", DIR_MODE); > + SAFE_TOUCH(cleanup, TEST_EACCES, 0666, NULL); > + > + tst_mkfs(NULL, device, fstype, NULL); > + SAFE_MKDIR(cleanup, "mntpoint", DIR_MODE); > +} > + > +static void setup_emlink(void) > +{ > + if (mount(device, "mntpoint", fstype, 0, NULL) < 0) { > + tst_brkm(TBROK | TERRNO, cleanup, > + "mount device:%s failed", device); > + } > + mount_flag = 1; > + > + SAFE_TOUCH(cleanup, TEST_EMLINK, 0666, NULL); > + > + link_max = 0; > + > + while (1) { > + sprintf(lname, "%s%ld", BASENAME, ++link_max); > + TEST(link(TEST_EMLINK, lname)); > + if (TEST_RETURN == -1) { > + switch (TEST_ERRNO) { > + case EMLINK: > + tst_resm(TINFO, "for %s the max links is %ld", > + fstype, link_max); > + break; > + default: > + tst_brkm(TBROK | TERRNO, cleanup_emlink, > + "Unexpected error: "); If we fail here the cleanup that does tst_rmdir() will not be called. What is needed here is another cleanup function that calls the cleanup_emlink() and then the test overall cleanup() > + break; > + } > + break; > + } > + } Do we need to recreate the links in each emlink setup? Can't we just remount the device RW here and RO in the EROFS case? > +} > + > +static void cleanup_emlink(void) > +{ > + long i; > + > + for (i = 1; i < link_max; i++) { > + sprintf(lname, "%s%ld", BASENAME, i); > + SAFE_UNLINK(cleanup, lname); > + } > + > + SAFE_UNLINK(cleanup, TEST_EMLINK); > + > + if (mount_flag && umount("mntpoint") < 0) { > + mount_flag = 0; > + tst_brkm(TBROK | TERRNO, cleanup, > + "umount device:%s failed", device); > + } > + mount_flag = 0; > +} > + > +static void setup_eacces(void) > +{ > + SAFE_SETEUID(cleanup, ltpuser->pw_uid); > +} > + > +static void cleanup_eacces(void) > +{ > + SAFE_SETEUID(cleanup, 0); This would not work unless the test was executed by root. Is tst_require_root(NULL) missing from setup? > +} > + > +static void setup_erofs(void) > +{ > + if (mount(device, "mntpoint", fstype, MS_RDONLY, NULL) < 0) { > + tst_brkm(TBROK | TERRNO, cleanup, > + "mount device:%s failed", device); > + } > + mount_flag = 1; > +} > + > +static void cleanup_erofs(void) > +{ > + if (mount_flag && umount("mntpoint") < 0) { > + mount_flag = 0; > + tst_brkm(TBROK | TERRNO, cleanup, > + "umount device:%s failed", device); > + } > + mount_flag = 0; > +} > + > +static void cleanup(void) > +{ > + TEST_CLEANUP; > + > + if (mount_flag && umount("mntpoint") < 0) { > + tst_brkm(TBROK | TERRNO, NULL, > + "umount device:%s failed", device); Hmm, I would rather use tst_resm(TWARN, ...) here so that the cleanup() will continue to the tst_rmdir() here. Even if the tst_rmdir() is not able to remove all files, it will remove at least some. > + } > + > + tst_rmdir(); > +} > + > +static void help(void) > +{ > + printf("-T type : specifies the type of filesystem to be mounted. " > + "Default ext2.\n"); > + printf("-D device : device used for mounting.\n"); > +} -- Cyril Hrubis [email protected] ------------------------------------------------------------------------------ Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis & security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071&iu=/4140/ostg.clktrk _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
