From patchwork Thu Jun 14 11:29:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinhui Huang X-Patchwork-Id: 929374 X-Patchwork-Delegate: petr.vorel@gmail.com 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 4161cW0BXsz9s1B for ; Thu, 14 Jun 2018 21:29:46 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 821A21A97A3 for ; Thu, 14 Jun 2018 13:29:44 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-5.smtp.seeweb.it (in-5.smtp.seeweb.it [217.194.8.5]) by picard.linux.it (Postfix) with ESMTP id DC4591A962C for ; Thu, 14 Jun 2018 13:29:42 +0200 (CEST) Received: from heian.cn.fujitsu.com (mail.cn.fujitsu.com [183.91.158.132]) by in-5.smtp.seeweb.it (Postfix) with ESMTP id 0A33E60101C for ; Thu, 14 Jun 2018 13:29:35 +0200 (CEST) X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="41067058" Received: from localhost (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 14 Jun 2018 19:29:29 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id 1591C4B41E7D for ; Thu, 14 Jun 2018 19:29:25 +0800 (CST) Received: from localhost.localdomain.localdomain (10.167.220.196) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.399.0; Thu, 14 Jun 2018 19:29:31 +0800 From: Jinhui huang To: Date: Thu, 14 Jun 2018 19:29:22 +0800 Message-ID: <1528975762-10624-2-git-send-email-huangjh.jy@cn.fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1528975762-10624-1-git-send-email-huangjh.jy@cn.fujitsu.com> References: <1528975762-10624-1-git-send-email-huangjh.jy@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.220.196] X-yoursite-MailScanner-ID: 1591C4B41E7D.AFA7A X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: huangjh.jy@cn.fujitsu.com X-Spam-Status: No, score=0.0 required=7.0 tests=none autolearn=disabled version=3.4.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-5.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-5.smtp.seeweb.it Subject: [LTP] [PATCH 2/2] syscalls/fchmod05.c: 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" Signed-off-by: Jinhui huang --- testcases/kernel/syscalls/fchmod/fchmod05.c | 238 ++++++---------------------- 1 file changed, 52 insertions(+), 186 deletions(-) diff --git a/testcases/kernel/syscalls/fchmod/fchmod05.c b/testcases/kernel/syscalls/fchmod/fchmod05.c index 0ab2023..ffddd58 100644 --- a/testcases/kernel/syscalls/fchmod/fchmod05.c +++ b/testcases/kernel/syscalls/fchmod/fchmod05.c @@ -1,24 +1,7 @@ +// 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 - */ - -/* - * Test Name: fchmod05 + * Copyright (c) International Business Machines Corp., 2001 + * Author: Wayne Boyer * * Test Description: * Verify that, fchmod(2) will succeed to change the mode of a directory @@ -31,197 +14,80 @@ * Expected Result: * fchmod() should return value 0 on success and though succeeds to change * the mode of a directory but fails to set setgid bit on it. - * - * Algorithm: - * Setup: - * Setup signal handling. - * Create 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 and Issue a FAIL message. - * Otherwise, - * Verify the Functionality of system call - * if successful, - * Issue Functionality-Pass message. - * Otherwise, - * Issue Functionality-Fail message. - * Cleanup: - * Print errno log and/or timing stats if options given - * Delete the temporary directory created. - * - * Usage: - * fchmod05 [-c n] [-f] [-i n] [-I x] [-P x] [-t] - * where, -c n : Run n copies concurrently. - * -f : Turn off functionality Testing. - * -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: - * This test should be run by 'non-super-user' only. - * */ #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include -#include "test.h" -#include "safe_macros.h" +#include "tst_test.h" #include "fchmod.h" -#define PERMS_GID 043777 +#define PERMS_DIR 043777 -int fd; /* file descriptor for test directory */ -char *TCID = "fchmod05"; -int TST_TOTAL = 1; +static int fd; -void setup(); /* Main setup function for test */ -void cleanup(); /* Main cleanup function for test */ - -int main(int ac, char **av) +static void verify_fchmod(void) { - struct stat stat_buf; /* stat struct */ - int lc; - mode_t dir_mode; /* mode permissions set on test directory */ - - tst_parse_opts(ac, av, NULL, NULL); - - setup(); - - for (lc = 0; TEST_LOOPING(lc); lc++) { - - tst_count = 0; - - /* - * Call fchmod(2) with mode argument - * to set setgid bit on TESTDIR. - */ - - TEST(fchmod(fd, PERMS_GID)); - - if (TEST_RETURN == -1) { - tst_resm(TFAIL, "fchmod(%d, %#o) Failed, errno=%d : %s", - fd, PERMS, TEST_ERRNO, strerror(TEST_ERRNO)); - continue; - } - /* - * Get the directory information using - * fstat(2). - */ - if (fstat(fd, &stat_buf) < 0) { - tst_brkm(TFAIL, cleanup, - "fstat(2) of %s failed, errno:%d", - TESTDIR, TEST_ERRNO); - } - dir_mode = stat_buf.st_mode; - if ((PERMS_GID & ~S_ISGID) != dir_mode) { - tst_resm(TFAIL, "%s: Incorrect modes 0%03o, " - "Expected 0%03o", - TESTDIR, dir_mode, PERMS_GID & ~S_ISGID); - } else { - tst_resm(TPASS, "Functionality of fchmod(%d, " - "%#o) successful", fd, - PERMS_GID & ~S_ISGID); - } + struct stat stat_buf; + mode_t dir_mode; + + TEST(fchmod(fd, PERMS_DIR)); + if (TEST_RETURN == -1) + tst_res(TFAIL | TTERRNO, "fchmod() failed unexpectly"); + + SAFE_FSTAT(fd, &stat_buf); + dir_mode = stat_buf.st_mode; + + if ((PERMS_DIR & ~S_ISGID) != dir_mode) { + tst_res(TFAIL, "%s: Incorrect modes 0%03o, Expected 0%03o", + TESTDIR, dir_mode & ~S_ISGID, PERMS_DIR); + } else { + tst_res(TPASS, "Functionality of fchmod(%d, %#o) successful", + fd, PERMS_DIR); } - - cleanup(); - tst_exit(); } -/* - * void - * setup() - performs all ONE TIME setup for this test. - * Create a temporary directory and cd to it. - * Create a test directory under temporary directory. - * Invoke setuid to root program to modify group ownership - * on test directory. - * Open the test directory for reading. - */ -void setup(void) +static void setup(void) { - struct passwd *nobody_u; - struct group *bin_group; - - tst_require_root(); - - tst_sig(FORK, DEF_HANDLER, cleanup); - - TEST_PAUSE; - - tst_tmpdir(); + struct passwd *ltpuser; + struct group *ltpgroup; - nobody_u = getpwnam("nobody"); - if (!nobody_u) - tst_brkm(TBROK, cleanup, - "Couldn't find uid of nobody: %s", strerror(errno)); + ltpuser = SAFE_GETPWNAM("nobody"); + ltpgroup = SAFE_GETGRNAM("bin"); - bin_group = getgrnam("bin"); - if (!bin_group) - tst_brkm(TBROK, cleanup, - "Couldn't find gid of bin: %s", strerror(errno)); + SAFE_MKDIR(TESTDIR, DIR_MODE); - /* - * Create a test directory under temporary directory with specified - * mode permissions and change the gid of test directory to that of - * guest user. - */ - SAFE_MKDIR(cleanup, TESTDIR, DIR_MODE); - - if (setgroups(1, &nobody_u->pw_gid) == -1) - tst_brkm(TBROK, cleanup, - "Couldn't change supplementary group Id: %s", - strerror(errno)); + if (setgroups(1, <puser->pw_gid) == -1) { + tst_brk(TBROK, "Couldn't change supplementary group Id: %s", + tst_strerrno(TEST_ERRNO)); + } - SAFE_CHOWN(cleanup, TESTDIR, nobody_u->pw_uid, bin_group->gr_gid); + SAFE_CHOWN(TESTDIR, ltpuser->pw_uid, ltpgroup->gr_gid); - /* change to nobody:nobody */ - if (setegid(nobody_u->pw_gid) == -1 || seteuid(nobody_u->pw_uid) == -1) - tst_brkm(TBROK, cleanup, "Couldn't switch to nobody:nobody: %s", - strerror(errno)); + SAFE_SETEGID(ltpuser->pw_gid); + SAFE_SETEUID(ltpuser->pw_uid); - /* Open the test directory for reading */ - fd = SAFE_OPEN(cleanup, TESTDIR, O_RDONLY); + fd = SAFE_OPEN(TESTDIR, O_RDONLY); } -/* - * void - * cleanup() - performs all ONE TIME cleanup for this test at - * completion or premature exit. - * Close the test directory opened in the setup(). - * Remove the test directory and temporary directory created in - * in the setup(). - */ -void cleanup(void) +static void cleanup(void) { + if (fd > 0) + SAFE_CLOSE(fd); - /* Close the test directory opened in the setup() */ - SAFE_CLOSE(NULL, fd); - - SAFE_SETEGID(NULL, 0); - SAFE_SETEUID(NULL, 0); - - tst_rmdir(); - + SAFE_SETEGID(0); + SAFE_SETEUID(0); } + +static struct tst_test test = { + .test_all = verify_fchmod, + .needs_root = 1, + .setup = setup, + .cleanup = cleanup, + .needs_tmpdir = 1, +};