From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1310CC54EBC for ; Tue, 10 Jan 2023 11:12:38 +0000 (UTC) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id BE5683CCB27 for ; Tue, 10 Jan 2023 12:12:36 +0100 (CET) Received: from in-2.smtp.seeweb.it (in-2.smtp.seeweb.it [IPv6:2001:4b78:1:20::2]) (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 980BD3CB57B for ; Tue, 10 Jan 2023 12:12:27 +0100 (CET) Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) (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-2.smtp.seeweb.it (Postfix) with ESMTPS id 8BE28600819 for ; Tue, 10 Jan 2023 12:12:25 +0100 (CET) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id D0E4D68670 for ; Tue, 10 Jan 2023 11:12:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1673349144; h=from:from:reply-to:reply-to:date:date:message-id:message-id:to:to: cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=LSNzafLpgYOjH4PZwy6Xv0W8RxjKwGUHrJAsnvjhJdg=; b=jFx3+JB88MRaQ5ag4htCKnthYIBcONeD+K2MUY7qSgE6+ovqZZQg2GBfB6yHWvAGjMwRh3 OFcE9OpbqoFAL+347ZKfkz4NsSCdinqyD8tH04JQ7tAf56BPoq5tJK5Ei6FffSUKuzHox/ JU2sEd216IZs8wC95vBRZ24mSHsvv50= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1673349144; h=from:from:reply-to:reply-to:date:date:message-id:message-id:to:to: cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=LSNzafLpgYOjH4PZwy6Xv0W8RxjKwGUHrJAsnvjhJdg=; b=1sdQIn+BlO9BCMzKKuNHQiKe5W1EfGokO0IjhjL4cqsypqvKfX/6uT0aAeSsTR4LYvbMeH bfvIZBAwxtdHTsBQ== Received: from g78 (unknown [10.163.17.14]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id A82702C141; Tue, 10 Jan 2023 11:12:21 +0000 (UTC) References: <87pmbniw9o.fsf@suse.de> <20230110103509.18335-1-akumar@suse.de> User-agent: mu4e 1.8.13; emacs 28.2 From: Richard Palethorpe To: Avinesh Kumar Date: Tue, 10 Jan 2023 11:12:16 +0000 Organization: Linux Private Site In-reply-to: <20230110103509.18335-1-akumar@suse.de> Message-ID: <87r0w2hcdk.fsf@suse.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-2.smtp.seeweb.it X-Virus-Status: Clean Subject: Re: [LTP] [PATCH v2] 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: , Reply-To: rpalethorpe@suse.de Cc: ltp@lists.linux.it Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-bounces+ltp=archiver.kernel.org@lists.linux.it Sender: "ltp" Hello, Merged, thanks! Avinesh Kumar writes: > Signed-off-by: Avinesh Kumar > --- > .../kernel/syscalls/setreuid/setreuid01.c | 194 +++--------------- > 1 file changed, 29 insertions(+), 165 deletions(-) > > diff --git a/testcases/kernel/syscalls/setreuid/setreuid01.c b/testcases/kernel/syscalls/setreuid/setreuid01.c > index 54ba2d7a8..bbf29d360 100644 > --- a/testcases/kernel/syscalls/setreuid/setreuid01.c > +++ b/testcases/kernel/syscalls/setreuid/setreuid01.c > @@ -1,176 +1,40 @@ > +// 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)); > - > - 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); > - } > - > - /* > - * 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(); > + ruid = getuid(); > + UID16_CHECK(ruid, setreuid); > + > + euid = geteuid(); > + UID16_CHECK(euid, setreuid); > + > + 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)); > + TST_EXP_PASS(setreuid(euid, euid)); > + TST_EXP_PASS(setreuid(ruid, ruid)); > } > > -static void cleanup(void) > -{ > - tst_rmdir(); > -} > +static struct tst_test test = { > + .test_all = run > +}; > -- > 2.39.0 -- Thank you, Richard. -- Mailing list info: https://lists.linux.it/listinfo/ltp