From patchwork Fri Mar 23 11:34:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: yang xu X-Patchwork-Id: 889918 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 4071gR2tggz9s0q for ; Fri, 23 Mar 2018 22:35:31 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id C0E343E7046 for ; Fri, 23 Mar 2018 12:35:28 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [IPv6:2001:4b78:1:20::7]) by picard.linux.it (Postfix) with ESMTP id 6F7ED3E706F for ; Fri, 23 Mar 2018 12:35:25 +0100 (CET) Received: from heian.cn.fujitsu.com (mail.cn.fujitsu.com [183.91.158.132]) by in-7.smtp.seeweb.it (Postfix) with ESMTP id 211DB20152A for ; Fri, 23 Mar 2018 12:35:20 +0100 (CET) X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="38103680" 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 8C61D4D0EFF3 for ; Fri, 23 Mar 2018 19:34:59 +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:34:59 +0800 From: yang xu To: Date: Fri, 23 Mar 2018 19:34:49 +0800 Message-ID: <1521804892-5783-2-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: 8C61D4D0EFF3.A1888 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-7.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-7.smtp.seeweb.it Subject: [LTP] [PATCH 2/5] syscalls/mkdir01, 03: 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 mkdir01 3) Use tst_get_bad_addr to get a bad addr Signed-off-by: yang xu --- testcases/kernel/syscalls/mkdir/mkdir01.c | 203 ------------------------------ testcases/kernel/syscalls/mkdir/mkdir03.c | 32 ++--- 2 files changed, 12 insertions(+), 223 deletions(-) delete mode 100644 testcases/kernel/syscalls/mkdir/mkdir01.c diff --git a/testcases/kernel/syscalls/mkdir/mkdir01.c b/testcases/kernel/syscalls/mkdir/mkdir01.c deleted file mode 100644 index 84012c0..0000000 --- a/testcases/kernel/syscalls/mkdir/mkdir01.c +++ /dev/null @@ -1,203 +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: mkdir01.c,v 1.7 2009/03/23 13:35:54 subrata_modak Exp $ */ -/********************************************************** - * - * OS Test - Silicon Graphics, Inc. - * - * TEST IDENTIFIER : mkdir01 - * - * EXECUTED BY : anyone - * - * TEST TITLE : Basic errno test for mkdir(2) - * - * PARENT DOCUMENT : mkstds02 - * - * TEST CASE TOTAL : 2 - * - * WALL CLOCK TIME : 1 - * - * CPU TYPES : ALL - * - * AUTHOR : Bill Branum - * - * CO-PILOT : Kathy Olmsted - * - * DATE STARTED : 4/15/92 - * - * INITIAL RELEASE : UNICOS 7.0 - * - * TEST CASES - * - * mkdir(2) test for errno(s) EFAULT. - * - * INPUT SPECIFICATIONS - * The standard options for system call tests are accepted. - * (See the parse_opts(3) man page). - * - * DURATION - * Terminates - with frequency and infinite modes. - * - * SIGNALS - * Uses SIGUSR1 to pause before test if option set. - * (See the parse_opts(3) man page). - * - * ENVIRONMENTAL NEEDS - * No run-time environmental needs. - * - * DETAILED DESCRIPTION - * This test will verify that mkdir(2) returns a value of - * -1 and sets errno to EFAULT when the path argument points - * outside (above/below) the allocated address space of the - * process. - * - * Setup: - * Setup signal handling. - * Create and make current a temporary directory. - * 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. - * If doing functional test - * check the errno returned and print result message - * - * Cleanup: - * Print errno log and/or timing stats if options given - * Remove the temporary directory. - * Exit. - * - * - *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include "test.h" - -void setup(); -void cleanup(); - -char *TCID = "mkdir01"; -int TST_TOTAL = 1; - -char *bad_addr = 0; - -int main(int ac, char **av) -{ - int lc; - - tst_parse_opts(ac, av, NULL, NULL); - - setup(); - - for (lc = 0; TEST_LOOPING(lc); lc++) { - - tst_count = 0; - - /* - * TEST CASE: 1 - * mkdir() call with pointer below allocated address space. - */ - - /* Call mkdir(2) */ - TEST(mkdir(bad_addr, 0777)); - - /* check return code */ - if (TEST_RETURN == -1) { - } - - if (TEST_RETURN == -1) { - if (TEST_ERRNO == EFAULT) { - tst_resm(TPASS, - "mkdir - path argument pointing below allocated address space failed as expected with errno %d : %s", - TEST_ERRNO, - strerror(TEST_ERRNO)); - } else { - tst_resm(TFAIL, - "mkdir - path argument pointing below allocated address space failed with errno %d : %s but expected %d (EFAULT)", - TEST_ERRNO, - strerror(TEST_ERRNO), EFAULT); - } - } else { - tst_resm(TFAIL, - "mkdir - path argument pointing below allocated address space succeeded unexpectedly."); - - } - - } - - cleanup(); - tst_exit(); -} - -/*************************************************************** - * setup() - performs all ONE TIME setup for this test. - ***************************************************************/ -void setup(void) -{ - - tst_sig(NOFORK, DEF_HANDLER, cleanup); - - TEST_PAUSE; - - /* Create a temporary directory and make it current. */ - tst_tmpdir(); - - bad_addr = tst_get_bad_addr(cleanup); -} - -/*************************************************************** - * cleanup() - performs all ONE TIME cleanup for this test at - * completion or premature exit. - ***************************************************************/ -void cleanup(void) -{ - - /* - * Remove the temporary directory. - */ - tst_rmdir(); - - /* - * Exit with return code appropriate for results. - */ - -} diff --git a/testcases/kernel/syscalls/mkdir/mkdir03.c b/testcases/kernel/syscalls/mkdir/mkdir03.c index 5d7f1e1..9441afe 100644 --- a/testcases/kernel/syscalls/mkdir/mkdir03.c +++ b/testcases/kernel/syscalls/mkdir/mkdir03.c @@ -46,20 +46,18 @@ static char long_dir[PATH_MAX + 2] = {[0 ... PATH_MAX + 1] = 'a'}; static char loop_dir[PATH_MAX] = "."; struct tcase; -static void prot_none_pathname(struct tcase *tc); static struct tcase { char *pathname; int exp_errno; - void (*setupfunc)(struct tcase *tc); } TC[] = { - {NULL, EFAULT, prot_none_pathname}, - {long_dir, ENAMETOOLONG, NULL}, - {TST_EEXIST, EEXIST, NULL}, - {TST_ENOENT, ENOENT, NULL}, - {TST_ENOTDIR_DIR, ENOTDIR, NULL}, - {loop_dir, ELOOP, NULL}, - {TST_EROFS, EROFS, NULL}, + {NULL, EFAULT}, + {long_dir, ENAMETOOLONG}, + {TST_EEXIST, EEXIST}, + {TST_ENOENT, ENOENT}, + {TST_ENOTDIR_DIR, ENOTDIR}, + {loop_dir, ELOOP}, + {TST_EROFS, EROFS}, }; static void verify_mkdir(unsigned int n) @@ -82,12 +80,6 @@ static void verify_mkdir(unsigned int n) } } -static void prot_none_pathname(struct tcase *tc) -{ - tc->pathname = SAFE_MMAP(0, 1, PROT_NONE, - MAP_PRIVATE | MAP_ANONYMOUS, 0, 0); -} - static void setup(void) { unsigned int i; @@ -95,15 +87,15 @@ static void setup(void) SAFE_TOUCH(TST_EEXIST, MODE, NULL); SAFE_TOUCH(TST_ENOTDIR_FILE, MODE, NULL); + for (i = 0; i < ARRAY_SIZE(TC); i++) { + if (TC[i].exp_errno == EFAULT) + TC[i].pathname = tst_get_bad_addr(NULL); + } + SAFE_MKDIR("test_eloop", DIR_MODE); SAFE_SYMLINK("../test_eloop", "test_eloop/test_eloop"); for (i = 0; i < 43; i++) strcat(loop_dir, "/test_eloop"); - - for (i = 0; i < ARRAY_SIZE(TC); i++) { - if (TC[i].setupfunc) - TC[i].setupfunc(&TC[i]); - } } static struct tst_test test = {