Skip to contentSkip to conversation

Convert syscalls/dup3_{01,02} to new API

PATCH Superseded QI Fuli 2 participants 5 messages Sep 17, 2021 – Sep 20, 2021

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

QI Fuli

author
#0 lore raw

v2 cover Convert syscalls/dup3_{01,02} to new API

From: QI Fuli <[email protected]>

Convert syscalls/dup3_{01,02} to new API

QI Fuli (2):
syscalls/dup3_01: Rewrite and convert to new API syscalls/dup3_02: Convert to new API

 testcases/kernel/syscalls/dup3/dup3_01.c | 159 +++++++----------------
 testcases/kernel/syscalls/dup3/dup3_02.c | 118 +++++------------
 2 files changed, 76 insertions(+), 201 deletions(-)
Signature · 1 line
2.31.1
author
#1 lore raw

PATCH v2 1/2 syscalls/dup3_01: Rewrite and convert to new API

From: QI Fuli <[email protected]>

- divide into two testcases
- convert to new API

---
 testcases/kernel/syscalls/dup3/dup3_01.c | 159 +++++++----------------
 1 file changed, 47 insertions(+), 112 deletions(-)
testcases/kernel/syscalls/dup3/dup3_01.c +47 -112
index 6a44ec809..3b3d9ae0d 100644
@@ -1,120 +1,55 @@
-/******************************************************************************/
-/*                                                                            */
-/* Copyright (c) Ulrich Drepper <[email protected]>                          */
-/* Copyright (c) International Business Machines  Corp., 2009                 */
-/*                                                                            */
-/* 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    */
-/*                                                                            */
-/******************************************************************************/
-/******************************************************************************/
-/*                                                                            */
-/* File:        dup3_01.c                                                     */
-/*                                                                            */
-/* Description: This Program tests the new system call introduced in 2.6.27.  */
-/*              Ulrich??s comment as in:                                       */
-/* http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=336dd1f70ff62d7dd8655228caed4c5bfc818c56 */
-/*              says:                                                         */
-/* This patch adds the new dup3 syscall.  It extends the old dup2 syscall by  */
-/* one parameter which is meant to hold a flag value.  Support for the        */
-/* O_CLOEXEC flag is added in this patch. The following test must be adjusted */
-/* for architectures other than x86 and x86-64 and in case the                */
-/* syscall numbers changed.                                                   */
-/*                                                                            */
-/* Usage:  <for command-line>                                                 */
-/* dup3_01 [-c n] [-e][-i n] [-I x] [-p x] [-t]                               */
-/*      where,  -c n : Run n copies concurrently.                             */
-/*              -e   : Turn on errno logging.                                 */
-/*              -i n : Execute test n times.                                  */
-/*              -I x : Execute test for x seconds.                            */
-/*              -P x : Pause for x seconds between iterations.                */
-/*              -t   : Turn on syscall timing.                                */
-/*                                                                            */
-/* Total Tests: 1                                                             */
-/*                                                                            */
-/* Test Name:   dup3_01                                                       */
-/*                                                                            */
-/* Author:      Ulrich Drepper <[email protected]>                           */
-/*                                                                            */
-/* History:     Created - Jan 13 2009 - Ulrich Drepper <[email protected]>   */
-/*              Ported to LTP                                                 */
-/*                      - Jan 13 2009 - Subrata <[email protected]>  */
-/******************************************************************************/
-#include <fcntl.h>
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) Ulrich Drepper <[email protected]>
+ * Copyright (c) International Business Machines  Corp., 2009
+ * Created - Jan 13 2009 - Ulrich Drepper <[email protected]>
+ * Ported to LTP - Jan 13 2009 - Subrata <[email protected]>
+ */
+/*\
+ * [Description]
+ * Testcase to check whether dup3() supports O_CLOEXEC flag.
+ */
+
+#define _GNU_SOURCE
+
 #include <stdio.h>
-#include <time.h>
-#include <unistd.h>
-#include <sys/syscall.h>
+#include <stdbool.h>
 #include <errno.h>
