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 9A4D2E7717D for ; Wed, 11 Dec 2024 12:23:31 +0000 (UTC) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 3368B3E88F9 for ; Wed, 11 Dec 2024 13:23:30 +0100 (CET) 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 ECDSA (secp384r1)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 073683E88F4 for ; Wed, 11 Dec 2024 13:20:29 +0100 (CET) Authentication-Results: in-4.smtp.seeweb.it; spf=pass (sender SPF authorized) smtp.mailfrom=suse.de (client-ip=2a07:de40:b251:101:10:150:64:1; helo=smtp-out1.suse.de; envelope-from=andrea.cervesato@suse.de; receiver=lists.linux.it) Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) (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-4.smtp.seeweb.it (Postfix) with ESMTPS id E4FB51020C35 for ; Wed, 11 Dec 2024 13:20:28 +0100 (CET) Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (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 smtp-out1.suse.de (Postfix) with ESMTPS id EBB552116C for ; Wed, 11 Dec 2024 12:20:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1733919627; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=85LReEaouifIi25b97a+VCJxP2Ph4ghtTH1RBHYk63I=; b=djxp0na4Ch4+0mitsvOeM0nM32eVKEAb2rTH1sBTwB47Alzc6yCCTjM8lYbpwtGjvQN7Fi q26FJ3kkImRy5TUkzu98MJzBZo28yBrR9/s5yJa1iQDK6VhcPTKmAz1eULuWRR6X3L2zG/ zKK0PLR67ZIyVJhlbDt85wTmW0t4mNc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1733919627; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=85LReEaouifIi25b97a+VCJxP2Ph4ghtTH1RBHYk63I=; b=QVU3xLhWOPLpvtLY2zkejgAkTkOvpKdZPR/XgczSTTwIOK2zw0FmYQ1iSOVx0vKPN3d/hm UTFljnEFsC4zOfBQ== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1733919626; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=85LReEaouifIi25b97a+VCJxP2Ph4ghtTH1RBHYk63I=; b=UA+FJ52dEl/l32mNsrIGd2QI1v15teYbIMceGI7lJ8nrFOz4/ltqewetgOVPbzyy0YI0mb HNZd3gQo0LU3+4Zb+fctoSI6CfQrOUl1lbDuZNK33c2QSZyOWDqRPUYLRo5CFWnwIj5gcR EjG7BHuEOC5qFMduCLB7OnR68X9qy5U= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1733919626; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=85LReEaouifIi25b97a+VCJxP2Ph4ghtTH1RBHYk63I=; b=C8GyZqqbtRUN9C/tLguj9bcvpf75TV8FQ5xNNwh0Qh7+7RF7u+u3tWPfSN4juCvBNZsYoJ 8m17MuxQtAxTdrCA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (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 imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id E36ED13AD7 for ; Wed, 11 Dec 2024 12:20:26 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 8K4zN4qDWWdNAwAAD6G6ig (envelope-from ) for ; Wed, 11 Dec 2024 12:20:26 +0000 From: Andrea Cervesato Date: Wed, 11 Dec 2024 13:20:31 +0100 MIME-Version: 1.0 Message-Id: <20241211-fix_setsid_tests-v1-8-e103f36c6462@suse.com> References: <20241211-fix_setsid_tests-v1-0-e103f36c6462@suse.com> In-Reply-To: <20241211-fix_setsid_tests-v1-0-e103f36c6462@suse.com> To: ltp@lists.linux.it X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1733919626; l=12189; i=andrea.cervesato@suse.com; s=20240812; h=from:subject:message-id; bh=Qu3GgaWGX48C3itged9bzi0Y451iYddO08gPQjKSdz0=; b=Wx0wzD8AUEJ0zxjNRdh7l+qDG5qDJWIPh3fqcDKfUajfjJJXBNRe7KC4yh4iASA5EywpwV3wS tQtlVTpFUkHAJuOKeJCholEhf4deSaAvGvIxJjlUNOMk4Aucen502Bf X-Developer-Key: i=andrea.cervesato@suse.com; a=ed25519; pk=RG/nLJ5snb1tLKGwSORQXBJ5XA4juT0WF2Pc/lq9meo= X-Spamd-Result: default: False [-4.30 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; PREVIOUSLY_DELIVERED(0.00)[ltp@lists.linux.it]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:email,suse.com:mid] X-Virus-Scanned: clamav-milter 1.0.3 at in-4.smtp.seeweb.it X-Virus-Status: Clean Subject: [LTP] [PATCH 08/10] Refactor pty01 test 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-bounces+ltp=archiver.kernel.org@lists.linux.it Sender: "ltp" From: Andrea Cervesato Rewrite part of the code using the new LTP library and fix the execution of the test inside a new session via setsid(). The test is now split into multiple files, instead of having multiple test* functions executing all in one file. Fixes: https://github.com/linux-test-project/kirk/issues/28 Signed-off-by: Andrea Cervesato --- testcases/kernel/pty/pty01.c | 417 ++++++------------------------------------- 1 file changed, 52 insertions(+), 365 deletions(-) diff --git a/testcases/kernel/pty/pty01.c b/testcases/kernel/pty/pty01.c index 666b221b017fe214b7baa0b2bc608dfc2feff732..9447e3ee25965772fab6d51dcd39097b3d7fb448 100644 --- a/testcases/kernel/pty/pty01.c +++ b/testcases/kernel/pty/pty01.c @@ -1,395 +1,82 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* - * - * Copyright (c) International Business Machines Corp., 2002 - * - * 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) International Business Machines Corp., 2002 + * Copyright (C) 2024 SUSE LLC Andrea Cervesato */ -/* 12/23/2002 Port to LTP robbiew@us.ibm.com */ -/* 06/30/2001 Port to Linux nsharoff@us.ibm.com */ +/*\ + * [Description] + * + * Verify that write/read is properly working when master and slave + * pseudo terminals communicate with each other. + */ #define _GNU_SOURCE -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "test.h" -#include "safe_macros.h" -#include "lapi/ioctl.h" +#include "tst_test.h" -char *TCID = "pty01"; /* Test program identifier. */ -int TST_TOTAL = 5; /* Total number of test cases. */ -/**************/ - -/* - * pty master clone device - */ #define MASTERCLONE "/dev/ptmx" +#define STRING "Linux Test Project" +#define STRING_LEN strlen(STRING) -/* - * string for testing read/write on ptys - */ -#define STRING "Linux Test Project\n" - -/* - * test buffer size - */ -#define TESTSIZE 1024 - -/* - * mode we expect grantpt() to leave pty as - */ -#define PTY_MODE 020622 - -/* - * number of procs for parallel test - */ -#define NUMPROCS 15 - -/* - * test slave locking - */ -static int test1(void) +static void run(void) { - int masterfd; /* master pty fd */ - int slavefd; /* slave pty fd */ + int masterfd; + int slavefd; char *slavename; struct stat st; - char buf[TESTSIZE]; - - masterfd = SAFE_OPEN(NULL, MASTERCLONE, O_RDWR); - - slavename = ptsname(masterfd); - if (slavename == NULL) { - tst_brkm(TBROK | TERRNO, NULL, "ptsname() call failed"); - } - - if (grantpt(masterfd) != 0) { - tst_brkm(TBROK | TERRNO, NULL, "grantpt() call failed"); - } - - if (stat(slavename, &st) != 0) { - tst_brkm(TBROK | TERRNO, NULL, "stat(%s) failed", slavename); - } - if (st.st_uid != getuid()) { - tst_brkm(TBROK, NULL, "uid mismatch"); - } - - /* grantpt() is a no-op in bionic. */ -#ifndef __BIONIC__ - if (st.st_mode != (S_IFCHR | S_IRUSR | S_IWUSR | S_IWGRP)) { - tst_brkm(TBROK, NULL, "mode mismatch (mode=%o)", st.st_mode); - } -#endif - - slavefd = open(slavename, O_RDWR); - if (slavefd >= 0) { - tst_brkm(TBROK, NULL, "open didn't fail as expected!"); - } - - if (unlockpt(masterfd) != 0) { - tst_brkm(TBROK | TERRNO, NULL, "unlockpt() failed"); - } - - slavefd = SAFE_OPEN(NULL, slavename, O_RDWR); - - /* - * test writing to the master / reading from the slave - */ - if (write(masterfd, STRING, strlen(STRING)) != strlen(STRING)) { - /* - * XXX: the errno printout might be garbage, but better to be - * safe than sorry.. - */ - tst_brkm(TFAIL | TERRNO, NULL, "write to master"); - } - - if (read(slavefd, buf, strlen(STRING)) != strlen(STRING)) { - /* XXX: Same as write above.. */ - tst_brkm(TFAIL | TERRNO, NULL, "read from slave"); - } - if (strncmp(STRING, buf, strlen(STRING) - 1) != 0) { - tst_brkm(TFAIL, NULL, - "strings are different (STRING = '%s' != buf = '%s')", - STRING, buf); - } - - /* - * test writing to the slave / reading from the master - */ - if (write(slavefd, STRING, strlen(STRING)) != strlen(STRING)) { - /* XXX: Same as write above.. */ - tst_brkm(TFAIL | TERRNO, NULL, "write to slave"); - } - - if (read(masterfd, buf, strlen(STRING)) != strlen(STRING)) { - /* XXX: Same as write above.. */ - tst_brkm(TFAIL | TERRNO, NULL, "read from master"); - } - if (strncmp(STRING, buf, strlen(STRING) - 1) != 0) { - tst_brkm(TFAIL, NULL, - "strings are different (STRING = '%s' != buf = '%s').", - STRING, buf); - } - - /* - * try an invalid ioctl on the slave... - */ - if (ioctl(slavefd, TIOCGWINSZ, NULL) == 0) { - tst_brkm(TFAIL, NULL, - "invalid slave TIOCGWINSZ ioctl succeeded.. it should " - "have failed"); - } - - /* - * try an invalid ioctl on the master... - */ - if (ioctl(masterfd, TIOCGWINSZ, NULL) == 0) { - tst_brkm(TFAIL, NULL, - "invalid master TIOCGWINSZ ioctl succeeded.. it should " - "have failed"); - } - - /* - * close pty fds - */ - if (close(slavefd) != 0) { - tst_brkm(TBROK | TERRNO, NULL, "close of slave"); - } - if (close(masterfd) != 0) { - tst_brkm(TBROK | TERRNO, NULL, "close of master"); - } - tst_resm(TPASS, "test1"); - /** NOTREACHED **/ - return 0; -} + char buf[BUFSIZ]; -/* - * test slave operations with closed master - */ -static void test2(void) -{ - int masterfd; /* master pty fd */ - int slavefd; /* slave pty fd */ - int i; - char *slavename; - char c; + memset(buf, 0, BUFSIZ); - masterfd = SAFE_OPEN(NULL, MASTERCLONE, O_RDWR); + masterfd = SAFE_OPEN(MASTERCLONE, O_RDWR); slavename = ptsname(masterfd); - if (slavename == NULL) { - tst_brkm(TBROK | TERRNO, NULL, "ptsname() call failed"); - } - - if (grantpt(masterfd) != 0) { - tst_brkm(TBROK | TERRNO, NULL, "grantpt() call failed"); - } - - if (unlockpt(masterfd) != 0) { - tst_brkm(TBROK | TERRNO, NULL, "unlockpt() call failed"); - } - - slavefd = SAFE_OPEN(NULL, slavename, O_RDWR); - - /* - * close pty fds. See what happens when we close the master - * first. - */ - if (close(masterfd) != 0) { - tst_brkm(TBROK | TERRNO, NULL, "close()"); - } - - errno = 0; - if ((i = read(slavefd, &c, 1)) == 1) { - tst_brkm(TFAIL, NULL, - "reading from slave fd should have failed, but didn't" - "(read '%c')", c); - } - - if ((i = write(slavefd, &c, 1)) == 1) { - tst_brkm(TFAIL, NULL, - "writing to slave fd should have failed, but didn't"); - } + if (slavename == NULL) + tst_brk(TBROK | TERRNO, "ptsname() error"); - if (ioctl(slavefd, TIOCGWINSZ, NULL) == 0) { - tst_brkm(TFAIL, NULL, - "trying TIOCGWINSZ on slave fd should have failed, " - "but didn't"); - } + if (grantpt(masterfd) == -1) + tst_brk(TBROK | TERRNO, "grantpt() error"); - if (close(slavefd) != 0) { - tst_brkm(TBROK, NULL, "close"); + TST_EXP_PASS_SILENT(unlockpt(masterfd)); + if (TST_RET == -1) { + SAFE_CLOSE(masterfd); + return; } - tst_resm(TPASS, "test2"); -} - -/* - * test operations on master with closed slave - */ -static void test3(void) -{ - int masterfd; /* master pty fd */ - - masterfd = SAFE_OPEN(NULL, MASTERCLONE, O_RDWR); - if (ioctl(masterfd, TIOCGWINSZ, NULL) == 0) { - tst_brkm(TFAIL | TERRNO, NULL, - "trying TIOCGWINSZ on master with no open slave " - "succeeded unexpectedly"); - } - tst_resm(TPASS, "test3"); -} - -/* - * test multiple opens on slave side of pty - */ -static void test4(void) -{ - int masterfd; /* master pty fd */ - int slavefd; /* slave pty fd */ - int slavefd2; - int slavefd3; - char *slavename; + SAFE_STAT(slavename, &st); + TST_EXP_EQ_LI(st.st_uid, getuid()); - masterfd = SAFE_OPEN(NULL, MASTERCLONE, O_RDWR); - - slavename = ptsname(masterfd); - if (slavename == NULL) { - tst_brkm(TBROK, NULL, "ptsname() call failed"); - } - - if (grantpt(masterfd) != 0) { - tst_brkm(TBROK, NULL, "grantpt() call failed"); - } - - if (unlockpt(masterfd) != 0) { - tst_brkm(TBROK | TERRNO, NULL, "unlockpt() call failed"); - } - - slavefd = SAFE_OPEN(NULL, slavename, O_RDWR); + /* grantpt() is a no-op in bionic. */ +#ifndef __BIONIC__ + TST_EXP_EQ_LI(st.st_mode, 0620); +#endif - slavefd2 = open(slavename, O_RDWR); - if (slavefd < 0) { - tst_brkm(TFAIL | TERRNO, NULL, "Could not open %s (again)", - slavename); - } + slavefd = SAFE_OPEN(slavename, O_RDWR); - slavefd3 = open(slavename, O_RDWR); - if (slavefd < 0) { - tst_brkm(TFAIL | TERRNO, NULL, "Could not open %s (once more)", - slavename); - } + tst_res(TINFO, "Send message to master and read from slave"); + SAFE_WRITE(SAFE_WRITE_ALL, masterfd, STRING, STRING_LEN); + SAFE_WRITE(SAFE_WRITE_ALL, masterfd, "\n", 1); + SAFE_READ(1, slavefd, buf, STRING_LEN); + TST_EXP_EQ_STR(STRING, buf); - /* - * close pty fds. - */ - if (close(slavefd) != 0) { - tst_brkm(TBROK | TERRNO, NULL, "close slave"); - } - - if (close(slavefd2) != 0) { - tst_brkm(TBROK, NULL, "close slave again"); - } + tst_res(TINFO, "Send message to slave and read from master"); + SAFE_WRITE(SAFE_WRITE_ALL, slavefd, STRING, STRING_LEN); + SAFE_WRITE(SAFE_WRITE_ALL, masterfd, "\n", 1); + SAFE_READ(1, masterfd, buf, STRING_LEN); + TST_EXP_EQ_STR(STRING, buf); - if (close(slavefd3) != 0) { - tst_brkm(TBROK, NULL, "close slave once more"); - } - - if (close(masterfd) != 0) { - tst_brkm(TBROK, NULL, "close master"); - } - tst_resm(TPASS, "test4"); + SAFE_CLOSE(slavefd); + SAFE_CLOSE(masterfd); } -/* - * test opening/closing lots of ptys in parallel. We may run out - * of ptys for this test depending on how the system is configured, - * but that's not a fatal error. - */ -static void test5(void) +static void setup(void) { - int masterfd; /* master pty fd */ - char *slavename; - int status; - int i; - - for (i = 0; i < NUMPROCS; ++i) { - switch (fork()) { - case -1: - tst_brkm(TBROK, NULL, "fork()"); - break; - case 0: - masterfd = open(MASTERCLONE, O_RDWR); - if (masterfd < 0) { - printf("proc %d: opening %s failed: %s", - i, MASTERCLONE, strerror(errno)); - exit(1); - } - if (grantpt(masterfd) != 0) { - printf("proc %d: grantpt() call failed: %s", - i, strerror(errno)); - exit(1); - } - slavename = ptsname(masterfd); - if (slavename == NULL) { - printf("proc %d: ptsname() call failed: %s", - i, strerror(errno)); - exit(1); - } - sleep(10); - if (close(masterfd) != 0) { - printf("proc %d: close failed: %s", - i, strerror(errno)); - exit(1); - } - exit(0); - default: - break; - } - } - while (wait(&status) > 0) { - if (status) { - tst_brkm(TFAIL, NULL, - "child exited with non-zero status %d", - status); - } - } - tst_resm(TPASS, "test5"); + if (access(MASTERCLONE, F_OK)) + tst_brk(TBROK, "%s device doesn't exist", MASTERCLONE); } -/* - * main test driver - */ -int main(void) -{ - test1(); - test2(); - test3(); - test4(); - test5(); - - /* - * all done - */ - tst_exit(); -} +static struct tst_test test = { + .test_all = run, + .setup = setup, +}; -- 2.43.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp