Skip to contentSkip to conversation

mknod01: Rewrite the test using new LTP API

PATCH Superseded Avinesh Kumar 3 participants 7 messages Feb 22, 2023 – Mar 2, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mknod01: Rewrite the test using new LTP API

---
 testcases/kernel/syscalls/mknod/mknod01.c | 137 ++++++----------------
 1 file changed, 33 insertions(+), 104 deletions(-)
testcases/kernel/syscalls/mknod/mknod01.c +33 -104
index f79e5fa42..d4b8c7bf8 100644
@@ -1,123 +1,52 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *  AUTHOR		: William Roske
- *  CO-PILOT		: Dave Fenner
- *
- * 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
+ * Copyright (c) 2023 SUSE LLC Avinesh Kumar <[email protected]>
+ */
+
+/*\
+ * [Description]
  *
+ * Verify that mknod(2) successfully creates a filesystem node with
+ * various modes.
  */
 
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/sysmacros.h>
-
-#include "test.h"
-#include "safe_macros.h"
-
-static void setup(void);
-static void cleanup(void);
-
-char *TCID = "mknod01";
+#include "tst_test.h"
 
 #define PATH "test_node"
 
-int tcases[] = {		/* modes to give nodes created (1 per text case) */
-	S_IFREG | 0777,		/* ordinary file with mode 0777 */
-	S_IFIFO | 0777,		/* fifo special with mode 0777 */
-	S_IFCHR | 0777,		/* character special with mode 0777 */
-	S_IFBLK | 0777,		/* block special with mode 0777 */
+static int tcases[] = {
+	S_IFREG | 0777,
+	S_IFIFO | 0777,
+	S_IFCHR | 0777,
+	S_IFBLK | 0777,
 
-	S_IFREG | 04700,	/* ordinary file with mode 04700 (suid) */
-	S_IFREG | 02700,	/* ordinary file with mode 02700 (sgid) */
-	S_IFREG | 06700,	/* ordinary file with mode 06700 (sgid & suid) */
+	S_IFREG | 04700,
+	S_IFREG | 02700,
+	S_IFREG | 06700,
 };
 
-int TST_TOTAL = ARRAY_SIZE(tcases);
 
-int main(int ac, char **av)
+static void run(unsigned int i)
 {
-	int lc, i;
 	dev_t dev;
 
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
+	if (S_ISCHR(tcases[i]))
+		dev = makedev(1, 3);
+	else
+		dev = 0;
 
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		tst_count = 0;
-
-		for (i = 0; i < TST_TOTAL; i++) {
-			/*
-			 * overlayfs doesn't support mknod char device with
-			 * major 0 and minor 0, which is known as whiteout_dev
-			 */
-			if (S_ISCHR(tcases[i]))
-				dev = makedev(1, 3);
-			else
-				dev = 0;
-			TEST(mknod(PATH, tcases[i], dev));
-
-			if (TEST_RETURN == -1) {
-				tst_resm(TFAIL,
-					 "mknod(%s, %#o, %lu) failed, errno=%d : %s",
-					 PATH, tcases[i], dev, TEST_ERRNO,
-					 strerror(TEST_ERRNO));
-			} else {
-				tst_resm(TPASS,
-					 "mknod(%s, %#o, %lu) returned %ld",
-					 PATH, tcases[i], dev, TEST_RETURN);
-			}
-
-			SAFE_UNLINK(cleanup, PATH);
-		}
-
-	}
-
-	cleanup();
-	tst_exit();
+	TST_EXP_PASS(mknod(PATH, tcases[i], dev),
+				"mknod(PATH, %o, %ld)",
+				tcases[i], dev);
+	SAFE_UNLINK(PATH);
 }
 
-void setup(void)
-{
-	tst_require_root();
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	TEST_PAUSE;
-
-	tst_tmpdir();
-}
-
-void cleanup(void)
-{
-	tst_rmdir();
-}
+static struct tst_test test = {
+	.test = run,
+	.tcnt = ARRAY_SIZE(tcases),
+	.needs_root = 1,
+	.needs_tmpdir = 1
+};
Signature · 5 lines
2.39.1


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#1 lore raw

Hi!

Review

Quoted 4 lines
(quoted diff) +4 -0
+	if (S_ISCHR(tcases[i]))
+		dev = makedev(1, 3);
+	else
+		dev = 0;

Reading 'man 2 mknod' I suppose that we should pass non-zero dev for block devices as well. Hoever the test seems to work fine with zero dev for both cases.

Btw makedev(1, 3) seems to be the /dev/null char device and it should work for block devices since block makedev(1, 3) would be /dev/ram3, so what about:

