diff --git a/testcases/kernel/syscalls/setregid/setregid02.c b/testcases/kernel/syscalls/setregid/setregid02.c index 5674070..e67a7df 100644 --- a/testcases/kernel/syscalls/setregid/setregid02.c +++ b/testcases/kernel/syscalls/setregid/setregid02.c @@ -72,7 +72,7 @@ struct test_data_t { "After setregid(bin, root),"}, { &inval_user, &neg_one, EINVAL, &nobody, &nobody, "After setregid(invalid group, -1),"}, { -&neg_one, &inval_user, EINVAL, &nobody, &nobody, + &neg_one, &inval_user, EINVAL, &nobody, &nobody, "After setregid(-1, invalid group),"},}; int TST_TOTAL = sizeof(test_data) / sizeof(test_data[0]); @@ -194,6 +194,5 @@ void gid_verify(struct group *rg, struct group *eg, char *when) rg->gr_gid, eg->gr_gid); } else { tst_resm(TPASS, "real or effective gid was modified as expected"); - } } diff --git a/testcases/kernel/syscalls/setregid/setregid03.c b/testcases/kernel/syscalls/setregid/setregid03.c index 932371b..1cbdd52 100644 --- a/testcases/kernel/syscalls/setregid/setregid03.c +++ b/testcases/kernel/syscalls/setregid/setregid03.c @@ -108,9 +108,9 @@ int main(int ac, char **av) if (SETREGID(cleanup, sys.gr_gid, bin.gr_gid) == -1) tst_brkm(TBROK, NULL, "Initial setregid failed"); - if (seteuid(nobody.pw_uid) == -1) { + if (seteuid(nobody.pw_uid) == -1) tst_brkm(TBROK, NULL, "Initial seteuid failed"); - } + if ((pid = FORK_OR_VFORK()) == -1) { tst_brkm(TBROK, NULL, "fork failed"); } else if (pid == 0) { /* child */ diff --git a/testcases/kernel/syscalls/setreuid/setreuid01.c b/testcases/kernel/syscalls/setreuid/setreuid01.c index 45d38cb..18b5ed0 100644 --- a/testcases/kernel/syscalls/setreuid/setreuid01.c +++ b/testcases/kernel/syscalls/setreuid/setreuid01.c @@ -46,8 +46,8 @@ #include "usctest.h" #include "compat_16.h" -static void setup(); -static void cleanup(); +static void setup(void); +static void cleanup(void); TCID_DEFINE(setreuid01); int TST_TOTAL = 5; @@ -182,7 +182,6 @@ int main(int ac, char **av) static void setup(void) { - tst_sig(NOFORK, DEF_HANDLER, cleanup); TEST_PAUSE; diff --git a/testcases/kernel/syscalls/setreuid/setreuid02.c b/testcases/kernel/syscalls/setreuid/setreuid02.c index 050df17..1263996 100644 --- a/testcases/kernel/syscalls/setreuid/setreuid02.c +++ b/testcases/kernel/syscalls/setreuid/setreuid02.c @@ -70,11 +70,9 @@ int main(int ac, char **av) int lc; char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { + if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } - setup(); for (lc = 0; TEST_LOOPING(lc); lc++) { @@ -140,7 +138,6 @@ static void setup(void) static void cleanup(void) { TEST_CLEANUP; - } static void uid_verify(struct passwd *ru, struct passwd *eu, char *when) diff --git a/testcases/kernel/syscalls/setreuid/setreuid03.c b/testcases/kernel/syscalls/setreuid/setreuid03.c index 24e52d5..1074e79 100644 --- a/testcases/kernel/syscalls/setreuid/setreuid03.c +++ b/testcases/kernel/syscalls/setreuid/setreuid03.c @@ -95,11 +95,9 @@ int main(int ac, char **av) int lc; char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { + if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } - setup(); for (lc = 0; TEST_LOOPING(lc); lc++) { @@ -188,7 +186,6 @@ static void setup(void) static void cleanup(void) { TEST_CLEANUP; - } static void uid_verify(struct passwd *ru, struct passwd *eu, char *when) diff --git a/testcases/kernel/syscalls/setreuid/setreuid04.c b/testcases/kernel/syscalls/setreuid/setreuid04.c index d949a4b..3010fc5 100644 --- a/testcases/kernel/syscalls/setreuid/setreuid04.c +++ b/testcases/kernel/syscalls/setreuid/setreuid04.c @@ -70,11 +70,9 @@ int main(int ac, char **av) int lc; char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { + if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } - setup(); flag = 0; diff --git a/testcases/kernel/syscalls/setreuid/setreuid05.c b/testcases/kernel/syscalls/setreuid/setreuid05.c index c46fcd9..a379ab7 100644 --- a/testcases/kernel/syscalls/setreuid/setreuid05.c +++ b/testcases/kernel/syscalls/setreuid/setreuid05.c @@ -91,11 +91,9 @@ int main(int argc, char **argv) int lc; char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { + if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } - setup(); pass = 0; @@ -204,7 +202,6 @@ static void setup(void) static void cleanup(void) { TEST_CLEANUP; - } static void uid_verify(struct passwd *ru, struct passwd *eu, char *when) diff --git a/testcases/kernel/syscalls/setreuid/setreuid06.c b/testcases/kernel/syscalls/setreuid/setreuid06.c index 823d10b..e4bc207 100644 --- a/testcases/kernel/syscalls/setreuid/setreuid06.c +++ b/testcases/kernel/syscalls/setreuid/setreuid06.c @@ -48,13 +48,11 @@ static void cleanup(void); int main(int argc, char **argv) { - int lc; char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { + if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } setup();