-
-#include "test.h"
-#include "lapi/fcntl.h"
-#include "lapi/syscalls.h"
-
-char *TCID = "dup3_01";
-int TST_TOTAL = 1;
-
-void cleanup(void)
-{
-	tst_rmdir();
-}
-
-void setup(void)
-{
-	TEST_PAUSE;
-	tst_tmpdir();
-}
-
-int main(int argc, char *argv[])
+#include "tst_test.h"
+#include "tst_safe_macros.h"
+
+static struct tcase {
+	int o_flag;
+	bool coe_flag;
+	char *desc;
+} tcases [] = {
+	{0, true, "dup3(1, 4, 0)"},
+	{O_CLOEXEC, false, "dup3(1, 4, O_CLOEXEC)"},
+};
+
+static void run(unsigned int i)
 {
-	int fd, coe;
+	int fd, ret;
+	struct tcase *tc = tcases + i;
 
-	tst_parse_opts(argc, argv, NULL, NULL);
+	TEST(dup3(1, 4, tc->o_flag));
 
-	if ((tst_kvercmp(2, 6, 27)) < 0)
-		tst_brkm(TCONF, NULL,
-			 "This test can only run on kernels that are 2.6.27 and higher");
-	setup();
-
-	fd = ltp_syscall(__NR_dup3, 1, 4, 0);
-	if (fd == -1) {
-		tst_brkm(TFAIL | TERRNO, cleanup, "dup3(0) failed");
-	}
-	coe = fcntl(fd, F_GETFD);
-	if (coe == -1) {
-		tst_brkm(TBROK | TERRNO, cleanup, "fcntl failed");
+	fd = TST_RET;
+	if (TST_RET == -1) {
+		tst_res(TFAIL | TTERRNO, "%s failed", tc->desc);
+		return;
 	}
-	if (coe & FD_CLOEXEC) {
-		tst_brkm(TFAIL, cleanup, "dup3(0) set close-on-exec flag");
-	}
-	close(fd);
 
-	fd = ltp_syscall(__NR_dup3, 1, 4, O_CLOEXEC);
-	if (fd == -1) {
-		tst_brkm(TFAIL | TERRNO, cleanup, "dup3(O_CLOEXEC) failed");
-	}
-	coe = fcntl(fd, F_GETFD);
-	if (coe == -1) {
-		tst_brkm(TBROK | TERRNO, cleanup, "fcntl failed");
-	}
-	if ((coe & FD_CLOEXEC) == 0) {
-		tst_brkm(TFAIL, cleanup,
-			 "dup3(O_CLOEXEC) set close-on-exec flag");
-	}
-	close(fd);
-	tst_resm(TPASS, "dup3(O_CLOEXEC) PASSED");
+	ret = SAFE_FCNTL(fd, F_GETFD);
+	if ((ret & FD_CLOEXEC) == tc->coe_flag)
+		tst_res(TFAIL, "%s set close-on-exec flag", tc->desc);
+	else
+		tst_res(TPASS, "%s PASSED", tc->desc);
+
+	SAFE_CLOSE(fd);
+};
 
-	cleanup();
-	tst_exit();
-}
+static struct tst_test test = {
+	.tcnt = ARRAY_SIZE(tcases),
+	.test = run,
+};
Signature · 1 line
2.31.1
#2 lore raw

Re: [LTP] [PATCH v2 1/2] syscalls/dup3_01: Rewrite and convert to new API

Hi Qi

Quoted 161 lines

From: QI Fuli <[email protected]>

- divide into two testcases
- convert to new API

---
  testcases/kernel/syscalls/dup3/dup3_01.c | 159 +++++++----------------
  1 file changed, 47 insertions(+), 112 deletions(-)
