* [LTP] [PATCH] [1/4] syscalls/chroot01: Convert to new API
@ 2021-08-05 7:33 zhanglianjie
2021-08-05 9:46 ` Cyril Hrubis
0 siblings, 1 reply; 3+ messages in thread
From: zhanglianjie @ 2021-08-05 7:33 UTC (permalink / raw)
To: ltp
Signed-off-by: zhanglianjie <zhanglianjie@uniontech.com>
diff --git a/testcases/kernel/syscalls/chroot/chroot01.c b/testcases/kernel/syscalls/chroot/chroot01.c
index a1db5e157..37c73c756 100644
--- a/testcases/kernel/syscalls/chroot/chroot01.c
+++ b/testcases/kernel/syscalls/chroot/chroot01.c
@@ -1,116 +1,63 @@
+// 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
*/
-/*
- * NAME
- * chroot01.c
- *
- * DESCRIPTION
- * Testcase to check the whether chroot sets errno to EPERM.
+/*\
+ * [DESCRIPTION]
*
- * ALGORITHM
- * As a non-root user attempt to perform chroot() to a directory. The
- * chroot() call should fail with EPERM
- *
- * USAGE: <for command-line>
- * chroot01 [-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
- * 07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- * Must be run as non-root user.
+ * Testcase to check the whether chroot sets errno to EPERM.
+ * As a non-root user attempt to perform chroot() to a directory. The
+ * chroot() call should fail with EPERM
*/
-#include <stdio.h>
-#include <errno.h>
-#include "test.h"
-#include "safe_macros.h"
+#include <stdlib.h>
#include <pwd.h>
-
-char *TCID = "chroot01";
-int TST_TOTAL = 1;
-int fail;
+#include "tst_test.h"
char *path;
-
char nobody_uid[] = "nobody";
struct passwd *ltpuser;
-void setup(void);
-void cleanup(void);
-
-int main(int ac, char **av)
+static void verify_chroot(void)
{
- int lc;
+ TEST(chroot(path));
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
-
- tst_count = 0;
-
- TEST(chroot(path));
-
- if (TEST_RETURN != -1)
- tst_resm(TFAIL, "call succeeded unexpectedly");
- else if (errno != EPERM)
- tst_resm(TFAIL | TTERRNO, "chroot failed unexpectedly");
- else
- tst_resm(TPASS, "chroot set errno to EPERM.");
- }
- cleanup();
-
- tst_exit();
+ if (TST_RET != -1)
+ tst_res(TFAIL, "call succeeded unexpectedly");
+ else if (errno != EPERM)
+ tst_res(TFAIL | TTERRNO, "chroot failed unexpectedly");
+ else
+ tst_res(TPASS, "chroot set errno to EPERM.");
}
-void setup(void)
+static void setup(void)
{
- tst_require_root();
-
- tst_tmpdir();
path = tst_get_tmpdir();
+ if (path == NULL)
+ tst_brk(TBROK | TERRNO, "tst_get_tmpdir failed");
- if ((ltpuser = getpwnam(nobody_uid)) == NULL)
- tst_brkm(TBROK | TERRNO, cleanup,
- "getpwnam(\"nobody\") failed");
-
- SAFE_SETEUID(cleanup, ltpuser->pw_uid);
+ if ((ltpuser = SAFE_GETPWNAM(nobody_uid)) == NULL)
+ tst_brk(TBROK | TERRNO, "getpwnam(\"nobody\") failed");
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
- TEST_PAUSE;
+ SAFE_SETEUID(ltpuser->pw_uid);
}
-void cleanup(void)
+static void cleanup(void)
{
- SAFE_SETEUID(NULL, 0);
+ SAFE_SETEUID(0);
- free(path);
- tst_rmdir();
+ if (path) {
+ free(path);
+ path = NULL;
+ }
}
+
+static struct tst_test test = {
+ .cleanup = cleanup,
+ .setup = setup,
+ .test_all = verify_chroot,
+ .needs_root = 1,
+ .needs_tmpdir = 1,
+};
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [LTP] [PATCH] [1/4] syscalls/chroot01: Convert to new API
2021-08-05 7:33 [LTP] [PATCH] [1/4] syscalls/chroot01: Convert to new API zhanglianjie
@ 2021-08-05 9:46 ` Cyril Hrubis
2021-08-05 10:06 ` zhanglianjie
0 siblings, 1 reply; 3+ messages in thread
From: Cyril Hrubis @ 2021-08-05 9:46 UTC (permalink / raw)
To: ltp
Hi!
> +static void verify_chroot(void)
> {
> - int lc;
> + TEST(chroot(path));
>
> - tst_parse_opts(ac, av, NULL, NULL);
> -
> - setup();
> -
> - for (lc = 0; TEST_LOOPING(lc); lc++) {
> -
> - tst_count = 0;
> -
> - TEST(chroot(path));
> -
> - if (TEST_RETURN != -1)
> - tst_resm(TFAIL, "call succeeded unexpectedly");
> - else if (errno != EPERM)
> - tst_resm(TFAIL | TTERRNO, "chroot failed unexpectedly");
> - else
> - tst_resm(TPASS, "chroot set errno to EPERM.");
> - }
> - cleanup();
> -
> - tst_exit();
> + if (TST_RET != -1)
> + tst_res(TFAIL, "call succeeded unexpectedly");
> + else if (errno != EPERM)
> + tst_res(TFAIL | TTERRNO, "chroot failed unexpectedly");
> + else
> + tst_res(TPASS, "chroot set errno to EPERM.");
Just use the TST_EXP_FAIL() here instead.
> }
>
> -void setup(void)
> +static void setup(void)
> {
> - tst_require_root();
> -
> - tst_tmpdir();
> path = tst_get_tmpdir();
> + if (path == NULL)
> + tst_brk(TBROK | TERRNO, "tst_get_tmpdir failed");
Hmm I guess that we should add tst_brkm() to the lib/tst_tmpdir.c
instead to check if the strdup has failed, which would be far easier
than adding error handling to all tests.
Something as:
diff --git a/lib/tst_tmpdir.c b/lib/tst_tmpdir.c
index 0c39eb89f..35b376478 100644
--- a/lib/tst_tmpdir.c
+++ b/lib/tst_tmpdir.c
@@ -108,12 +108,18 @@ int tst_tmpdir_created(void)
char *tst_get_tmpdir(void)
{
+ char *ret;
+
if (TESTDIR == NULL) {
tst_brkm(TBROK, NULL, "you must call tst_tmpdir() first");
return NULL;
}
- return strdup(TESTDIR);
+ ret = strdup(TESTDIR);
+ if (!ret)
+ tst_brkm(TBROK, NULL, "strdup() failed");
+
+ return ret;
}
> - if ((ltpuser = getpwnam(nobody_uid)) == NULL)
> - tst_brkm(TBROK | TERRNO, cleanup,
> - "getpwnam(\"nobody\") failed");
> -
> - SAFE_SETEUID(cleanup, ltpuser->pw_uid);
> + if ((ltpuser = SAFE_GETPWNAM(nobody_uid)) == NULL)
> + tst_brk(TBROK | TERRNO, "getpwnam(\"nobody\") failed");
SAFE_SETEUID() cannot fail, there is no need to check the return value.
> - tst_sig(NOFORK, DEF_HANDLER, cleanup);
> -
> - TEST_PAUSE;
> + SAFE_SETEUID(ltpuser->pw_uid);
> }
>
> -void cleanup(void)
> +static void cleanup(void)
> {
> - SAFE_SETEUID(NULL, 0);
> + SAFE_SETEUID(0);
There is actually no need to reset the UID in new library tests, since
the cleanup for temporary directory is carried on with the test library
process.
> - free(path);
> - tst_rmdir();
> + if (path) {
> + free(path);
> + path = NULL;
> + }
free(NULL) is no-op, no need for the if () here.
All that has to be done in the cleanup is actually:
static void cleanup(void)
{
free(path);
}
> }
> +
> +static struct tst_test test = {
> + .cleanup = cleanup,
> + .setup = setup,
> + .test_all = verify_chroot,
> + .needs_root = 1,
> + .needs_tmpdir = 1,
> +};
> --
> 2.20.1
>
>
>
>
> --
> Mailing list info: https://lists.linux.it/listinfo/ltp
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [LTP] [PATCH] [1/4] syscalls/chroot01: Convert to new API
2021-08-05 9:46 ` Cyril Hrubis
@ 2021-08-05 10:06 ` zhanglianjie
0 siblings, 0 replies; 3+ messages in thread
From: zhanglianjie @ 2021-08-05 10:06 UTC (permalink / raw)
To: ltp
Hi:
I will resubmit, thank you for your guidance.
> Hi!
>> +static void verify_chroot(void)
>> {
>> - int lc;
>> + TEST(chroot(path));
>>
>> - tst_parse_opts(ac, av, NULL, NULL);
>> -
>> - setup();
>> -
>> - for (lc = 0; TEST_LOOPING(lc); lc++) {
>> -
>> - tst_count = 0;
>> -
>> - TEST(chroot(path));
>> -
>> - if (TEST_RETURN != -1)
>> - tst_resm(TFAIL, "call succeeded unexpectedly");
>> - else if (errno != EPERM)
>> - tst_resm(TFAIL | TTERRNO, "chroot failed unexpectedly");
>> - else
>> - tst_resm(TPASS, "chroot set errno to EPERM.");
>> - }
>> - cleanup();
>> -
>> - tst_exit();
>> + if (TST_RET != -1)
>> + tst_res(TFAIL, "call succeeded unexpectedly");
>> + else if (errno != EPERM)
>> + tst_res(TFAIL | TTERRNO, "chroot failed unexpectedly");
>> + else
>> + tst_res(TPASS, "chroot set errno to EPERM.");
>
> Just use the TST_EXP_FAIL() here instead.
>
>> }
>>
>> -void setup(void)
>> +static void setup(void)
>> {
>> - tst_require_root();
>> -
>> - tst_tmpdir();
>> path = tst_get_tmpdir();
>> + if (path == NULL)
>> + tst_brk(TBROK | TERRNO, "tst_get_tmpdir failed");
>
> Hmm I guess that we should add tst_brkm() to the lib/tst_tmpdir.c
> instead to check if the strdup has failed, which would be far easier
> than adding error handling to all tests.
>
> Something as:
>
> diff --git a/lib/tst_tmpdir.c b/lib/tst_tmpdir.c
> index 0c39eb89f..35b376478 100644
> --- a/lib/tst_tmpdir.c
> +++ b/lib/tst_tmpdir.c
> @@ -108,12 +108,18 @@ int tst_tmpdir_created(void)
>
> char *tst_get_tmpdir(void)
> {
> + char *ret;
> +
> if (TESTDIR == NULL) {
> tst_brkm(TBROK, NULL, "you must call tst_tmpdir() first");
> return NULL;
> }
>
> - return strdup(TESTDIR);
> + ret = strdup(TESTDIR);
> + if (!ret)
> + tst_brkm(TBROK, NULL, "strdup() failed");
> +
> + return ret;
> }
>
>
>> - if ((ltpuser = getpwnam(nobody_uid)) == NULL)
>> - tst_brkm(TBROK | TERRNO, cleanup,
>> - "getpwnam(\"nobody\") failed");
>> -
>> - SAFE_SETEUID(cleanup, ltpuser->pw_uid);
>> + if ((ltpuser = SAFE_GETPWNAM(nobody_uid)) == NULL)
>> + tst_brk(TBROK | TERRNO, "getpwnam(\"nobody\") failed");
>
> SAFE_SETEUID() cannot fail, there is no need to check the return value.
>
>
>> - tst_sig(NOFORK, DEF_HANDLER, cleanup);
>> -
>> - TEST_PAUSE;
>> + SAFE_SETEUID(ltpuser->pw_uid);
>> }
>>
>> -void cleanup(void)
>> +static void cleanup(void)
>> {
>> - SAFE_SETEUID(NULL, 0);
>> + SAFE_SETEUID(0);
>
> There is actually no need to reset the UID in new library tests, since
> the cleanup for temporary directory is carried on with the test library
> process.
>
>> - free(path);
>> - tst_rmdir();
>> + if (path) {
>> + free(path);
>> + path = NULL;
>> + }
>
> free(NULL) is no-op, no need for the if () here.
>
> All that has to be done in the cleanup is actually:
>
> static void cleanup(void)
> {
> free(path);
> }
>
>> }
>> +
>> +static struct tst_test test = {
>> + .cleanup = cleanup,
>> + .setup = setup,
>> + .test_all = verify_chroot,
>> + .needs_root = 1,
>> + .needs_tmpdir = 1,
>> +};
>> --
>> 2.20.1
>>
>>
>>
>>
>> --
>> Mailing list info: https://lists.linux.it/listinfo/ltp
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-08-05 10:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-05 7:33 [LTP] [PATCH] [1/4] syscalls/chroot01: Convert to new API zhanglianjie
2021-08-05 9:46 ` Cyril Hrubis
2021-08-05 10:06 ` zhanglianjie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.