syscalls/chroot01: Convert to new API
PATCH v2 1/4 syscalls/chroot01: Convert to new API
Signed-off-by zhanglianjie <[email protected]>
testcases/kernel/syscalls/chroot/chroot01.c +26 -96
@@ -1,116 +1,46 @@ +// 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. -* -* ALGORITHM -* As a non-root user attempt to perform chroot() to a directory. The -* chroot() call should fail with EPERM +/*\ +* [DESCRIPTION] * -* 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> +#include "tst_test.h" -char *TCID ="chroot01" ; -int TST_TOTAL =1 ; -int fail; - -char *path; - -char nobody_uid[] ="nobody" ; -struct passwd *ltpuser; +static char *path; +static char nobody_uid[] ="nobody" ; +static struct passwd *ltpuser; -void setup (void ); -void cleanup (void ); - -int main (int ac,char **av) +static void verify_chroot (void ) { -int lc; - -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 (); - +TST_EXP_FAIL (chroot (path),EPERM ,"chroot set errno to EPERM." ); } -void setup (void ) +static void setup (void ) { -tst_require_root (); - -tst_tmpdir (); path =tst_get_tmpdir (); - -if ((ltpuser =getpwnam (nobody_uid)) ==NULL ) -tst_brkm (TBROK |TERRNO , cleanup, -"getpwnam(\"nobody\") failed" ); - -SAFE_SETEUID (cleanup, ltpuser->pw_uid); - -tst_sig (NOFORK ,DEF_HANDLER , cleanup); - -TEST_PAUSE ; + ltpuser =SAFE_GETPWNAM (nobody_uid); +SAFE_SETEUID (ltpuser->pw_uid); } -void cleanup (void ) +static void cleanup (void ) { -SAFE_SETEUID (NULL ,0 ); -free (path); -tst_rmdir (); } + +static struct tst_test test = { + .cleanup = cleanup, + .setup = setup, + .test_all = verify_chroot, + .needs_root =1 , + .needs_tmpdir =1 , +}; +
--
2.20.1
PATCH v2 1/4 syscalls/chroot01: Convert to new API
Hi!
Pushed with a minor changes.
Most important is that the description comment section should be called [Description] not [DESCRIPTION].
Full diff:
testcases/kernel/syscalls/chroot/chroot01.c +6 -5
@@ -4,9 +4,10 @@*/ /*\ -* [DESCRIPTION] +* [Description] * * 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 */
@@ -16,18 +17,18 @@#include "tst_test.h" static char *path; -static char nobody_uid[] ="nobody" ; -static struct passwd *ltpuser;static void verify_chroot (void ) { -TST_EXP_FAIL (chroot (path),EPERM ,"chroot set errno to EPERM." ); +TST_EXP_FAIL (chroot (path),EPERM ,"unprivileged chroot()" ); }static void setup (void ) { +struct passwd *ltpuser; + path =tst_get_tmpdir (); - ltpuser =SAFE_GETPWNAM (nobody_uid); + ltpuser =SAFE_GETPWNAM ("nobody" );SAFE_SETEUID (ltpuser->pw_uid); }
Signature · 2 lines
Cyril Hrubis [email protected]