From patchwork Fri Mar 23 11:34:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: yang xu X-Patchwork-Id: 889917 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cn.fujitsu.com Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4071gM6P0Gz9s1B for ; Fri, 23 Mar 2018 22:35:26 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 8B0CB3E7032 for ; Fri, 23 Mar 2018 12:35:24 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-4.smtp.seeweb.it (in-4.smtp.seeweb.it [217.194.8.4]) by picard.linux.it (Postfix) with ESMTP id 399813E662D for ; Fri, 23 Mar 2018 12:35:23 +0100 (CET) Received: from heian.cn.fujitsu.com (mail.cn.fujitsu.com [183.91.158.132]) by in-4.smtp.seeweb.it (Postfix) with ESMTP id E95081000DF2 for ; Fri, 23 Mar 2018 12:35:17 +0100 (CET) X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="38103683" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 23 Mar 2018 19:35:03 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id AC39448AE76D for ; Fri, 23 Mar 2018 19:35:01 +0800 (CST) Received: from localhost.localdomain (10.167.220.182) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.361.1; Fri, 23 Mar 2018 19:35:01 +0800 From: yang xu To: Date: Fri, 23 Mar 2018 19:34:52 +0800 Message-ID: <1521804892-5783-5-git-send-email-xuyang.jy@cn.fujitsu.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1521804892-5783-1-git-send-email-xuyang.jy@cn.fujitsu.com> References: <1521804892-5783-1-git-send-email-xuyang.jy@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.220.182] X-yoursite-MailScanner-ID: AC39448AE76D.AEE2C X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: xuyang.jy@cn.fujitsu.com X-Spam-Status: No, score=-0.0 required=7.0 tests=T_RP_MATCHES_RCVD autolearn=disabled version=3.4.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-4.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-4.smtp.seeweb.it Subject: [LTP] [PATCH 5/5] syscalls/mkdir05, 08: Cleanup && Convert to new API X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" 1) Take use of some safe macros 2) Remove duplicate tests mkdir08 Signed-off-by: yang xu --- testcases/kernel/syscalls/mkdir/mkdir05.c | 147 ++++++---------------- testcases/kernel/syscalls/mkdir/mkdir08.c | 196 ------------------------------ 2 files changed, 38 insertions(+), 305 deletions(-) delete mode 100644 testcases/kernel/syscalls/mkdir/mkdir08.c diff --git a/testcases/kernel/syscalls/mkdir/mkdir05.c b/testcases/kernel/syscalls/mkdir/mkdir05.c index 3d25c43..d5ae930 100644 --- a/testcases/kernel/syscalls/mkdir/mkdir05.c +++ b/testcases/kernel/syscalls/mkdir/mkdir05.c @@ -1,6 +1,5 @@ -/* - * Copyright (c) International Business Machines Corp., 2001 - * 07/2001 Ported by Wayne Boyer +/* Copyright (c) International Business Machines Corp., 2001 + * 07/2001 Ported by Wayne Boyer * * 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 @@ -13,137 +12,67 @@ * 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 + * along with this program. If not, see . */ -/* - * DESCRIPTION - * This test will verify the mkdir(2) syscall basic functionality +/* DESCRIPTION + * This test will verify the mkdir(2) creates a new directory successfully and + * it is owned by the effective group ID of the process. */ #include -#include -#include #include #include -#include #include #include -#include "test.h" -#include "safe_macros.h" - -void setup(); -void cleanup(); +#include "tst_test.h" #define PERMS 0777 +#define TESTDIR "testdir" -char *TCID = "mkdir05"; -int TST_TOTAL = 1; - -char nobody_uid[] = "nobody"; -struct passwd *ltpuser; - -char tstdir1[100]; - -int main(int ac, char **av) +static void verify_mkdir(void) { - int lc; struct stat buf; - /* - * parse standard options - */ - tst_parse_opts(ac, av, NULL, NULL); - - /* - * perform global setup for test - */ - setup(); - - /* - * check looping state if -i option given - */ - for (lc = 0; TEST_LOOPING(lc); lc++) { - - tst_count = 0; - - /* - * TEST mkdir() base functionality - */ - - /* Initialize the test directory name */ - sprintf(tstdir1, "tstdir1.%d", getpid()); - - /* Call mkdir(2) using the TEST macro */ - TEST(mkdir(tstdir1, PERMS)); - - if (TEST_RETURN == -1) { - tst_resm(TFAIL, "mkdir(%s, %#o) Failed", - tstdir1, PERMS); - continue; - } - - SAFE_STAT(cleanup, tstdir1, &buf); - /* check the owner */ - if (buf.st_uid != geteuid()) { - tst_resm(TFAIL, "mkdir() FAILED to set owner ID" - " as process's effective ID"); - continue; - } - /* check the group ID */ - if (buf.st_gid != getegid()) { - tst_resm(TFAIL, "mkdir() failed to set group ID" - " as the process's group ID"); - continue; - } - tst_resm(TPASS, "mkdir() functionality is correct"); - - /* clean up things in case we are looping */ - SAFE_RMDIR(cleanup, tstdir1); - + TEST(mkdir(TESTDIR, PERMS)); + if (TEST_RETURN == -1) { + tst_res(TFAIL | TTERRNO, "mkdir() Failed"); + return; } - cleanup(); - tst_exit(); -} - -/* - * setup() - performs all ONE TIME setup for this test. - */ -void setup(void) -{ - tst_require_root(); + SAFE_STAT(TESTDIR, &buf); - ltpuser = getpwnam(nobody_uid); - if (setuid(ltpuser->pw_uid) == -1) { - tst_resm(TINFO, "setuid failed to " - "to set the effective uid to %d", ltpuser->pw_uid); - perror("setuid"); + if (buf.st_uid != geteuid()) { + tst_res(TFAIL, "mkdir() FAILED to set owner ID " + "as process's effective ID"); + return; } - tst_sig(FORK, DEF_HANDLER, cleanup); + if (buf.st_gid != getegid()) { + tst_res(TFAIL, "mkdir() failed to set group ID " + "as the process's group ID"); + return; + } - TEST_PAUSE; + tst_res(TPASS, "mkdir() functionality is correct"); - /* Create a temporary directory and make it current. */ - tst_tmpdir(); + SAFE_RMDIR(TESTDIR); } -/* - * cleanup() - performs all ONE TIME cleanup for this test at - * completion or premature exit. - */ -void cleanup(void) +void setup(void) { + struct passwd *pw; + static uid_t nobody_uid; - /* - * Remove the temporary directory. - */ - tst_rmdir(); - - /* - * Exit with return code appropriate for results. - */ + pw = SAFE_GETPWNAM("nobody"); + nobody_uid = pw->pw_uid; + SAFE_SETUID(nobody_uid); } + +static struct tst_test test = { + .test_all = verify_mkdir, + .needs_tmpdir = 1, + .needs_root = 1, + .setup = setup, +}; diff --git a/testcases/kernel/syscalls/mkdir/mkdir08.c b/testcases/kernel/syscalls/mkdir/mkdir08.c deleted file mode 100644 index ead218a..0000000 --- a/testcases/kernel/syscalls/mkdir/mkdir08.c +++ /dev/null @@ -1,196 +0,0 @@ -/* - * Copyright (c) 2000 Silicon Graphics, Inc. All Rights Reserved. - * - * 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. - * - * Further, this software is distributed without any warranty that it is - * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or - * otherwise, applies only to this software file. Patent licenses, if - * any, provided herein do not apply to combinations of this program with - * other software, or any other product whatsoever. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, - * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * - * http://oss.sgi.com/projects/GenInfo/NoticeExplan/ - * - */ -/* $Id: mkdir08.c,v 1.6 2009/11/02 13:57:17 subrata_modak Exp $ */ -/********************************************************** - * - * OS Test - Silicon Graphics, Inc. - * - * TEST IDENTIFIER : mkdir08 - * - * EXECUTED BY : anyone - * - * TEST TITLE : Basic test for mkdir(2) - * - * PARENT DOCUMENT : usctpl01 - * - * TEST CASE TOTAL : 1 - * - * WALL CLOCK TIME : 1 - * - * CPU TYPES : ALL - * - * AUTHOR : William Roske - * - * CO-PILOT : Dave Fenner - * - * DATE STARTED : 03/30/92 - * - * INITIAL RELEASE : UNICOS 7.0 - * - * TEST CASES - * - * 1.) mkdir(2) returns...(See Description) - * - * INPUT SPECIFICATIONS - * The standard options for system call tests are accepted. - * (See the parse_opts(3) man page). - * - * OUTPUT SPECIFICATIONS - *$ - * DURATION - * Terminates - with frequency and infinite modes. - * - * SIGNALS - * Uses SIGUSR1 to pause before test if option set. - * (See the parse_opts(3) man page). - * - * RESOURCES - * None - * - * ENVIRONMENTAL NEEDS - * No run-time environmental needs. - * - * SPECIAL PROCEDURAL REQUIREMENTS - * None - * - * INTERCASE DEPENDENCIES - * None - * - * DETAILED DESCRIPTION - * This is a Phase I test for the mkdir(2) system call. It is intended - * to provide a limited exposure of the system call, for now. It - * should/will be extended when full functional tests are written for - * mkdir(2). - * - * Setup: - * Setup signal handling. - * Pause for SIGUSR1 if option specified. - * - * Test: - * Loop if the proper options are given. - * Execute system call - * Check return code, if system call failed (return=-1) - * Log the errno and Issue a FAIL message. - * Otherwise, Issue a PASS message. - * - * Cleanup: - * Print errno log and/or timing stats if options given - * - * - *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/ - -#include -#include -#include -#include -#include -#include -#include -#include "test.h" -#include "safe_macros.h" - -void setup(); -void cleanup(); - -char *TCID = "mkdir08"; -int TST_TOTAL = 1; - -char fname[255]; - -int main(int ac, char **av) -{ - int lc; - - /*************************************************************** - * parse standard options - ***************************************************************/ - tst_parse_opts(ac, av, NULL, NULL); - - /*************************************************************** - * perform global setup for test - ***************************************************************/ - setup(); - - /*************************************************************** - * check looping state if -c option given - ***************************************************************/ - for (lc = 0; TEST_LOOPING(lc); lc++) { - - tst_count = 0; - - /* - * Call mkdir(2) - */ - TEST(mkdir(fname, 0777)); - - /* check return code */ - if (TEST_RETURN == -1) { - tst_resm(TFAIL, "mkdir(%s) Failed, errno=%d : %s", - fname, TEST_ERRNO, strerror(TEST_ERRNO)); - } else { - tst_resm(TPASS, "mkdir(%s) returned %ld", fname, - TEST_RETURN); - SAFE_RMDIR(cleanup, fname); - } - - } - - cleanup(); - tst_exit(); -} - -/*************************************************************** - * setup() - performs all ONE TIME setup for this test. - ***************************************************************/ -void setup(void) -{ - - tst_sig(NOFORK, DEF_HANDLER, cleanup); - - TEST_PAUSE; - - tst_tmpdir(); - - sprintf(fname, "./dir_%d", getpid()); -} - -/*************************************************************** - * cleanup() - performs all ONE TIME cleanup for this test at - * completion or premature exit. - ***************************************************************/ -void cleanup(void) -{ - - tst_rmdir(); - -}