[LTP] [PATCH v5 5/8] syscalls/mknod05: Convert to new API

[Petr Vorel]

Hi Ricardo,

...
> -/*
> - * Test Name: mknod05
> - *
> - * Test Description:
> - *  Verify that mknod(2) succeeds when used by root to create a filesystem
> - *  node with set group-ID bit set on a directory with 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.

> - *
> - * Expected Result:
> - *  mknod() should return value 0 on success and node created should have
> - *  set group-ID bit set and its gid should be equal to that of its parent
> - *  directory.
> - *
...
> +/*\
> + * Verify that mknod(2) succeeds when used to create a filesystem node with
> + * set group-ID bit set on a directory with set group-ID bit set. The node
very nit: The original reader was not consistent when referring to setuid.
Mostly he used "set-group-ID" which is also used in man chmod(2) and in The
Linux Programming Interface book. Therefore I'll modify before merge:

s/set group-ID/set-group-ID/

> + * created should have set group-ID bit set and its gid should be equal to
> + * that of its parent directory.
>   */

> -#define LTPUSER		"nobody"
> -#define MODE_RWX	S_IFIFO | S_IRWXU | S_IRWXG | S_IRWXO
> -#define MODE_SGID       S_IFIFO | S_ISGID | S_IRWXU | S_IRWXG | S_IRWXO

And again, as I noted at mknod0[34].c here is constant used for mknod() uses
S_IFIFO.

> -struct stat buf;		/* struct. to hold stat(2) o/p contents */
> -struct passwd *user1;		/* struct. to hold getpwnam(3) o/p contents */
> +#define MODE_RWX 0777
> +#define MODE_SGID (S_ISGID | 0777)

But you don't use it.

...
> +	SAFE_MKNOD(TEMP_NODE, MODE_SGID, 0);

> -		/*
> -		 *  Attempt to create a filesystem node with group id (sgid)
> -		 *  bit set on a directory with group id (sgid) bit set
> -		 *  such that, the node created by mknod(2) should have
> -		 *  group id (sgid) bit set and node's gid should be equal
> -		 *  to that of effective gid of the process.
> -		 */
> -		TEST(mknod(node_name, MODE_SGID, 0));

I vote for following diff (using a constant you defined also for mknod03.c).
No need to repost, I can change it before merge.

Kind regards,
Petr

+++ testcases/kernel/syscalls/mknod/mknod05.c
@@ -7,8 +7,8 @@
 
 /*\
  * Verify that mknod(2) succeeds when used to create a filesystem node with
- * set group-ID bit set on a directory with set group-ID bit set. The node
- * created should have set group-ID bit set and its gid should be equal to
+ * set-group-ID bit set on a directory with 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.
  */
 
@@ -17,7 +17,7 @@
 #include "tst_test.h"
 
 #define MODE_RWX 0777
-#define MODE_SGID (S_ISGID | 0777)
+#define MODE_FIFO_SGID (S_IFIFO | S_ISGID | 0777)
 
 #define TEMP_DIR "testdir"
 #define TEMP_NODE TEMP_DIR "/testnode"
@@ -29,7 +29,7 @@ static void run(void)
 {
 	struct stat buf;
 
-	SAFE_MKNOD(TEMP_NODE, MODE_SGID, 0);
+	SAFE_MKNOD(TEMP_NODE, MODE_FIFO_SGID, 0);
 
 	SAFE_STAT(TEMP_NODE, &buf);
 	TST_EXP_EQ_LI(buf.st_mode & S_ISGID, S_ISGID);
@@ -48,7 +48,7 @@ static void setup(void)
 
 	SAFE_MKDIR(TEMP_DIR, MODE_RWX);
 	SAFE_CHOWN(TEMP_DIR, nobody_uid, free_gid);
-	SAFE_CHMOD(TEMP_DIR, MODE_SGID);
+	SAFE_CHMOD(TEMP_DIR, MODE_FIFO_SGID);
 }
 
 static struct tst_test test = {