From patchwork Wed Dec 21 07:52:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avinesh Kumar X-Patchwork-Id: 1718172 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=O3B69gJ5; dkim=fail reason="signature verification failed" header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=vN0U/nZb; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NcQdr0JZ6z1ydZ for ; Wed, 21 Dec 2022 18:52:31 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 6E1203CB362 for ; Wed, 21 Dec 2022 08:52:28 +0100 (CET) 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]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 1FC3D3C62B6 for ; Wed, 21 Dec 2022 08:52:25 +0100 (CET) Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-5.smtp.seeweb.it (Postfix) with ESMTPS id 24D24600848 for ; Wed, 21 Dec 2022 08:52:24 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 087416AFA9; Wed, 21 Dec 2022 07:52:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1671609144; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=CwO8eKnJRcsZNqJddxZRwCpwEApOPceYuYNUKArWcoM=; b=O3B69gJ5HsvmZ8CRQXWqj6fd4Blc5maspJz/ZY3fAcmA9E8F6Azbo0oWgjuU/OKGEXk/9w W/hzVjJAVUJC2d2R4njm04cjBaf+RJaQt6r50zbupHwo3NSM5VUVlrKi4qFoT5M/NWSahO viCFompL9NPXs846MTHvf9Eb37RuHdQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1671609144; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=CwO8eKnJRcsZNqJddxZRwCpwEApOPceYuYNUKArWcoM=; b=vN0U/nZbIsKoxhqAEhXubKppbva9B+7WDXH/KQh0ijuoel+X3/Kw9lv4kgdJw+bpC5sz8v ptQTjFqHtlLWUcCw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 60D7913913; Wed, 21 Dec 2022 07:52:23 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id rLv1Bze7omPaXAAAMHmgww (envelope-from ); Wed, 21 Dec 2022 07:52:23 +0000 From: Avinesh Kumar To: ltp@lists.linux.it Date: Wed, 21 Dec 2022 13:22:20 +0530 Message-Id: <20221221075220.14353-1-akumar@suse.de> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-5.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-5.smtp.seeweb.it Subject: [LTP] [PATCH] setreuid01.c: Rewrite using new LTP API and use TST_EXP* macros 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" Hi, I changed this simple setreuid() test to new LTP API but I think this is a subset of setreuid03.c test and can be removed altogether. Please share your opinion. If this should be removed, I'll post new patch for that. Signed-off-by: Avinesh Kumar --- .../kernel/syscalls/setreuid/setreuid01.c | 188 +++--------------- 1 file changed, 25 insertions(+), 163 deletions(-) diff --git a/testcases/kernel/syscalls/setreuid/setreuid01.c b/testcases/kernel/syscalls/setreuid/setreuid01.c index 54ba2d7a8..b0c1e0ab2 100644 --- a/testcases/kernel/syscalls/setreuid/setreuid01.c +++ b/testcases/kernel/syscalls/setreuid/setreuid01.c @@ -1,176 +1,38 @@ +// SPDX-License-Identifier: GPL-2.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/ - * - * Author: William Roske - * Co-pilot: Dave Fenner + * Author: William Roske + * Co-pilot: Dave Fenner + * Copyright (c) 2022 SUSE LLC Avinesh Kumar */ -/* - * Testcase to test the basic functionality of setreuid(2) system call. +/*\ + * [Description] + * + * Verify the basic functionality of setreuid(2) system call when executed + * as non-root user. */ -#include -#include -#include -#include +#include "tst_test.h" +#include "compat_tst_16.h" -#include "test.h" -#include "compat_16.h" +static uid_t ruid, euid; -static void setup(void); -static void cleanup(void); - -TCID_DEFINE(setreuid01); -int TST_TOTAL = 5; - -static uid_t ruid, euid; /* real and effective user ids */ - -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; - - /* - * TEST CASE: - * Don't change either real or effective uid - */ - ruid = getuid(); /* get real uid */ - UID16_CHECK(ruid, setreuid, cleanup); - - euid = geteuid(); /* get effective uid */ - UID16_CHECK(euid, setreuid, cleanup); - - TEST(SETREUID(cleanup, -1, -1)); + ruid = getuid(); + UID16_CHECK(ruid, setreuid); - if (TEST_RETURN == -1) { - tst_resm(TFAIL, - "setreuid - Don't change either real or effective uid failed, errno=%d : %s", - TEST_ERRNO, strerror(TEST_ERRNO)); - } else { - tst_resm(TPASS, - "setreuid - Don't change either real or effective uid returned %ld", - TEST_RETURN); - } + euid = geteuid(); + UID16_CHECK(euid, setreuid); - /* - * TEST CASE: - * change effective to effective uid - */ - - TEST(SETREUID(cleanup, -1, euid)); - - if (TEST_RETURN == -1) { - tst_resm(TFAIL, - "setreuid - change effective to effective uid failed, errno=%d : %s", - TEST_ERRNO, strerror(TEST_ERRNO)); - } else { - tst_resm(TPASS, - "setreuid - change effective to effective uid returned %ld", - TEST_RETURN); - } - - /* - * TEST CASE: - * change real to real uid - */ - - TEST(SETREUID(cleanup, ruid, -1)); - - if (TEST_RETURN == -1) { - tst_resm(TFAIL, - "setreuid - change real to real uid failed, errno=%d : %s", - TEST_ERRNO, strerror(TEST_ERRNO)); - } else { - tst_resm(TPASS, - "setreuid - change real to real uid returned %ld", - TEST_RETURN); - } - - /* - * TEST CASE: - * change effective to real uid - */ - - TEST(SETREUID(cleanup, -1, ruid)); - - if (TEST_RETURN == -1) { - tst_resm(TFAIL, - "setreuid - change effective to real uid failed, errno=%d : %s", - TEST_ERRNO, strerror(TEST_ERRNO)); - } else { - tst_resm(TPASS, - "setreuid - change effective to real uid returned %ld", - TEST_RETURN); - } - - /* - * TEST CASE: - * try to change real to current real - */ - - TEST(SETREUID(cleanup, ruid, ruid)); - - if (TEST_RETURN == -1) { - tst_resm(TFAIL, - "setreuid - try to change real to current real failed, errno=%d : %s", - TEST_ERRNO, strerror(TEST_ERRNO)); - } else { - tst_resm(TPASS, - "setreuid - try to change real to current real returned %ld", - TEST_RETURN); - } - - } - - cleanup(); - tst_exit(); -} - -static void setup(void) -{ - tst_sig(NOFORK, DEF_HANDLER, cleanup); - - TEST_PAUSE; - - tst_tmpdir(); + TST_EXP_PASS(setreuid(-1, -1)); + TST_EXP_PASS(setreuid(-1, euid)); + TST_EXP_PASS(setreuid(ruid, -1)); + TST_EXP_PASS(setreuid(-1, ruid)); + TST_EXP_PASS(setreuid(euid, -1)); } -static void cleanup(void) -{ - tst_rmdir(); -} +static struct tst_test test = { + .test_all = run +};