From patchwork Tue Nov 16 02:47:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Meng Tang X-Patchwork-Id: 1555602 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) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HtVpk3xzlz9s5P for ; Tue, 16 Nov 2021 13:47:42 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 0CBB53C87AA for ; Tue, 16 Nov 2021 03:47:40 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it 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 RSA-PSS (2048 bits)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id B3D413C6268 for ; Tue, 16 Nov 2021 03:47:23 +0100 (CET) Received: from smtpbg511.qq.com (smtpbg511.qq.com [203.205.250.109]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by in-2.smtp.seeweb.it (Postfix) with ESMTPS id 842E9600651 for ; Tue, 16 Nov 2021 03:47:19 +0100 (CET) X-QQ-mid: bizesmtp49t1637030834tjmc4mk7 Received: from localhost.localdomain (unknown [58.240.82.166]) by esmtp6.qq.com (ESMTP) with id ; Tue, 16 Nov 2021 10:47:07 +0800 (CST) X-QQ-SSF: 0140000000200050C000B00A0000000 X-QQ-FEAT: eTtJes0duVu8G7QNwtvK4B19DicYif1i1WJdNGfHdEdDWpxR+v1TcKWmPjXrp E+g7TcGUeC86VH04fWGp7LIoy9Ytz0d8c9knKLVYDR/+XKM43KbiICDJ+iEfUhRIqVtmR6R J9mBE8bl2vycQp7BGp1qixQtB09PGmjJnusjVk9g0JfaGCQcC29JRyNfK3qIQ5HY48qUusI ++Wyg295Z0iqEv1s/dSCVFzK7Mm/wexRtiKgsamvaXdVKVeEPaht/U3pb9biojz5+uTJPii gET3p9zGWOxb3q2QTOaSO/5dISpxm3KVBSbR01J5ER+G/zEeYSmojJ0Yv1U/tFwT9j9sG1s CJTlL26Mo1FtyHNwLP2BeBtPol/Uay9QbUXheGMvP+qdOlw3lQ= X-QQ-GoodBg: 2 From: tangmeng To: ltp@lists.linux.it Date: Tue, 16 Nov 2021 10:47:05 +0800 Message-Id: <20211116024706.30853-1-tangmeng@uniontech.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:uniontech.com:qybgforeign:qybgforeign6 X-QQ-Bgrelay: 1 X-Virus-Scanned: clamav-milter 0.102.4 at in-2.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-2.smtp.seeweb.it Subject: [LTP] [PATCH v2 1/2] getuid/getuid01: Convert to 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: , Cc: tangmeng Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: tangmeng --- testcases/kernel/syscalls/getuid/getuid01.c | 88 ++++----------------- 1 file changed, 15 insertions(+), 73 deletions(-) -- 2.20.1 diff --git a/testcases/kernel/syscalls/getuid/getuid01.c b/testcases/kernel/syscalls/getuid/getuid01.c index cf8c77424..bad29bd84 100644 --- a/testcases/kernel/syscalls/getuid/getuid01.c +++ b/testcases/kernel/syscalls/getuid/getuid01.c @@ -1,84 +1,26 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * 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 */ -#include -#include -#include -#include -#include -#include "test.h" -#include "compat_16.h" - -static void setup(void); -static void cleanup(void); +/*\ + * [Description] + * + * Check the basic functionality of the getuid() system call. + */ -TCID_DEFINE(getuid01); -int TST_TOTAL = 1; +#include "tst_test.h" +#include "compat_tst_16.h" -int main(int ac, char **av) +static void verify_getuid(void) { - int lc; - - tst_parse_opts(ac, av, NULL, NULL); - - setup(); - - for (lc = 0; TEST_LOOPING(lc); lc++) { - - tst_count = 0; - - TEST(GETUID(cleanup)); - - if (TEST_RETURN == -1) - tst_resm(TFAIL | TTERRNO, "getuid failed"); - else - tst_resm(TPASS, "getuid returned %ld", TEST_RETURN); - - } - - cleanup(); - tst_exit(); + TST_EXP_POSITIVE(GETUID(), "getuid()"); } -static void setup(void) -{ - tst_sig(NOFORK, DEF_HANDLER, cleanup); - TEST_PAUSE; -} -static void cleanup(void) -{ -} +static struct tst_test test = { + .test_all = verify_getuid, +}; From patchwork Tue Nov 16 02:47:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Meng Tang X-Patchwork-Id: 1555601 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=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) 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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HtVpb0cSTz9s5P for ; Tue, 16 Nov 2021 13:47:34 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 753673C8731 for ; Tue, 16 Nov 2021 03:47:30 +0100 (CET) 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 [IPv6:2001:4b78:1:20::4]) (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 picard.linux.it (Postfix) with ESMTPS id 0539D3C6268 for ; Tue, 16 Nov 2021 03:47:27 +0100 (CET) Received: from smtpbgeu1.qq.com (smtpbgeu1.qq.com [52.59.177.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by in-4.smtp.seeweb.it (Postfix) with ESMTPS id 2EC1110009F6 for ; Tue, 16 Nov 2021 03:47:22 +0100 (CET) X-QQ-mid: bizesmtp49t1637030837tdz9g92y Received: from localhost.localdomain (unknown [58.240.82.166]) by esmtp6.qq.com (ESMTP) with id ; Tue, 16 Nov 2021 10:47:16 +0800 (CST) X-QQ-SSF: 0140000000200050C000B00A0000000 X-QQ-FEAT: NtgDvgqFC3NIelta8vNxcWNsZmkJusQNYSWK7kFA7S7+lNHyvhcG5J7CzLZ9j jf4va/RmDm/kDTyNHiSmGOV3UOexv7+HxN4MVeEFJEPprk7Yt+KsOsBrwztZcB5owPuYBbw SIs5xkH1/RxxZM9o3bylDYeZvY83zGtgxp3Z1KRiAjXgnZ6KOloBCqIRk0rI3dbs8ObHrBR MkZ+1jZwkrrooqp5G1gYvQEgyPDgIkP+NXP8AKNAFuI/59QvNr2fkWqIK5vSrF3F61wnrov 1364wMxICuwVAM8L11cIl2M0zU/jWirDcKy1HL0ANDXSUjWasJH8SHzuOlG/IOkZiWuYmHh Pgg+6HBF+Un7VdwMZ86+blo7cMy98wdt1gK9nfw X-QQ-GoodBg: 2 From: tangmeng To: ltp@lists.linux.it Date: Tue, 16 Nov 2021 10:47:06 +0800 Message-Id: <20211116024706.30853-2-tangmeng@uniontech.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211116024706.30853-1-tangmeng@uniontech.com> References: <20211116024706.30853-1-tangmeng@uniontech.com> MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:uniontech.com:qybgforeign:qybgforeign7 X-QQ-Bgrelay: 1 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 v2 2/2] getuid/getuid03: Convert to 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: , Cc: tangmeng Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: tangmeng --- testcases/kernel/syscalls/getuid/getuid03.c | 96 +++++---------------- 1 file changed, 23 insertions(+), 73 deletions(-) -- 2.20.1 diff --git a/testcases/kernel/syscalls/getuid/getuid03.c b/testcases/kernel/syscalls/getuid/getuid03.c index 7c81c628e..fa1fa52cc 100644 --- a/testcases/kernel/syscalls/getuid/getuid03.c +++ b/testcases/kernel/syscalls/getuid/getuid03.c @@ -1,88 +1,38 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) International Business Machines Corp., 2001 * Ported by Wayne Boyer - * - * 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 */ -/* - * Testcase to check the basic functionality of the getuid() system call. +/*\ + * [Description] * - * For functionality test the return value from getgid() is compared to passwd - * entry. + * Check the basic functionality of the getuid() system call + * return value against the /proc/self/status where all the + * UIDs are listed. */ -#include -#include - -#include "test.h" -#include "compat_16.h" +#include "tst_test.h" +#include "compat_tst_16.h" -TCID_DEFINE(getuid03); -int TST_TOTAL = 1; - -static void setup(void); -static void cleanup(void); - -int main(int ac, char **av) +static void verify_getuid(void) { - struct passwd *pwent; - int lc; - uid_t uid; - - tst_parse_opts(ac, av, NULL, NULL); - - setup(); - - for (lc = 0; TEST_LOOPING(lc); lc++) { + long int uid; - tst_count = 0; + TST_EXP_POSITIVE(GETUID(), "getuid()"); - TEST(GETUID(cleanup)); + SAFE_FILE_LINES_SCANF("/proc/self/status", "Uid: %ld", &uid); - if (TEST_RETURN == -1) - tst_brkm(TBROK | TTERRNO, cleanup, "getuid failed"); - - uid = getuid(); - pwent = getpwuid(uid); - - if (pwent == NULL) - tst_resm(TFAIL | TERRNO, "getpwuid failed"); - - UID16_CHECK(pwent->pw_uid, getuid, cleanup); - - if (pwent->pw_uid != TEST_RETURN) - tst_resm(TFAIL, "getpwuid value, %d, " - "does not match getuid " - "value, %ld", pwent->pw_uid, - TEST_RETURN); - else - tst_resm(TPASS, "values from getuid " - "and getpwuid match"); - } - cleanup(); - tst_exit(); -} - -static void setup(void) -{ - tst_sig(NOFORK, DEF_HANDLER, cleanup); - - TEST_PAUSE; + if (TST_RET != uid) + tst_res(TFAIL, "Uid value list in /pro/self/status, %ld, " + "does not match getuid " + "value, %ld", uid, + TST_RET); + else + tst_res(TPASS, "values from getuid " + "and /proc/self/status match"); } -static void cleanup(void) -{ -} +static struct tst_test test = { + .test_all = verify_getuid, +};