| Message ID | 20221009065520.3236525-2-liwang@redhat.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [1/2] getitimer02: add ITIMER_VIRTUAL timer error check | expand |
Hello, Li Wang <liwang@redhat.com> writes: > Combine this EINVAL test into setitimer02 and add one additional > ITIMER_VIRTUAL verification. EINVAL is not mentioned in the test description. > > Signed-off-by: Li Wang <liwang@redhat.com> > --- > runtest/syscalls | 1 - > .../kernel/syscalls/setitimer/.gitignore | 1 - > .../kernel/syscalls/setitimer/setitimer02.c | 30 +++- > .../kernel/syscalls/setitimer/setitimer03.c | 158 ------------------ > 4 files changed, 24 insertions(+), 166 deletions(-) > delete mode 100644 testcases/kernel/syscalls/setitimer/setitimer03.c > > diff --git a/runtest/syscalls b/runtest/syscalls > index 61a7b7677..2d673836d 100644 > --- a/runtest/syscalls > +++ b/runtest/syscalls > @@ -1325,7 +1325,6 @@ sethostname03 sethostname03 > > setitimer01 setitimer01 > setitimer02 setitimer02 > -setitimer03 setitimer03 > > setns01 setns01 > setns02 setns02 > diff --git a/testcases/kernel/syscalls/setitimer/.gitignore b/testcases/kernel/syscalls/setitimer/.gitignore > index 048db9b31..35779a32c 100644 > --- a/testcases/kernel/syscalls/setitimer/.gitignore > +++ b/testcases/kernel/syscalls/setitimer/.gitignore > @@ -1,3 +1,2 @@ > /setitimer01 > /setitimer02 > -/setitimer03 > diff --git a/testcases/kernel/syscalls/setitimer/setitimer02.c b/testcases/kernel/syscalls/setitimer/setitimer02.c > index 9ac9ce1fa..ccba231c9 100644 > --- a/testcases/kernel/syscalls/setitimer/setitimer02.c > +++ b/testcases/kernel/syscalls/setitimer/setitimer02.c > @@ -18,17 +18,33 @@ > #include "tst_test.h" > #include "lapi/syscalls.h" > > -static struct itimerval *value; > +static struct itimerval *value, *ovalue; > + > +static struct tcase { > + int which; > + struct itimerval **val; > + struct itimerval **oval; > + int exp_errno; There is a whitespace error here (see checkpatch/make check) > +} tcases[] = { > + {ITIMER_REAL, &value, &ovalue, EFAULT}, > + {ITIMER_VIRTUAL, &value, &ovalue, EFAULT}, > + {-ITIMER_PROF, &value, &ovalue, EINVAL}, > +}; Why do we need value and ovalue in the struct? > > static int sys_setitimer(int which, void *new_value, void *old_value) > { > return tst_syscall(__NR_setitimer, which, new_value, old_value); > } > > -static void verify_setitimer(void) > +static void verify_setitimer(unsigned int i) > { > - TST_EXP_FAIL(sys_setitimer(ITIMER_REAL, value, (struct itimerval *)-1), > - EFAULT); > + struct tcase *tc = &tcases[i]; > + > + if (tc->exp_errno == EFAULT) > + *(tc->oval) = (struct itimerval *)-1; Or, why do we use an if statement here instead of defining it in the struct?
Richard Palethorpe <rpalethorpe@suse.de> wrote: > > -static struct itimerval *value; > > +static struct itimerval *value, *ovalue; > > + > > +static struct tcase { > > + int which; > > + struct itimerval **val; > > + struct itimerval **oval; > > + int exp_errno; > > There is a whitespace error here (see checkpatch/make check) > yes, thanks. > > > +} tcases[] = { > > + {ITIMER_REAL, &value, &ovalue, EFAULT}, > > + {ITIMER_VIRTUAL, &value, &ovalue, EFAULT}, > > + {-ITIMER_PROF, &value, &ovalue, EINVAL}, > > +}; > > Why do we need value and ovalue in the struct? > Becuase it does not allow parsing an invalid pointer address from a structure, we have to give a valid address which pointer to save an invalid address. Otherwise segement fault will be hit in execution. And for the last test item, I don't want the invalid pointer to have a side effect disturbs the first invalid argument. > > > > > static int sys_setitimer(int which, void *new_value, void *old_value) > > { > > return tst_syscall(__NR_setitimer, which, new_value, old_value); > > } > > > > -static void verify_setitimer(void) > > +static void verify_setitimer(unsigned int i) > > { > > - TST_EXP_FAIL(sys_setitimer(ITIMER_REAL, value, (struct itimerval > *)-1), > > - EFAULT); > > + struct tcase *tc = &tcases[i]; > > + > > + if (tc->exp_errno == EFAULT) > > + *(tc->oval) = (struct itimerval *)-1; > > Or, why do we use an if statement here instead of defining it in the > struct? > Same above, that's why here explicitly reassign an invalid address.
On Thu, Oct 20, 2022 at 5:30 PM Li Wang <liwang@redhat.com> wrote: > Richard Palethorpe <rpalethorpe@suse.de> wrote: > > >> > -static struct itimerval *value; >> > +static struct itimerval *value, *ovalue; >> > + >> > +static struct tcase { >> > + int which; >> > + struct itimerval **val; >> > + struct itimerval **oval; >> > + int exp_errno; >> >> There is a whitespace error here (see checkpatch/make check) >> > > yes, thanks. > > > >> >> > +} tcases[] = { >> > + {ITIMER_REAL, &value, &ovalue, EFAULT}, >> > + {ITIMER_VIRTUAL, &value, &ovalue, EFAULT}, >> > + {-ITIMER_PROF, &value, &ovalue, EINVAL}, >> > +}; >> >> Why do we need value and ovalue in the struct? >> > > Becuase it does not allow parsing an invalid pointer address > from a structure, we have to give a valid address which pointer > to save an invalid address. Otherwise segement fault will > be hit in execution. > On the other side, it also does not allow to initializer element is not constant in structure. So the two-level pointer is only the way I can make all things comprised here.
Hello, Li Wang <liwang@redhat.com> writes: > On Thu, Oct 20, 2022 at 5:30 PM Li Wang <liwang@redhat.com> wrote: > > Richard Palethorpe <rpalethorpe@suse.de> wrote: > > > -static struct itimerval *value; > > +static struct itimerval *value, *ovalue; > > + > > +static struct tcase { > > + int which; > > + struct itimerval **val; > > + struct itimerval **oval; > > + int exp_errno; > > There is a whitespace error here (see checkpatch/make check) > > yes, thanks. > > > > > +} tcases[] = { > > + {ITIMER_REAL, &value, &ovalue, EFAULT}, > > + {ITIMER_VIRTUAL, &value, &ovalue, EFAULT}, > > + {-ITIMER_PROF, &value, &ovalue, EINVAL}, > > +}; > > Why do we need value and ovalue in the struct? > > Becuase it does not allow parsing an invalid pointer address > from a structure, we have to give a valid address which pointer > to save an invalid address. Otherwise segement fault will > be hit in execution. > > On the other side, it also does not allow to initializer element > is not constant in structure. So the two-level pointer is only the > way I can make all things comprised here. I'm not sure what you mean and I don't understand why we need this struct at all. The following works and produces better output: @@ -20,17 +20,6 @@ static struct itimerval *value, *ovalue; -static struct tcase { - int which; - struct itimerval **val; - struct itimerval **oval; - int exp_errno; -} tcases[] = { - {ITIMER_REAL, &value, &ovalue, EFAULT}, - {ITIMER_VIRTUAL, &value, &ovalue, EFAULT}, - {-ITIMER_PROF, &value, &ovalue, EINVAL}, -}; - static int sys_setitimer(int which, void *new_value, void *old_value) { return tst_syscall(__NR_setitimer, which, new_value, old_value); @@ -38,13 +27,17 @@ static int sys_setitimer(int which, void *new_value, void *old_value) static void verify_setitimer(unsigned int i) { - struct tcase *tc = &tcases[i]; - - if (tc->exp_errno == EFAULT) - *(tc->oval) = (struct itimerval *)-1; - - TST_EXP_FAIL(sys_setitimer(tc->which, *(tc->val), *(tc->oval)), - tc->exp_errno); + switch (i) { + case 0: + TST_EXP_FAIL(sys_setitimer(ITIMER_REAL, value, (void *)-1), EFAULT); + break; + case 1: + TST_EXP_FAIL(sys_setitimer(ITIMER_VIRTUAL, value, (void *)-1), EFAULT); + break; + case 2: + TST_EXP_FAIL(sys_setitimer(-ITIMER_PROF, value, ovalue), EINVAL); + break; + } } static void setup(void) @@ -56,7 +49,7 @@ static void setup(void) } static struct tst_test test = { - .tcnt = ARRAY_SIZE(tcases), + .tcnt = 3, .test = verify_setitimer, .setup = setup, .bufs = (struct tst_buffers[]) { This prints setitimer02.c:32: TPASS: sys_setitimer(ITIMER_REAL, value, (void *)-1) : EFAULT (14) setitimer02.c:35: TPASS: sys_setitimer(ITIMER_VIRTUAL, value, (void *)-1) : EFAULT (14) setitimer02.c:38: TPASS: sys_setitimer(-ITIMER_PROF, value, ovalue) : EINVAL (22) instead of setitimer02.c:46: TPASS: sys_setitimer(tc->which, *(tc->val), *(tc->oval)) : EFAULT (14) setitimer02.c:46: TPASS: sys_setitimer(tc->which, *(tc->val), *(tc->oval)) : EFAULT (14) setitimer02.c:46: TPASS: sys_setitimer(tc->which, *(tc->val), *(tc->oval)) : EINVAL (22) The same values are passed to the syscall according to strace.
On Thu, Oct 20, 2022 at 6:40 PM Richard Palethorpe <rpalethorpe@suse.de> wrote: > Hello, > > Li Wang <liwang@redhat.com> writes: > > > On Thu, Oct 20, 2022 at 5:30 PM Li Wang <liwang@redhat.com> wrote: > > > > Richard Palethorpe <rpalethorpe@suse.de> wrote: > > > > > -static struct itimerval *value; > > > +static struct itimerval *value, *ovalue; > > > + > > > +static struct tcase { > > > + int which; > > > + struct itimerval **val; > > > + struct itimerval **oval; > > > + int exp_errno; > > > > There is a whitespace error here (see checkpatch/make check) > > > > yes, thanks. > > > > > > > > > +} tcases[] = { > > > + {ITIMER_REAL, &value, &ovalue, EFAULT}, > > > + {ITIMER_VIRTUAL, &value, &ovalue, EFAULT}, > > > + {-ITIMER_PROF, &value, &ovalue, EINVAL}, > > > +}; > > > > Why do we need value and ovalue in the struct? > > > > Becuase it does not allow parsing an invalid pointer address > > from a structure, we have to give a valid address which pointer > > to save an invalid address. Otherwise segement fault will > > be hit in execution. > > > > On the other side, it also does not allow to initializer element > > is not constant in structure. So the two-level pointer is only the > > way I can make all things comprised here. > > I'm not sure what you mean and I don't understand why we need this > struct at all. The following works and produces better output: > Ok, I got your point. Previously I was stuck in thinking about how to keep the unified tcase struct for error testing. Seems I should give up the fixed mindset. static struct tcase { ... } tcases[] = { ... }; > > @@ -20,17 +20,6 @@ > > static struct itimerval *value, *ovalue; > > -static struct tcase { > - int which; > - struct itimerval **val; > - struct itimerval **oval; > - int exp_errno; > -} tcases[] = { > - {ITIMER_REAL, &value, &ovalue, EFAULT}, > - {ITIMER_VIRTUAL, &value, &ovalue, EFAULT}, > - {-ITIMER_PROF, &value, &ovalue, EINVAL}, > -}; > - > static int sys_setitimer(int which, void *new_value, void *old_value) > { > return tst_syscall(__NR_setitimer, which, new_value, old_value); > @@ -38,13 +27,17 @@ static int sys_setitimer(int which, void *new_value, > void *old_value) > > static void verify_setitimer(unsigned int i) > { > - struct tcase *tc = &tcases[i]; > - > - if (tc->exp_errno == EFAULT) > - *(tc->oval) = (struct itimerval *)-1; > - > - TST_EXP_FAIL(sys_setitimer(tc->which, *(tc->val), *(tc->oval)), > - tc->exp_errno); > + switch (i) { > + case 0: > + TST_EXP_FAIL(sys_setitimer(ITIMER_REAL, value, (void > *)-1), EFAULT); > + break; > + case 1: > + TST_EXP_FAIL(sys_setitimer(ITIMER_VIRTUAL, value, (void > *)-1), EFAULT); > + break; > + case 2: > + TST_EXP_FAIL(sys_setitimer(-ITIMER_PROF, value, ovalue), > EINVAL); > + break; > + } > } > > static void setup(void) > @@ -56,7 +49,7 @@ static void setup(void) > } > > static struct tst_test test = { > - .tcnt = ARRAY_SIZE(tcases), > + .tcnt = 3, > .test = verify_setitimer, > .setup = setup, > .bufs = (struct tst_buffers[]) { > > This prints > > setitimer02.c:32: TPASS: sys_setitimer(ITIMER_REAL, value, (void *)-1) : > EFAULT (14) > setitimer02.c:35: TPASS: sys_setitimer(ITIMER_VIRTUAL, value, (void *)-1) > : EFAULT (14) > setitimer02.c:38: TPASS: sys_setitimer(-ITIMER_PROF, value, ovalue) : > EINVAL (22) > > instead of > > setitimer02.c:46: TPASS: sys_setitimer(tc->which, *(tc->val), *(tc->oval)) > : EFAULT (14) > setitimer02.c:46: TPASS: sys_setitimer(tc->which, *(tc->val), *(tc->oval)) > : EFAULT (14) > setitimer02.c:46: TPASS: sys_setitimer(tc->which, *(tc->val), *(tc->oval)) > : EINVAL (22) > > The same values are passed to the syscall according to strace. > > -- > Thank you, > Richard. > >
diff --git a/runtest/syscalls b/runtest/syscalls index 61a7b7677..2d673836d 100644 --- a/runtest/syscalls +++ b/runtest/syscalls @@ -1325,7 +1325,6 @@ sethostname03 sethostname03 setitimer01 setitimer01 setitimer02 setitimer02 -setitimer03 setitimer03 setns01 setns01 setns02 setns02 diff --git a/testcases/kernel/syscalls/setitimer/.gitignore b/testcases/kernel/syscalls/setitimer/.gitignore index 048db9b31..35779a32c 100644 --- a/testcases/kernel/syscalls/setitimer/.gitignore +++ b/testcases/kernel/syscalls/setitimer/.gitignore @@ -1,3 +1,2 @@ /setitimer01 /setitimer02 -/setitimer03 diff --git a/testcases/kernel/syscalls/setitimer/setitimer02.c b/testcases/kernel/syscalls/setitimer/setitimer02.c index 9ac9ce1fa..ccba231c9 100644 --- a/testcases/kernel/syscalls/setitimer/setitimer02.c +++ b/testcases/kernel/syscalls/setitimer/setitimer02.c @@ -18,17 +18,33 @@ #include "tst_test.h" #include "lapi/syscalls.h" -static struct itimerval *value; +static struct itimerval *value, *ovalue; + +static struct tcase { + int which; + struct itimerval **val; + struct itimerval **oval; + int exp_errno; +} tcases[] = { + {ITIMER_REAL, &value, &ovalue, EFAULT}, + {ITIMER_VIRTUAL, &value, &ovalue, EFAULT}, + {-ITIMER_PROF, &value, &ovalue, EINVAL}, +}; static int sys_setitimer(int which, void *new_value, void *old_value) { return tst_syscall(__NR_setitimer, which, new_value, old_value); } -static void verify_setitimer(void) +static void verify_setitimer(unsigned int i) { - TST_EXP_FAIL(sys_setitimer(ITIMER_REAL, value, (struct itimerval *)-1), - EFAULT); + struct tcase *tc = &tcases[i]; + + if (tc->exp_errno == EFAULT) + *(tc->oval) = (struct itimerval *)-1; + + TST_EXP_FAIL(sys_setitimer(tc->which, *(tc->val), *(tc->oval)), + tc->exp_errno); } static void setup(void) @@ -40,10 +56,12 @@ static void setup(void) } static struct tst_test test = { - .test_all = verify_setitimer, + .tcnt = ARRAY_SIZE(tcases), + .test = verify_setitimer, .setup = setup, .bufs = (struct tst_buffers[]) { - {&value, .size = sizeof(struct itimerval)}, + {&value, .size = sizeof(struct itimerval)}, + {&ovalue, .size = sizeof(struct itimerval)}, {} } }; diff --git a/testcases/kernel/syscalls/setitimer/setitimer03.c b/testcases/kernel/syscalls/setitimer/setitimer03.c deleted file mode 100644 index 418ec71f0..000000000 --- a/testcases/kernel/syscalls/setitimer/setitimer03.c +++ /dev/null @@ -1,158 +0,0 @@ -/* - * - * 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 - */ - -/* - * NAME - * setitimer03.c - * - * DESCRIPTION - * setitimer03 - check that a setitimer() call fails as expected - * with incorrect values. - * - * ALGORITHM - * loop if that option was specified - * allocate needed space and set up needed values - * issue the system call - * check the errno value - * issue a PASS message if we get EINVAL - * otherwise, the tests fails - * issue a FAIL message - * break any remaining tests - * call cleanup - * - * USAGE: <for command-line> - * setitimer03 [-c n] [-e] [-i n] [-I x] [-p x] [-t] - * where, -c n : Run n copies concurrently. - * -e : Turn on errno logging. - * -i n : Execute test n times. - * -I x : Execute test for x seconds. - * -P x : Pause for x seconds between iterations. - * -t : Turn on syscall timing. - * - * HISTORY - * 03/2001 - Written by Wayne Boyer - * - * RESTRICTIONS - * none - */ - -#include "test.h" - -#include <errno.h> -#include <sys/time.h> - -void cleanup(void); -void setup(void); - -char *TCID = "setitimer03"; -int TST_TOTAL = 1; - -int main(int ac, char **av) -{ - int lc; - struct itimerval *value, *ovalue; - - tst_parse_opts(ac, av, NULL, NULL); - - setup(); /* global setup */ - - /* The following loop checks looping state if -i option given */ - - for (lc = 0; TEST_LOOPING(lc); lc++) { - /* reset tst_count in case we are looping */ - tst_count = 0; - - /* allocate some space for timer structures */ - - if ((value = malloc((size_t)sizeof(struct itimerval))) == - NULL) { - tst_brkm(TBROK, cleanup, "value malloc failed"); - } - - if ((ovalue = malloc((size_t)sizeof(struct itimerval))) == - NULL) { - tst_brkm(TBROK, cleanup, "value malloc failed"); - } - - /* set up some reasonable values */ - - value->it_value.tv_sec = 30; - value->it_value.tv_usec = 0; - value->it_interval.tv_sec = 0; - value->it_interval.tv_usec = 0; - - /* - * issue the system call with the TEST() macro - * ITIMER_REAL = 0, ITIMER_VIRTUAL = 1 and ITIMER_PROF = 2 - */ - - /* make the first value negative to get a failure */ - TEST(setitimer(-ITIMER_PROF, value, ovalue)); - - if (TEST_RETURN == 0) { - tst_resm(TFAIL, "call failed to produce expected error " - "- errno = %d - %s", TEST_ERRNO, - strerror(TEST_ERRNO)); - continue; - } - - switch (TEST_ERRNO) { - case EINVAL: - tst_resm(TPASS, "expected failure - errno = %d - %s", - TEST_ERRNO, strerror(TEST_ERRNO)); - break; - default: - tst_resm(TFAIL, "call failed to produce expected error " - "- errno = %d - %s", TEST_ERRNO, - strerror(TEST_ERRNO)); - } - - /* - * clean up things in case we are looping - */ - free(value); - free(ovalue); - value = NULL; - ovalue = NULL; - } - - cleanup(); - tst_exit(); - -} - -/* - * setup() - performs all the ONE TIME setup for this test. - */ -void setup(void) -{ - - tst_sig(NOFORK, DEF_HANDLER, cleanup); - - TEST_PAUSE; -} - -/* - * cleanup() - performs all the ONE TIME cleanup for this test at completion - * or premature exit. - */ -void cleanup(void) -{ - -}
Combine this EINVAL test into setitimer02 and add one additional ITIMER_VIRTUAL verification. Signed-off-by: Li Wang <liwang@redhat.com> --- runtest/syscalls | 1 - .../kernel/syscalls/setitimer/.gitignore | 1 - .../kernel/syscalls/setitimer/setitimer02.c | 30 +++- .../kernel/syscalls/setitimer/setitimer03.c | 158 ------------------ 4 files changed, 24 insertions(+), 166 deletions(-) delete mode 100644 testcases/kernel/syscalls/setitimer/setitimer03.c