testcases/kernel/syscalls/mknod/mknod01.c +2 -4
index d4b8c7bf8..7a4d5b43f 100644
@@ -31,12 +31,10 @@ static int tcases[] = {
 
 static void run(unsigned int i)
 {
-       dev_t dev;
+       dev_t dev = 0;
 
-       if (S_ISCHR(tcases[i]))
+       if (S_ISCHR(tcases[i]) || S_ISBLK(tcases[i]))
                dev = makedev(1, 3);
-       else
-               dev = 0;
 
        TST_EXP_PASS(mknod(PATH, tcases[i], dev),
                                "mknod(PATH, %o, %ld)",
Signature · 5 lines
Cyril Hrubis
[email protected]

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#2 lore raw

Hi Cyril,

Quoted 10 lines · IST Cyril Hrubis

Hi!

Review

Quoted 4 lines
(quoted diff) +4 -0
+	if (S_ISCHR(tcases[i]))
+		dev = makedev(1, 3);
+	else
+		dev = 0;

Reading 'man 2 mknod' I suppose that we should pass non-zero dev for block devices as well. Hoever the test seems to work fine with zero dev for both cases.

Quoted 3 lines

Btw makedev(1, 3) seems to be the /dev/null char device and it should work for block devices since block makedev(1, 3) would be /dev/ram3, so what about:

Thank you for the review and yes I overlooked block devices scenario, your suggested patch looks good, should I send this as v2 or will you merge with these changes?

Quoted 13 lines
testcases/kernel/syscalls/mknod/mknod01.c +0 -1
index d4b8c7bf8..7a4d5b43f 100644
@@ -31,12 +31,10 @@ static int tcases[] = {
 
 static void run(unsigned int i)
 {
-       dev_t dev;

testcases/kernel/syscalls/mknod/mknod01.c static int tcases[] = { · line 40

Quoted 10 lines
testcases/kernel/syscalls/mknod/mknod01.c +2 -3
+       dev_t dev = 0;
 
-       if (S_ISCHR(tcases[i]))
+       if (S_ISCHR(tcases[i]) || S_ISBLK(tcases[i]))
                dev = makedev(1, 3);
-       else
-               dev = 0;
 
        TST_EXP_PASS(mknod(PATH, tcases[i], dev),
                                "mknod(PATH, %o, %ld)",

Regards,
Avinesh

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
#3 lore raw

Hi!
Pushed with the proposed change applied on the top, thanks.

Signature · 5 lines
Cyril Hrubis
[email protected]

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#4 lore raw

PATCH v2 1/1 mknod01: Rewrite the test using new LTP API

In reply to Cyril Hrubis
---
 testcases/kernel/syscalls/mknod/mknod01.c | 137 +++-------
 testcases/kernel/syscalls/mknod/mknod02.c | 312 +++-------------------
 2 files changed, 76 insertions(+), 373 deletions(-)
testcases/kernel/syscalls/mknod/mknod01.c +32 -105
index f79e5fa42..7a4d5b43f 100644
@@ -1,123 +1,50 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *  AUTHOR		: William Roske
- *  CO-PILOT		: Dave Fenner
- *
- * 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
+ * Copyright (c) 2023 SUSE LLC Avinesh Kumar <[email protected]>
+ */
+
+/*\
+ * [Description]
  *
+ * Verify that mknod(2) successfully creates a filesystem node with
+ * various modes.
  */
 
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/sysmacros.h>
-
-#include "test.h"
-#include "safe_macros.h"
-
-static void setup(void);
-static void cleanup(void);
-
-char *TCID = "mknod01";
+#include "tst_test.h"
 
 #define PATH "test_node"
 
-int tcases[] = {		/* modes to give nodes created (1 per text case) */
-	S_IFREG | 0777,		/* ordinary file with mode 0777 */
-	S_IFIFO | 0777,		/* fifo special with mode 0777 */
-	S_IFCHR | 0777,		/* character special with mode 0777 */
-	S_IFBLK | 0777,		/* block special with mode 0777 */
+static int tcases[] = {
+	S_IFREG | 0777,
+	S_IFIFO | 0777,
+	S_IFCHR | 0777,
+	S_IFBLK | 0777,
 
-	S_IFREG | 04700,	/* ordinary file with mode 04700 (suid) */
-	S_IFREG | 02700,	/* ordinary file with mode 02700 (sgid) */
-	S_IFREG | 06700,	/* ordinary file with mode 06700 (sgid & suid) */
+	S_IFREG | 04700,
+	S_IFREG | 02700,
+	S_IFREG | 06700,
 };
 
-int TST_TOTAL = ARRAY_SIZE(tcases);
 
-int main(int ac, char **av)
+static void run(unsigned int i)
 {
-	int lc, i;
-	dev_t dev;
-
-	tst_parse_opts(ac, av, NULL, NULL);
+	dev_t dev = 0;
 
-	setup();
+	if (S_ISCHR(tcases[i]) || S_ISBLK(tcases[i]))
+		dev = makedev(1, 3);
 
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		tst_count = 0;
-
-		for (i = 0; i < TST_TOTAL; i++) {
-			/*
-			 * overlayfs doesn't support mknod char device with
-			 * major 0 and minor 0, which is known as whiteout_dev
-			 */
-			if (S_ISCHR(tcases[i]))
-				dev = makedev(1, 3);
-			else
-				dev = 0;
-			TEST(mknod(PATH, tcases[i], dev));
-
-			if (TEST_RETURN == -1) {
-				tst_resm(TFAIL,
-					 "mknod(%s, %#o, %lu) failed, errno=%d : %s",
-					 PATH, tcases[i], dev, TEST_ERRNO,
-					 strerror(TEST_ERRNO));
-			} else {
-				tst_resm(TPASS,
-					 "mknod(%s, %#o, %lu) returned %ld",
-					 PATH, tcases[i], dev, TEST_RETURN);
-			}
-
-			SAFE_UNLINK(cleanup, PATH);
-		}
-
-	}
-
-	cleanup();
-	tst_exit();
+	TST_EXP_PASS(mknod(PATH, tcases[i], dev),
+				"mknod(PATH, %o, %ld)",
+				tcases[i], dev);
+	SAFE_UNLINK(PATH);
 }
 
-void setup(void)
-{
-	tst_require_root();
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	TEST_PAUSE;
-
-	tst_tmpdir();
-}
-
-void cleanup(void)
-{
-	tst_rmdir();
-}
+static struct tst_test test = {
+	.test = run,
+	.tcnt = ARRAY_SIZE(tcases),
+	.needs_root = 1,
+	.needs_tmpdir = 1
+};
testcases/kernel/syscalls/mknod/mknod02.c +44 -268

345 lines not on this page · raw message

Signature · 5 lines
2.39.2


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#6 lore raw
In reply to Avinesh Kumar

Hi!

Quoted 25 lines
testcases/kernel/syscalls/mknod/mknod02.c +3 -15
@@ -1,301 +1,77 @@
+// 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
+ *     07/2001 Ported by Wayne Boyer
+ *   Copyright (c) 2023 SUSE LLC Avinesh Kumar <[email protected]>
  */
 

testcases/kernel/syscalls/mknod/mknod02.c line 14

Quoted 10 lines
testcases/kernel/syscalls/mknod/mknod02.c +2 -3
-/*
- * Test Name: mknod02
+/*\
+ * [Description]
  *
- * Test Description:
  *  Verify that mknod(2) succeeds when used to create a filesystem
  *  node with set group-ID bit set on a directory without set group-ID bit set.
  *  The node created should have set group-ID bit set and its gid should be
  *  equal to that of its parent directory.

I've read this a few times and I stil do not understand what exactly is this test supposed to test or at least the code does not correspond to the description.

I did look at the kernel sources for a while and as far as I can tell the whole S_ISGID handling is done in the inode_init_owner() function:

void inode_init_owner(struct user_namespace *mnt_userns, struct inode *inode,
const struct inode *dir, umode_t mode)

{
        inode_fsuid_set(inode, mnt_userns);
        if (dir && dir->i_mode & S_ISGID) {
                inode->i_gid = dir->i_gid;

                /* Directories are special, and always inherit S_ISGID */
                if (S_ISDIR(mode))
                        mode |= S_ISGID;
        } else
                inode_fsgid_set(inode, mnt_userns);
        inode->i_mode = mode;
}

EXPORT_SYMBOL(inode_init_owner);

Which looks pretty straightforward.

- If the parent direcotry has S_ISGID we set the inode GID to the parent directory gid
- If not we call the inode_fsgid_set(), which does namepsace mappings, but eventually we end up whaterver the current running process GID maps to

So the test is awfully complex for what it's supposed to do, which is without S_ISGID on parent directory the FIFO gid is set to the running process GID. As far as I can tell all that needs to be done here is:

With .require_root:

1. Create a directory and set the directory GID to nobody
2. Create a FIFO inside the directory and check that the FIFO GID matches the root gid

And that should be it. As far as I can tell the S_ISGID on FIFO is pointless in this case since for files the S_ISGID means that the GID is changed when they are executed, which we do not attempt here and I'm not even sure if we can execute FIFO.

And the same should be done by the mknod03 with the difference that th S_ISGID should be set on the directory and we should expect the GID to be inherited.

Signature · 5 lines
Cyril Hrubis
[email protected]

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp