From patchwork Wed Oct 19 07:17:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avinesh Kumar X-Patchwork-Id: 1691814 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=213.254.12.146; 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=NcHADdUV; dkim=fail reason="signature verification failed" header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=hQE8obuL; dkim-atps=neutral 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 ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MshrH3vq8z23jk for ; Wed, 19 Oct 2022 18:17:17 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id B32C83CB0F7 for ; Wed, 19 Oct 2022 09:17:13 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [217.194.8.7]) (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 819613CB0E5 for ; Wed, 19 Oct 2022 09:17:12 +0200 (CEST) Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) (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-7.smtp.seeweb.it (Postfix) with ESMTPS id C38D1200B63 for ; Wed, 19 Oct 2022 09:17:11 +0200 (CEST) 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 A304622CBF for ; Wed, 19 Oct 2022 07:17:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1666163829; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Reo70exN0ohszAgIM7M0+8EXf860esIIZyAfBzB0DyY=; b=NcHADdUVoBripTUWlic3D5dHhgCxUd0tqsvmgVCGIlCO5rQ7RCQqykCRfQ9xtad9cvuZYm rFJOXEPbe2Sj5V0FBz2ZzFlVsYYdEViLlmMuhES65+QBR0f6e2b6Iy1/XVJ0lt3OzkZ2G2 n75Ofe2A3LCOUbnDC/UbHRYmk7oACqA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1666163829; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Reo70exN0ohszAgIM7M0+8EXf860esIIZyAfBzB0DyY=; b=hQE8obuLLxwv1V976i0erVysHbo9PUmpWbeX2CCWU7A4EcNcYmbQyVE3sKUyh0pgDvqXf3 4NnEL/vURxfm1yBw== 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 1EC9E13A36 for ; Wed, 19 Oct 2022 07:17:08 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id gF+rM3SkT2OeNgAAMHmgww (envelope-from ) for ; Wed, 19 Oct 2022 07:17:08 +0000 From: Avinesh Kumar To: ltp@lists.linux.it Date: Wed, 19 Oct 2022 12:47:06 +0530 Message-Id: <20221019071706.25416-1-akumar@suse.de> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-7.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-7.smtp.seeweb.it Subject: [LTP] [PATCH] setfsuid02: 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: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Rewrite using new API and add setfsuid(-1) call to verify that preceding setfsuid() call with an invalid fsuid had failed. Signed-off-by: Avinesh Kumar --- .../kernel/syscalls/setfsuid/setfsuid02.c | 96 ++++--------------- 1 file changed, 21 insertions(+), 75 deletions(-) diff --git a/testcases/kernel/syscalls/setfsuid/setfsuid02.c b/testcases/kernel/syscalls/setfsuid/setfsuid02.c index 5807bb6c0..84f9fb504 100644 --- a/testcases/kernel/syscalls/setfsuid/setfsuid02.c +++ b/testcases/kernel/syscalls/setfsuid/setfsuid02.c @@ -1,91 +1,37 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) International Business Machines Corp., 2001 * Ported by Wayne Boyer * Adapted by Dustin Kirkland (k1rkland@us.ibm.com) - * - * 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 + * Copyright (c) 2022 SUSE LLC Avinesh Kumar */ -/* - * Testcase to test the basic functionality of the setfsuid(2) system - * call to fail on invalid uid. +/*\ + * [Description] + * + * Verify that setfsuid() syscall fails if an invalid fsuid is given. */ -#include -#include #include -#include -#include - -#include "test.h" -#include "compat_16.h" +#include "tst_test.h" +#include "compat_tst_16.h" -static void setup(void); -static void cleanup(void); - -TCID_DEFINE(setfsuid02); -int TST_TOTAL = 1; - -int main(int ac, char **av) +static void run(void) { - int lc; - - uid_t uid; - - tst_parse_opts(ac, av, NULL, NULL); - - setup(); + uid_t invalid_uid, current_uid; - uid = 1; - while (getpwuid(uid)) - uid++; + current_uid = geteuid(); + invalid_uid = 1; + while (getpwuid(invalid_uid)) + invalid_uid++; - UID16_CHECK(uid, setfsuid, cleanup); + UID16_CHECK(invalid_uid, setfsuid); - for (lc = 0; TEST_LOOPING(lc); lc++) { - - tst_count = 0; - - TEST(SETFSUID(cleanup, uid)); - - if (TEST_RETURN == -1) { - tst_resm(TFAIL | TTERRNO, - "setfsuid() failed unexpectedly"); - continue; - } - - if (TEST_RETURN == uid) { - tst_resm(TFAIL, "setfsuid() returned %ld, expected %d", - TEST_RETURN, uid); - } else { - tst_resm(TPASS, "setfsuid() returned expected value : " - "%ld", TEST_RETURN); - } - } - - cleanup(); - tst_exit(); + TST_EXP_VAL_SILENT(setfsuid(invalid_uid), current_uid); + TST_EXP_VAL(setfsuid(-1), current_uid, + "setfsuid(invalid_fsuid) test for expected failure:"); } -static void setup(void) -{ - tst_sig(NOFORK, DEF_HANDLER, cleanup); - - TEST_PAUSE; -} - -static void cleanup(void) -{ -} +static struct tst_test test = { + .test_all = run +};