testcases/kernel/syscalls/dup3/dup3_01.c +35 -104
index 6a44ec809..3b3d9ae0d 100644
@@ -1,120 +1,55 @@
-/******************************************************************************/
-/*                                                                            */
-/* Copyright (c) Ulrich Drepper <[email protected]>                          */
-/* Copyright (c) International Business Machines  Corp., 2009                 */
-/*                                                                            */
-/* 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    */
-/*                                                                            */
-/******************************************************************************/
-/******************************************************************************/
-/*                                                                            */
-/* File:        dup3_01.c                                                     */
-/*                                                                            */
-/* Description: This Program tests the new system call introduced in 2.6.27.  */
-/*              Ulrich´s comment as in:                                       */
-/* http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=336dd1f70ff62d7dd8655228caed4c5bfc818c56 */
-/*              says:                                                         */
-/* This patch adds the new dup3 syscall.  It extends the old dup2 syscall by  */
-/* one parameter which is meant to hold a flag value.  Support for the        */
-/* O_CLOEXEC flag is added in this patch. The following test must be adjusted */
-/* for architectures other than x86 and x86-64 and in case the                */
-/* syscall numbers changed.                                                   */
-/*                                                                            */
-/* Usage:  <for command-line>                                                 */
-/* dup3_01 [-c n] [-e][-i n] [-I x] [-p x] [-t]                               */
-/*      where,  -c n : Run n copies concurrently.                             */
-/*              -e   : Turn on errno logging.                                 */
-/*              -i n : Execute test n times.                                  */
-/*              -I x : Execute test for x seconds.                            */
-/*              -P x : Pause for x seconds between iterations.                */
-/*              -t   : Turn on syscall timing.                                */
-/*                                                                            */
-/* Total Tests: 1                                                             */
-/*                                                                            */
-/* Test Name:   dup3_01                                                       */
-/*                                                                            */
-/* Author:      Ulrich Drepper <[email protected]>                           */
-/*                                                                            */
-/* History:     Created - Jan 13 2009 - Ulrich Drepper <[email protected]>   */
-/*              Ported to LTP                                                 */
-/*                      - Jan 13 2009 - Subrata <[email protected]>  */
-/******************************************************************************/
-#include <fcntl.h>
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) Ulrich Drepper <[email protected]>
+ * Copyright (c) International Business Machines  Corp., 2009
+ * Created - Jan 13 2009 - Ulrich Drepper <[email protected]>
+ * Ported to LTP - Jan 13 2009 - Subrata <[email protected]>
+ */
+/*\
+ * [Description]
+ * Testcase to check whether dup3() supports O_CLOEXEC flag.
+ */
+
+#define _GNU_SOURCE
+
  #include <stdio.h>
-#include <time.h>
-#include <unistd.h>
-#include <sys/syscall.h>
+#include <stdbool.h>
  #include <errno.h>
