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 BD554C54EBD for ; Thu, 12 Jan 2023 10:48:42 +0000 (UTC) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 705593CCA70 for ; Thu, 12 Jan 2023 11:48:40 +0100 (CET) Received: from in-2.smtp.seeweb.it (in-2.smtp.seeweb.it [217.194.8.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 picard.linux.it (Postfix) with ESMTPS id B8D423CB54D for ; Thu, 12 Jan 2023 11:48:28 +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 A937460080D for ; Thu, 12 Jan 2023 11:48:26 +0100 (CET) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id 5489E3FBEF for ; Thu, 12 Jan 2023 10:48:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1673520506; 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=T195AEnuZMiH8WUEqfFjZSOvcdlh9T/L46Vo7aopjP8=; b=nSAcXss+rMPLtS9XAUx29azS2QokPQHaKQlF2XyAKocBhVcuiO68VNrlXVr0kKDr8mIwVI rmxGo37WuCAo5xDY4PNJMx29QikfoNhqqEuaQq8KfwJZs7csjx7jgIIXjCLOUOqPZHyIRW 1SRffe9//6FLIG5PwPrCtQEjjGWHOO4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1673520506; 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=T195AEnuZMiH8WUEqfFjZSOvcdlh9T/L46Vo7aopjP8=; b=fEXI4ifAByPKZCM3Dvyk+DDIUd950bUNwOtFCoj2VJj4u4NKv6jPxpnXpdFYPZK3ntmEWq rLzdUduFUlP3RQBQ== Received: from g78 (unknown [10.163.28.198]) (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 2C3EC2C142; Thu, 12 Jan 2023 10:48:26 +0000 (UTC) References: <20230111132550.15587-1-akumar@suse.de> User-agent: mu4e 1.8.13; emacs 28.2 From: Richard Palethorpe To: Avinesh Kumar Date: Thu, 12 Jan 2023 10:37:45 +0000 Organization: Linux Private Site In-reply-to: <20230111132550.15587-1-akumar@suse.de> Message-ID: <87pmbkhvuu.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] setreuid04.c: Rewrite using new LTP 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: , 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, Avinesh Kumar writes: > Signed-off-by: Avinesh Kumar > --- > .../kernel/syscalls/setreuid/setreuid04.c | 158 +++++------------- > 1 file changed, 41 insertions(+), 117 deletions(-) > > diff --git a/testcases/kernel/syscalls/setreuid/setreuid04.c b/testcases/kernel/syscalls/setreuid/setreuid04.c > index 8eed90df0..9c52ff1bd 100644 > --- a/testcases/kernel/syscalls/setreuid/setreuid04.c > +++ b/testcases/kernel/syscalls/setreuid/setreuid04.c > @@ -1,141 +1,65 @@ > +// 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 > - * > * Ported by John George > + * Copyright (c) 2022 SUSE LLC Avinesh Kumar > */ > > -/* > - * Test that root can change the real and effective uid to an > - * unpriviledged user. > +/*\ > + * [Description] > + * > + * Verify that root user can change the real and effective uid to an > + * unprivileged user. > */ > > -#include > -#include > #include > -#include > - > -#include "test.h" > -#include "compat_16.h" > - > -TCID_DEFINE(setreuid04); > +#include "tst_test.h" > +#include "compat_tst_16.h" > > static uid_t neg_one = -1; > +static uid_t root_uid, nobody_uid; > > -static struct passwd nobody, root; > - > -/* > - * The following structure contains all test data. Each structure in the array > - * is used for a separate test. The tests are executed in the for loop below. > - */ > - > -struct test_data_t { > +static struct tcase { > uid_t *real_uid; > uid_t *eff_uid; > - struct passwd *exp_real_usr; > - struct passwd *exp_eff_usr; > - char *test_msg; > -} test_data[] = { > - { > - &neg_one, &neg_one, &root, &root, "After setreuid(-1, nobody),"}, { > -&nobody.pw_uid, &nobody.pw_uid, &nobody, &nobody, > - "After setreuid(-1, -1),"},}; > - > -int TST_TOTAL = ARRAY_SIZE(test_data); > - > -static void setup(void); > -static void cleanup(void); > -static void uid_verify(struct passwd *, struct passwd *, char *); > - > -int main(int ac, char **av) > -{ > - int lc; > - > - tst_parse_opts(ac, av, NULL, NULL); > - > - setup(); > - > - for (lc = 0; TEST_LOOPING(lc); lc++) { > - int i, pid; > - > - tst_count = 0; > - > - if ((pid = FORK_OR_VFORK()) == -1) { > - tst_brkm(TBROK, cleanup, "fork failed"); > - } else if (pid == 0) { /* child */ > - > - for (i = 0; i < TST_TOTAL; i++) { > - > - /* Set the real or effective user id */ > - TEST(SETREUID(cleanup, *test_data[i].real_uid, > - *test_data[i].eff_uid)); > - > - if (TEST_RETURN != -1) { > - tst_resm(TPASS, "setreuid(%d, %d) " > - "succeeded as expected.", > - *test_data[i].real_uid, > - *test_data[i].eff_uid); > - } else { > - tst_resm(TFAIL, "setreuid(%d, %d) " > - "did not return as expected.", > - *test_data[i].real_uid, > - *test_data[i].eff_uid); > - } > - > - uid_verify(test_data[i].exp_real_usr, > - test_data[i].exp_eff_usr, > - test_data[i].test_msg); > - } > - tst_exit(); > - } else { /* parent */ > - tst_record_childstatus(cleanup, pid); > - } > - } > - cleanup(); > - tst_exit(); > -} > + uid_t *exp_real_uid; > + uid_t *exp_eff_uid; > +} tcases[] = { > + {&neg_one, &neg_one, &root_uid, &root_uid}, > + {&nobody_uid, &nobody_uid, &nobody_uid, &nobody_uid} > +}; I think further cleanup is possible here. We only have one test case so we don't need this struct or an array. We certainly don't need a struct of pointers. We don't need constants like "neg_one". -- Thank you, Richard. -- Mailing list info: https://lists.linux.it/listinfo/ltp