From patchwork Thu May 6 13:09:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xie Ziyao X-Patchwork-Id: 1474965 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=) Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FbYq91RJBz9sW4 for ; Thu, 6 May 2021 23:10:44 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 39DCC3C5DD9 for ; Thu, 6 May 2021 15:10:42 +0200 (CEST) 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]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id DD3783C1A24 for ; Thu, 6 May 2021 15:10:20 +0200 (CEST) Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-4.smtp.seeweb.it (Postfix) with ESMTPS id 39D5C10011CF for ; Thu, 6 May 2021 15:10:19 +0200 (CEST) Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4FbYkp1hJ4zqSgg for ; Thu, 6 May 2021 21:06:58 +0800 (CST) Received: from ubuntu1804.huawei.com (10.67.174.209) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.498.0; Thu, 6 May 2021 21:10:05 +0800 From: Xie Ziyao To: Date: Thu, 6 May 2021 21:09:48 +0800 Message-ID: <20210506130950.110267-2-xieziyao@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210506130950.110267-1-xieziyao@huawei.com> References: <20210506130950.110267-1-xieziyao@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.209] X-CFilter-Loop: Reflected X-Virus-Scanned: clamav-milter 0.102.4 at in-4.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=7.0 tests=SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-4.smtp.seeweb.it Subject: [LTP] [PATCH 1/3] syscalls/fchown: Convert fchown01 to the new API X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 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" Cleanup and convert fchown01 to the new API. Signed-off-by: Xie Ziyao --- testcases/kernel/syscalls/fchown/fchown01.c | 110 ++++++-------------- 1 file changed, 30 insertions(+), 80 deletions(-) -- 2.17.1 diff --git a/testcases/kernel/syscalls/fchown/fchown01.c b/testcases/kernel/syscalls/fchown/fchown01.c index 23cc78787..32fc53d6c 100644 --- a/testcases/kernel/syscalls/fchown/fchown01.c +++ b/testcases/kernel/syscalls/fchown/fchown01.c @@ -1,100 +1,50 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2000 Silicon Graphics, Inc. All Rights Reserved. - * AUTHOR : William Roske - * CO-PILOT : Dave Fenner - * - * 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/ + * AUTHOR: William Roske + * CO-PILOT: Dave Fenner + */ + +/*\ + * [Description] * + * Basic test for fchown(). Call fchown() on a fd and expect it to pass. */ -#include -#include -#include -#include -#include -#include -#include "test.h" -#include "safe_macros.h" -#include "compat_16.h" +#include +#include +#include -static void setup(void); -static void cleanup(void); +#include "tst_test.h" +#include "compat_tst_16.h" -TCID_DEFINE(fchown01); -int TST_TOTAL = 1; +#define FILENAME "fchown01_testfile" +#define MODE 0700 static int fd; +static int uid, gid; -int main(int ac, char **av) +static void run(void) { - int lc; - - tst_parse_opts(ac, av, NULL, NULL); - - setup(); - - for (lc = 0; TEST_LOOPING(lc); lc++) { - - tst_count = 0; - - UID16_CHECK(geteuid(), "fchown", cleanup) - GID16_CHECK(getegid(), "fchown", cleanup) - - TEST(FCHOWN(cleanup, fd, geteuid(), getegid())); - - if (TEST_RETURN == -1) { - tst_resm(TFAIL | TTERRNO, "fchown failed"); - } else { - tst_resm(TPASS, - "fchown(fd, geteuid(), getegid()) " - "returned %ld", TEST_RETURN); - } - } - - cleanup(); - tst_exit(); + TST_EXP_PASS(FCHOWN(fd, uid, gid)); } static void setup(void) { - tst_sig(FORK, DEF_HANDLER, cleanup); - - TEST_PAUSE; - - tst_tmpdir(); - fd = SAFE_OPEN(cleanup, "tempfile", O_RDWR | O_CREAT, 0700); + UID16_CHECK(uid = geteuid(), "fchown"); + GID16_CHECK(gid = getegid(), "fchown"); + fd = SAFE_OPEN(FILENAME, O_RDWR | O_CREAT, MODE); } static void cleanup(void) { - if (fd > 0 && close(fd)) - tst_resm(TWARN | TERRNO, "Failed to close fd"); - - tst_rmdir(); + if (fd > 0) + SAFE_CLOSE(fd); } + +static struct tst_test test = { + .needs_tmpdir = 1, + .setup = setup, + .cleanup = cleanup, + .test_all = run, +};