-
-#include "test.h"
-#include "lapi/fcntl.h"
-#include "lapi/syscalls.h"
-
-char *TCID = "dup3_01";
-int TST_TOTAL = 1;
-
-void cleanup(void)
-{
-	tst_rmdir();
-}
-
-void setup(void)
-{
-	TEST_PAUSE;
-	tst_tmpdir();
-}
-
-int main(int argc, char *argv[])
+#include "tst_test.h"
+#include "tst_safe_macros.h"
+
+static struct tcase {
+	int o_flag;
+	bool coe_flag;
+	char *desc;
+} tcases [] = {
+	{0, true, "dup3(1, 4, 0)"},
+	{O_CLOEXEC, false, "dup3(1, 4, O_CLOEXEC)"},
+};
+
+static void run(unsigned int i)
  {
-	int fd, coe;
+	int fd, ret;
+	struct tcase *tc = tcases + i;
 
-	tst_parse_opts(argc, argv, NULL, NULL);
+	TEST(dup3(1, 4, tc->o_flag));
 
-	if ((tst_kvercmp(2, 6, 27)) < 0)
-		tst_brkm(TCONF, NULL,
-			 "This test can only run on kernels that are 2.6.27 and higher");
-	setup();
-
-	fd = ltp_syscall(__NR_dup3, 1, 4, 0);
-	if (fd == -1) {
-		tst_brkm(TFAIL | TERRNO, cleanup, "dup3(0) failed");
-	}
-	coe = fcntl(fd, F_GETFD);
-	if (coe == -1) {
-		tst_brkm(TBROK | TERRNO, cleanup, "fcntl failed");
+	fd = TST_RET;
+	if (TST_RET == -1) {
+		tst_res(TFAIL | TTERRNO, "%s failed", tc->desc);
+		return;
  	}
-	if (coe & FD_CLOEXEC) {
-		tst_brkm(TFAIL, cleanup, "dup3(0) set close-on-exec flag");
-	}
-	close(fd);
 
-	fd = ltp_syscall(__NR_dup3, 1, 4, O_CLOEXEC);
-	if (fd == -1) {
-		tst_brkm(TFAIL | TERRNO, cleanup, "dup3(O_CLOEXEC) failed");
-	}
-	coe = fcntl(fd, F_GETFD);
-	if (coe == -1) {
-		tst_brkm(TBROK | TERRNO, cleanup, "fcntl failed");
-	}
-	if ((coe & FD_CLOEXEC) == 0) {

testcases/kernel/syscalls/dup3/dup3_01.c line 47

Quoted 10 lines
testcases/kernel/syscalls/dup3/dup3_01.c +5 -5
-		tst_brkm(TFAIL, cleanup,
-			 "dup3(O_CLOEXEC) set close-on-exec flag");
-	}
-	close(fd);
-	tst_resm(TPASS, "dup3(O_CLOEXEC) PASSED");
+	ret = SAFE_FCNTL(fd, F_GETFD);
+	if ((ret & FD_CLOEXEC) == tc->coe_flag)
+		tst_res(TFAIL, "%s set close-on-exec flag", tc->desc);
+	else
+		tst_res(TPASS, "%s PASSED", tc->desc);

Here looks confusing. When unsing O_CLOEXEC flag, we should get FD_CLOEXEC. I think we can remove a flag in tcase struct. code maybe bleow:

static struct tcase {
	int coe_flag;
	char *desc;

tcases [] = {
{0, "dup3(1, 4, 0)"},
{O_CLOEXEC, "dup3(1, 4, O_CLOEXEC)"},
};

	if(tc->oce_flag) {
	if(ret & FD_CLOEXEC)
		tst_res(TPASS, "%s sets close-on-exec flag", tc->desc);
	else
		tst_res(TFAIL, "%s doesn't set close-on-exec flag unexpectedly", 
tc->desc);
	SAFE_CLOSE(fd);
	return;
	}
	
	if (ret & FD_CLOEXEC)
			tst_res(TFAIL, "%s sets close-on-exec flag unexpectedly", tc->desc);
		else
			tst_res(TPASS, "%s doesn't set close-on-exec flag", tc->desc);
	SAFE_CLOSE(fd);

How about this change?

testcases/kernel/syscalls/dup3/dup3_01.c

Quoted 10 lines
testcases/kernel/syscalls/dup3/dup3_01.c +6 -3
+
+	SAFE_CLOSE(fd);
+};
 
-	cleanup();
-	tst_exit();
-}
+static struct tst_test test = {
+	.tcnt = ARRAY_SIZE(tcases),
+	.test = run,\

Add a cleanup function to close fd when safe_fcntl failed(fd leak).

Best Regards
Yang Xu

Quoted 4 lines
testcases/kernel/syscalls/dup3/dup3_01.c +1 -0
+};
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
author
#3 lore raw

PATCH v2 2/2 syscalls/dup3_02: Convert to new API

In reply to QI Fuli
---
 testcases/kernel/syscalls/dup3/dup3_02.c | 118 ++++++-----------------
 1 file changed, 29 insertions(+), 89 deletions(-)
testcases/kernel/syscalls/dup3/dup3_02.c +29 -89
index e49ec3575..08a741240 100644
@@ -1,118 +1,58 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (c) 2013 Fujitsu Ltd.
  * Author: Xiaoguang Wang <[email protected]>
- *
- * 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.
- *
- * 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.
  */
-
-/*
- * Description:
- * Verify that,
- *  1. dup3() fails with -1 return value and sets errno to EINVAL
- *     if flags contain an invalid value or oldfd was equal to newfd.
+/*\
+ * [Description]
+ * Test for various EINVAL error.
+ * - EINVAL - oldfd is equal to newfd W/O using O_CLOEXEC flag
+ * - EINVAL - oldfd is equal to newfd W/ using O_CLOEXEC flag
+ * - EINVAL - flags contain an invalid value
  */
 
 #define _GNU_SOURCE
 
-#include <stdio.h>
 #include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/types.h>
-
-#include "test.h"
-#include "safe_macros.h"
-#include "lapi/fcntl.h"
-#include "lapi/syscalls.h"
-
-
-static void setup(void);
-static void cleanup(void);
-
-#define INVALID_FLAG	-1
+#include "tst_test.h"
+#include "tst_safe_macros.h"
 
 static int old_fd;
-static int new_fd;
+static int new_fd = -1;
 
-static struct test_case_t {
+static struct tcase {
 	int *oldfd;
 	int *newfd;
 	int flags;
-	int exp_errno;
-} test_cases[] = {
-	{&old_fd, &old_fd, O_CLOEXEC, EINVAL},
-	{&old_fd, &old_fd, 0, EINVAL},
-	{&old_fd, &new_fd, INVALID_FLAG, EINVAL}
+} tcases[] = {
+	{&old_fd, &old_fd, O_CLOEXEC},
+	{&old_fd, &old_fd, 0},
+	{&old_fd, &new_fd, -1}
 };
 
-char *TCID = "dup3_02";
-int TST_TOTAL = ARRAY_SIZE(test_cases);
-
-int main(int ac, char **av)
+static void run(unsigned int i)
 {
-	int lc;
-	int i;
-
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		tst_count = 0;
+	struct tcase *tc = tcases + i;
 
-		for (i = 0; i < TST_TOTAL; i++) {
-			TEST(ltp_syscall(__NR_dup3, *(test_cases[i].oldfd),
-			     *(test_cases[i].newfd), test_cases[i].flags));
-
-			if (TEST_RETURN != -1) {
-				tst_resm(TFAIL, "dup3 succeeded unexpectedly");
-				continue;
-			}
-
-			if (TEST_ERRNO == test_cases[i].exp_errno) {
-				tst_resm(TPASS | TTERRNO,
-					 "dup3 failed as expected");
-			} else {
-				tst_resm(TFAIL | TTERRNO,
-					 "dup3 failed unexpectedly; expected:"
-					 "%d - %s", test_cases[i].exp_errno,
-					 strerror(test_cases[i].exp_errno));
-			}
-		}
-	}
-
-	cleanup();
-	tst_exit();
+	TST_EXP_FAIL2(dup3(*tc->oldfd, *tc->newfd, tc->flags), EINVAL,
+		"dup3(%d, %d, %d)", *tc->oldfd, *tc->newfd, tc->flags);
 }
 
 static void setup(void)
 {
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	tst_tmpdir();
-
-	TEST_PAUSE;
-
-	old_fd = SAFE_CREAT(cleanup, "testeinval.file", 0644);
-	new_fd = -1;
+	old_fd = SAFE_CREAT("testeinval.file", 0644);
 }
 
 static void cleanup(void)
 {
 	if (old_fd > 0)
-		SAFE_CLOSE(NULL, old_fd);
-
-	tst_rmdir();
+		SAFE_CLOSE(old_fd);
 }
+
+static struct tst_test test = {
+	.tcnt = ARRAY_SIZE(tcases),
+	.test = run,
+	.setup = setup,
+	.cleanup = cleanup,
+	.needs_tmpdir = 1,
+};
Signature · 1 line
2.31.1
#4 lore raw

Re: [LTP] [PATCH v2 2/2] syscalls/dup3_02: Convert to new API

Hi Qi

Quoted 28 lines
---
  testcases/kernel/syscalls/dup3/dup3_02.c | 118 ++++++-----------------
  1 file changed, 29 insertions(+), 89 deletions(-)
testcases/kernel/syscalls/dup3/dup3_02.c +1 -13
index e49ec3575..08a741240 100644
@@ -1,118 +1,58 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
  /*
   * Copyright (c) 2013 Fujitsu Ltd.
   * Author: Xiaoguang Wang <[email protected]>
- *
- * 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.
- *
- * 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.
   */
-

testcases/kernel/syscalls/dup3/dup3_02.c line 10

Quoted 10 lines
testcases/kernel/syscalls/dup3/dup3_02.c +5 -5
-/*
- * Description:
- * Verify that,
- *  1. dup3() fails with -1 return value and sets errno to EINVAL
- *     if flags contain an invalid value or oldfd was equal to newfd.
+/*\
+ * [Description]
+ * Test for various EINVAL error.
+ * - EINVAL - oldfd is equal to newfd W/O using O_CLOEXEC flag
+ * - EINVAL - oldfd is equal to newfd W/ using O_CLOEXEC flag

What is W/O or W/ ?

Quoted 34 lines
testcases/kernel/syscalls/dup3/dup3_02.c +5 -19
+ * - EINVAL - flags contain an invalid value
   */
 
  #define _GNU_SOURCE
 
-#include <stdio.h>
  #include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/types.h>
-
-#include "test.h"
-#include "safe_macros.h"
-#include "lapi/fcntl.h"
-#include "lapi/syscalls.h"
-
-
-static void setup(void);
-static void cleanup(void);
-
-#define INVALID_FLAG	-1
+#include "tst_test.h"
+#include "tst_safe_macros.h"
 
  static int old_fd;
-static int new_fd;
+static int new_fd = -1;
 
-static struct test_case_t {
+static struct tcase {
  	int *oldfd;
  	int *newfd;

testcases/kernel/syscalls/dup3/dup3_02.c line 30

Quoted 10 lines
testcases/kernel/syscalls/dup3/dup3_02.c +4 -5
  	int flags;
-	int exp_errno;
-} test_cases[] = {
-	{&old_fd, &old_fd, O_CLOEXEC, EINVAL},
-	{&old_fd, &old_fd, 0, EINVAL},
-	{&old_fd, &new_fd, INVALID_FLAG, EINVAL}
+} tcases[] = {
+	{&old_fd, &old_fd, O_CLOEXEC},
+	{&old_fd, &old_fd, 0},
+	{&old_fd, &new_fd, -1}

Look the kernel code[1], it checks flag firstly, then check oldfd whether equal to newfd. Finally, check newfd upper limit.

For future compatibility, we don't know whether check logic will change. So use a valid newfd is better.

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/fs/file.c#n1159

Quoted 76 lines
testcases/kernel/syscalls/dup3/dup3_02.c +14 -47
  };
 
-char *TCID = "dup3_02";
-int TST_TOTAL = ARRAY_SIZE(test_cases);
-
-int main(int ac, char **av)
+static void run(unsigned int i)
  {
-	int lc;
-	int i;
-
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		tst_count = 0;
+	struct tcase *tc = tcases + i;
 
-		for (i = 0; i < TST_TOTAL; i++) {
-			TEST(ltp_syscall(__NR_dup3, *(test_cases[i].oldfd),
-			     *(test_cases[i].newfd), test_cases[i].flags));
-
-			if (TEST_RETURN != -1) {
-				tst_resm(TFAIL, "dup3 succeeded unexpectedly");
-				continue;
-			}
-
-			if (TEST_ERRNO == test_cases[i].exp_errno) {
-				tst_resm(TPASS | TTERRNO,
-					 "dup3 failed as expected");
-			} else {
-				tst_resm(TFAIL | TTERRNO,
-					 "dup3 failed unexpectedly; expected:"
-					 "%d - %s", test_cases[i].exp_errno,
-					 strerror(test_cases[i].exp_errno));
-			}
-		}
-	}
-
-	cleanup();
-	tst_exit();
+	TST_EXP_FAIL2(dup3(*tc->oldfd, *tc->newfd, tc->flags), EINVAL,
+		"dup3(%d, %d, %d)", *tc->oldfd, *tc->newfd, tc->flags);
  }
 
  static void setup(void)
  {
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	tst_tmpdir();
-
-	TEST_PAUSE;
-
-	old_fd = SAFE_CREAT(cleanup, "testeinval.file", 0644);
-	new_fd = -1;
+	old_fd = SAFE_CREAT("testeinval.file", 0644);
  }
 
  static void cleanup(void)
  {
  	if (old_fd > 0)
-		SAFE_CLOSE(NULL, old_fd);
-
-	tst_rmdir();
+		SAFE_CLOSE(old_fd)
  }
+
+static struct tst_test test = {
+	.tcnt = ARRAY_SIZE(tcases),
+	.test = run,
+	.setup = setup,
+	.cleanup = cleanup,
+	.needs_tmpdir = 1,
+};
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp