syscalls/shmget01: Remove it
PATCH 1/4 syscalls/shmget01: Remove it
Since shmct01.c and shmctl08.c has covered this case, we don't need this any more.
--- runtest/syscalls | 1 - runtest/syscalls-ipc | 1 - .../kernel/syscalls/ipc/shmget/.gitignore | 1 - .../kernel/syscalls/ipc/shmget/shmget01.c | 171 ------------------ 4 files changed, 174 deletions(-) delete mode 100644 testcases/kernel/syscalls/ipc/shmget/shmget01.c
runtest/syscalls +0 -1
@@ -1399,7 +1399,6 @@ shmctl08 shmctl08 shmdt01 shmdt01 shmdt02 shmdt02 -shmget01 shmget01 shmget02 shmget02 shmget03 shmget03 shmget04 shmget04
runtest/syscalls-ipc +0 -1
@@ -64,7 +64,6 @@ shmctl08 shmctl08 shmdt01 shmdt01 shmdt02 shmdt02 -shmget01 shmget01 shmget02 shmget02 shmget03 shmget03 shmget04 shmget04
testcases/kernel/syscalls/ipc/shmget/.gitignore +0 -1
@@ -1,4 +1,3 @@ -/shmget01 /shmget02 /shmget03 /shmget04
testcases/kernel/syscalls/ipc/shmget/shmget01.c deleted +0 -171
171 lines not on this page · raw message
Signature · 1 line
2.23.0
PATCH 2/4 syscalls/shmget*: Convert into new api
1) merge shmget05.c into shmget02.c
2) Use SHMMIN -1 and SHMMAX + 1 to trigger EINVAL error
3) Use SHM_RD, SHM_WR, SHM_RW to trigger EACCES error under unpriviledged user
--- include/lapi/shm.h | 14 + runtest/syscalls | 1 - runtest/syscalls-ipc | 1 - .../kernel/syscalls/ipc/shmget/.gitignore | 1 - testcases/kernel/syscalls/ipc/shmget/Makefile | 4 +- .../kernel/syscalls/ipc/shmget/shmget02.c | 243 +++++++----------- .../kernel/syscalls/ipc/shmget/shmget03.c | 199 ++++---------- .../kernel/syscalls/ipc/shmget/shmget04.c | 193 +++++--------- .../kernel/syscalls/ipc/shmget/shmget05.c | 185 ------------- 9 files changed, 209 insertions(+), 632 deletions(-) delete mode 100644 testcases/kernel/syscalls/ipc/shmget/shmget05.c
include/lapi/shm.h +14 -0
@@ -6,8 +6,22 @@#ifndef LAPI_SHM_H__ #define LAPI_SHM_H__ +#include <limits.h> +#ifndef SHM_STAT_ANY # define SHM_STAT_ANY 15#endif +#ifndef SHMMIN +# define SHMMIN 1 +#endif + +#ifndef SHMMAX +# define SHMMAX (ULONG_MAX - (1UL << 24)) +#endif + +#ifndef SHMMNI +# define SHMMNI 4096 +#endif +#endif /* LAPI_SHM_H__ */
runtest/syscalls +0 -1
@@ -1402,7 +1402,6 @@ shmdt02 shmdt02 shmget02 shmget02 shmget03 shmget03 shmget04 shmget04 -shmget05 shmget05 sigaction01 sigaction01 sigaction02 sigaction02
runtest/syscalls-ipc +0 -1
@@ -67,4 +67,3 @@ shmdt02 shmdt02 shmget02 shmget02 shmget03 shmget03 shmget04 shmget04 -shmget05 shmget05
testcases/kernel/syscalls/ipc/shmget/.gitignore +0 -1
@@ -1,4 +1,3 @@ /shmget02 /shmget03 /shmget04 -/shmget05
testcases/kernel/syscalls/ipc/shmget/Makefile +2 -2
@@ -3,10 +3,10 @@ top_srcdir ?= ../../../../.. -LTPLIBS = ltpipc +LTPLIBS = ltpnewipc include $(top_srcdir)/include/mk/testcases.mk -LTPLDLIBS = -lltpipc +LTPLDLIBS = -lltpnewipc include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/ipc/shmget/shmget02.c +86 -157
270 lines not on this page · raw message
testcases/kernel/syscalls/ipc/shmget/shmget03.c +48 -151
219 lines not on this page · raw message
testcases/kernel/syscalls/ipc/shmget/shmget04.c +59 -134
212 lines not on this page · raw message
testcases/kernel/syscalls/ipc/shmget/shmget05.c deleted +0 -185
185 lines not on this page · raw message
Signature · 1 line
2.23.0
PATCH 2/4 syscalls/shmget*: Convert into new api
Hi ALL
Quoted 3 lines
1) merge
shmget05.cintoshmget02.c
2) Use SHMMIN -1 and SHMMAX + 1 to trigger EINVAL error
3) UseSHM_RD,SHM_WR,SHM_RWto trigger EACCES error under unpriviledged user
Sorry for missing EPERM error in shmget02.c(I will add it in v2 when you have comment on rest patches)
(quoted diff) +0 -0
b/testcases/kernel/syscalls/ipc/shmget/shmget02.c
index a57904ce9..319d1e972 100644
testcases/kernel/syscalls/ipc/shmget/shmget02.c +0 -0
@@ -17,6 +17,9 @@* greater than SHMMAX. Or a segment for the given key exists, but size is * greater than the size of that segment. * EACCES - The user does not have permission to access the shared
memory segment.
+ * EPERM - The SHM_HUGETLB flag was specified, but the caller was not privileged
+ * (did not have the CAP_IPC_LOCK capability). Also the caller's group id should
+ * be not in hugetlb_shm_group proc file.
*/
#include <errno.h>
#include <sys/types.h>
@@ -47,6 +50,7 @@ static struct tcase {
{&shmkey1, SHMMAX + 1, IPC_CREAT | IPC_EXCL, 0, EINVAL},
{&shmkey, SHM_SIZE * 2, IPC_EXCL, 0, EINVAL},
{&shmkey, SHM_SIZE, SHM_RD, 1, EACCES},+ {&shmkey1, SHM_SIZE, IPC_CREAT | SHM_HUGETLB, 1, EPERM}
};
static void verify_shmget(struct tcase *tc)
@@ -91,6 +95,7 @@ static void setup(void)
shmkey = GETIPCKEY();
shmkey1 = GETIPCKEY();+ SAFE_FILE_PRINTF("/proc/sys/vm/hugetlb_shm_group", "1");
shm_id = SAFE_SHMGET(shmkey, SHM_SIZE, IPC_CREAT | IPC_EXCL);
pw = SAFE_GETPWNAM("nobody");
tst_res(TINFO, "%d %d", shmkey, shmkey1);@@ -110,4 +115,8 @@ static struct tst_test test = {
.cleanup = cleanup,
.test = do_test,
.tcnt = ARRAY_SIZE(tcases),
+ .save_restore = (const char * const[]) {
+ "?/proc/sys/vm/hugetlb_shm_group",
+ NULL,
+ }
};
PATCH 2/4 syscalls/shmget*: Convert into new api
Hi!
Ping. Also add a url[1] for the missing EPRERM error(should see lastest man-page).
[1]https://github.com/mkerrisk/man-pages/commit/090fdddb4342f92a1dbeba687462f4bcee816232
Best Regards
Yang Xu
Quoted 52 lines
Hi ALL
Quoted 3 lines
1) merge
shmget05.cintoshmget02.c
2) Use SHMMIN -1 and SHMMAX + 1 to trigger EINVAL error
3) UseSHM_RD,SHM_WR,SHM_RWto trigger EACCES error under unpriviledged userSorry for missing EPERM error in
shmget02.c(I will add it in v2 when you have comment on rest patches)testcases/kernel/syscalls/ipc/shmget/shmget02.c +0
-0@@ -17,6 +17,9 @@* greater than SHMMAX. Or a segment for the given key exists, but size is * greater than the size of that segment. * EACCES - The user does not have permission to access the shared memory segment.
+ * EPERM - TheSHM_HUGETLBflag was specified, but the caller was not privileged
+ * (did not have theCAP_IPC_LOCKcapability). Also the caller's group id should
+ * be not inhugetlb_shm_groupproc file.
*/
#include<errno.h>
#include<sys/types.h>testcases/kernel/syscalls/ipc/shmget/shmget02.c +6
-0@@ -47,6 +50,7 @@ static struct tcase { {&shmkey1, SHMMAX + 1, IPC_CREAT | IPC_EXCL, 0, EINVAL}, {&shmkey, SHM_SIZE * 2, IPC_EXCL, 0, EINVAL}, {&shmkey, SHM_SIZE, SHM_RD, 1, EACCES}, + {&shmkey1, SHM_SIZE, IPC_CREAT | SHM_HUGETLB, 1, EPERM} };static void verify_shmget (struct tcase *tc)@@ -91,6 +95,7 @@ static void setup(void) shmkey =GETIPCKEY (); shmkey1 =GETIPCKEY (); +SAFE_FILE_PRINTF ("/proc/sys/vm/hugetlb_shm_group" ,"1" ); shm_id =SAFE_SHMGET (shmkey,SHM_SIZE ,IPC_CREAT |IPC_EXCL ); pw =SAFE_GETPWNAM ("nobody" );tst_res (TINFO ,"%d %d" , shmkey, shmkey1);@@ -110,4 +115,8 @@ static struct tst_test test = { .cleanup = cleanup, .test = do_test, .tcnt = ARRAY_SIZE(tcases), + .save_restore = (const char *const []) { +"?/proc/sys/vm/hugetlb_shm_group" , +NULL , + } };
PATCH 2/4 syscalls/shmget*: Convert into new api
In reply to Yang XuHi!
Quoted 212 lines
1) merge
shmget05.cintoshmget02.c
2) Use SHMMIN -1 and SHMMAX + 1 to trigger EINVAL error
3) UseSHM_RD,SHM_WR,SHM_RWto trigger EACCES error under unpriviledged userSigned-off-by Yang Xu <[email protected]>--- include/lapi/shm.h | 14 + runtest/syscalls | 1 - runtest/syscalls-ipc | 1 - .../kernel/syscalls/ipc/shmget/.gitignore | 1 - testcases/kernel/syscalls/ipc/shmget/Makefile | 4 +- .../kernel/syscalls/ipc/shmget/shmget02.c | 243 +++++++----------- .../kernel/syscalls/ipc/shmget/shmget03.c | 199 ++++---------- .../kernel/syscalls/ipc/shmget/shmget04.c | 193 +++++--------- .../kernel/syscalls/ipc/shmget/shmget05.c | 185 ------------- 9 files changed, 209 insertions(+), 632 deletions(-) delete mode 100644 testcases/kernel/syscalls/ipc/shmget/shmget05.cinclude/lapi/shm.h +14
-0@@ -6,8 +6,22 @@#ifndef LAPI_SHM_H__ #define LAPI_SHM_H__ +#include <limits.h> +#ifndef SHM_STAT_ANY # define SHM_STAT_ANY 15#endif +#ifndef SHMMIN +# define SHMMIN 1 +#endif + +#ifndef SHMMAX +# define SHMMAX (ULONG_MAX - (1UL << 24)) +#endif + +#ifndef SHMMNI +# define SHMMNI 4096 +#endif +#endif /* LAPI_SHM_H__ */ runtest/syscalls +0
-1@@ -1402,7 +1402,6 @@ shmdt02 shmdt02 shmget02 shmget02 shmget03 shmget03 shmget04 shmget04 -shmget05 shmget05 sigaction01 sigaction01 sigaction02 sigaction02runtest/syscalls-ipc +0
-1@@ -67,4 +67,3 @@ shmdt02 shmdt02 shmget02 shmget02 shmget03 shmget03 shmget04 shmget04 -shmget05 shmget05testcases/kernel/syscalls/ipc/shmget/.gitignore +0
-1@@ -1,4 +1,3 @@ /shmget02 /shmget03 /shmget04 -/shmget05testcases/kernel/syscalls/ipc/shmget/Makefile +2
-2@@ -3,10 +3,10 @@ top_srcdir ?= ../../../../.. -LTPLIBS = ltpipc +LTPLIBS = ltpnewipc include $(top_srcdir)/include/mk/testcases.mk -LTPLDLIBS = -lltpipc +LTPLDLIBS = -lltpnewipc include $(top_srcdir)/include/mk/generic_leaf_target.mktestcases/kernel/syscalls/ipc/shmget/shmget02.c +31
-76@@ -1,184 +1,113 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* +* Copyright (c) International Business Machines Corp., 2001 +* 03/2001 - Written by Wayne Boyer * -* 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 +* Copyright (c) 2008 Renaud Lottiaux ([email protected]) */ -/* -* NAME -* shmget02.c -* -* DESCRIPTION -* shmget02 - check for ENOENT, EEXIST and EINVAL errors +/*\ +* [Description] * -* ALGORITHM -* create a shared memory segment with read & write permissions -* loop if that option was specified -* call shmget() using five different invalid cases -* check the errno value -* issue a PASS message if we get ENOENT, EEXIST or EINVAL -* otherwise, the tests fails -* issue a FAIL message -* call cleanup +* Test for ENOENT, EEXIST, EINVAL, EACCES errors. * -* USAGE: <for command-line> -* shmget02 [-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. -* -* HISTORY -* 03/2001 - Written by Wayne Boyer -* -* 06/03/2008 Renaud Lottiaux ([email protected]) -* - Fix concurrency issue. The second key used for this test could -* conflict with the key from another task. -* -* RESTRICTIONS -* none +* ENOENT - No segment exists for the given key and IPC_CREAT was not specified. +* EEXIST - the segment exists and IPC_CREAT | IPC_EXCL is given. +* EINVAL - A new segment was to be created and size is less than SHMMIN or +* greater than SHMMAX. Or a segment for the given key exists, but size is +* greater than the size of that segment. +* EACCES - The user does not have permission to access the shared memory segment. */ - -#include "ipcshm.h" - -char *TCID ="shmget02" ; -int TST_TOTAL =4 ; - -int shm_id_1 =-1 ; -int shm_nonexisting_key =-1 ; -key_t shmkey2; - -struct test_case_t { -int *skey; -int size; +#include <errno.h> +#include <sys/types.h> +#include <sys/ipc.h> +#include <stdlib.h> +#include <pwd.h> +#include <sys/shm.h> +#include "tst_safe_sysv_ipc.h" +#include "tst_test.h" +#include "libnewipc.h" +#include "lapi/shm.h" + +static int shm_id =-1 ; +static key_t shmkey, shmkey1; +static struct passwd *pw; + +static struct tcase { + int *shmkey; + size_t size; int flags; -int error; -}TC [] = { -/* EINVAL - size is 0 */ - { - &shmkey2,0 ,IPC_CREAT |IPC_EXCL |SHM_RW ,EINVAL }, -/* EINVAL - size is negative */ -// {&shmkey2, -1, IPC_CREAT | IPC_EXCL | SHM_RW, EINVAL}, -/* EINVAL - size is larger than created segment */ - { - &shmkey,SHM_SIZE *2 ,SHM_RW ,EINVAL }, -/* EEXIST - the segment exists and IPC_CREAT | IPC_EXCL is given */ - { - &shmkey,SHM_SIZE ,IPC_CREAT |IPC_EXCL |SHM_RW ,EEXIST }, -/* ENOENT - no segment exists for the key and IPC_CREAT is not given */ -/* use shm_id_2 (-1) as the key */
testcases/kernel/syscalls/ipc/shmget/shmget02.c line 47
Quoted 10 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c +8
-2- { - &shm_nonexisting_key, SHM_SIZE, SHM_RW, ENOENT} +/*1: nobody expected 0: root expected */ +int exp_user; +int exp_err; +} tcases[] = { + {&shmkey1, SHM_SIZE, IPC_EXCL, 0, ENOENT}, + {&shmkey, SHM_SIZE, IPC_CREAT | IPC_EXCL, 0, EEXIST}, + {&shmkey1, SHMMIN - 1, IPC_CREAT | IPC_EXCL, 0, EINVAL}, + {&shmkey1, SHMMAX + 1, IPC_CREAT | IPC_EXCL, 0, EINVAL},
Can we please add the zero size EINVAL test as well?
Quoted 3 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c +2
-0+ {&shmkey, SHM_SIZE * 2, IPC_EXCL, 0, EINVAL}, + {&shmkey, SHM_SIZE, SHM_RD, 1, EACCES}, };
...
Quoted 18 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c +3
-13+static void do_test (unsigned int n) { +struct tcase *tc = &tcases[n]; +pid_t pid; -tst_sig (NOFORK ,DEF_HANDLER , cleanup); - -TEST_PAUSE ; - -/* -* Create a temporary directory and cd into it. -* This helps to ensure that a unique msgkey is created. -* See libs/libltpipc/libipc.c for more information. -*/ -tst_tmpdir (); - -/* get an IPC resource key */ - shmkey =getipckey ();
testcases/kernel/syscalls/ipc/shmget/shmget02.c line 76
Quoted 10 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c +2
-8- -/* Get an new IPC resource key. */ - shmkey2 =getipckey (); - -if ((shm_id_1 =shmget (shmkey,SHM_SIZE ,IPC_CREAT |IPC_EXCL | -SHM_RW )) ==-1 ) { -tst_brkm (TBROK , cleanup,"couldn't create shared memory " -"segment in setup()" ); +if (tc->exp_user ==0 ) { +verify_shmget (tc);
Just use the TST_EXP_FAIL() macro here instead, no need to reinvent the wheel.
Quoted 4 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c +1
-1+return ; } -/* Make sure shm_nonexisting_key is a nonexisting key */
testcases/kernel/syscalls/ipc/shmget/shmget02.c line 83
Quoted 10 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c +4
-6-while (1 ) { -while (-1 !=shmget (shm_nonexisting_key,1 ,SHM_RD )) { - shm_nonexisting_key--; - } -if (errno ==ENOENT ) -break ; + pid =SAFE_FORK (); +if (pid ==0 ) { +SAFE_SETUID (pw->pw_uid); +verify_shmget (tc);
And here as well.
Quoted 11 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c +3
-5+exit (0 ); } +tst_reap_children (); } -/* -* cleanup() - performs all the ONE TIME cleanup for this test at completion -* or premature exit. -*/ -void cleanup (void ) +static void setup (void )
testcases/kernel/syscalls/ipc/shmget/shmget02.c line 96
Quoted 10 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c +5
-3{ -/* if it exists, remove the shared memory resource */ -rm_shm (shm_id_1); + shmkey =GETIPCKEY (); + shmkey1 =GETIPCKEY (); -tst_rmdir (); + shm_id =SAFE_SHMGET (shmkey,SHM_SIZE ,IPC_CREAT |IPC_EXCL ); + pw =SAFE_GETPWNAM ("nobody" ); +tst_res (TINFO ,"%d %d" , shmkey, shmkey1);
I'm not sure if this message is useful.
Quoted 23 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c +15
-0+} +static void cleanup (void ) +{ +if (shm_id >=0 ) +SAFE_SHMCTL (shm_id,IPC_RMID ,NULL ); } + +static struct tst_test test = { + .needs_tmpdir =1 , + .needs_root =1 , + .forks_child =1 , + .setup = setup, + .cleanup = cleanup, + .test = do_test, + .tcnt =ARRAY_SIZE (tcases), +};testcases/kernel/syscalls/ipc/shmget/shmget03.c +1
-0@@ -1,171 +1,68 @@ +// SPDX-License-Identifier: GPL-2.0-or-later
...
Quoted 1 line
+static int shm_id_arr[SHMMNI] = {-1};
The SHMMNI is just default value, it could be adjusted at runtime by setting /proc/sys/kernel/shmmni
So we should ideally fix the test to read that value in the test setup and allocate the array based on the value.
Quoted 40 lines
testcases/kernel/syscalls/ipc/shmget/shmget03.c +4
-35+static void verify_shmget (void ) { -int lc; - -tst_parse_opts (ac, av,NULL ,NULL ); - -setup ();/* global setup */ - -/* The following loop checks looping state if -i option given */ - -for (lc =0 ;TEST_LOOPING (lc); lc++) { -/* reset tst_count in case we are looping */ - tst_count =0 ; - -/* -* use the TEST() macro to make the call -*/ - -TEST (shmget (IPC_PRIVATE ,SHM_SIZE ,IPC_CREAT |IPC_EXCL - |SHM_RW )); - -if (TEST_RETURN !=-1 ) { -tst_resm (TFAIL ,"call succeeded when error expected" ); -continue ; - } - -switch (TEST_ERRNO ) { -case ENOSPC : -tst_resm (TPASS ,"expected failure - errno = " -"%d : %s" ,TEST_ERRNO ,strerror (TEST_ERRNO )); -break ; -default : -tst_resm (TFAIL ,"call failed with an " -"unexpected error - %d : %s" , -TEST_ERRNO ,strerror (TEST_ERRNO )); -break ; - } +TEST (shmget (IPC_PRIVATE ,SHM_SIZE ,IPC_CREAT |IPC_EXCL |SHM_RW )); +if (TST_RET !=-1 ) { +tst_res (TFAIL ,"shmget() returned %li" ,TST_RET );
testcases/kernel/syscalls/ipc/shmget/shmget03.c line 37
Quoted 10 lines
testcases/kernel/syscalls/ipc/shmget/shmget03.c +5
-4+return ; } - -cleanup (); - -tst_exit (); +if (TST_ERR ==ENOSPC ) +tst_res (TPASS |TTERRNO ,"shmget() failed as expected" ); +else +tst_res (TFAIL |TTERRNO ,"shmget() failed unexpectedly, expected ENOSPC, bug got" );
This should be TST_EXP_FAIL() as well.
Quoted 39 lines
}
testcases/kernel/syscalls/ipc/shmget/shmget03.c +2
-33-/* -* setup() - performs all the ONE TIME setup for this test. -*/ -void setup (void ) +static void setup (void ) { +int res, num; -tst_sig (NOFORK ,DEF_HANDLER , cleanup); - -TEST_PAUSE ; - -/* -* Create a temporary directory and cd into it. -* This helps to ensure that a unique msgkey is created. -* See libs/libltpipc/libipc.c for more information. -*/ -tst_tmpdir (); - -/* get an IPC resource key */ - shmkey =getipckey (); - -/* -* Use a while loop to create the maximum number of memory segments. -* If the loop exceeds MAXIDS, then break the test and cleanup. -*/ -while ((shm_id_1 =shmget (IPC_PRIVATE ,SHM_SIZE ,IPC_CREAT | -IPC_EXCL |SHM_RW )) !=-1 ) { - shm_id_arr[num_shms++] = shm_id_1; -if (num_shms ==MAXIDS ) { -tst_brkm (TBROK , cleanup,"The maximum number of shared " -"memory ID's has been\n\t reached. Please " -"increase the MAXIDS value in the test." ); - } - } - -/*
testcases/kernel/syscalls/ipc/shmget/shmget03.c line 48
Quoted 10 lines
testcases/kernel/syscalls/ipc/shmget/shmget03.c +4
-5-* If the errno is other than ENOSPC, then something else is wrong. -*/ -if (errno !=ENOSPC ) { -tst_resm (TINFO ,"errno = %d : %s" , errno,strerror (errno)); -tst_brkm (TBROK , cleanup,"Didn't get ENOSPC in test setup" ); +for (num =0 ; num <SHMMNI ; num++) { + res =shmget (IPC_PRIVATE ,SHM_SIZE ,IPC_CREAT |IPC_EXCL |SHM_RW ); +if (res !=-1 ) + shm_id_arr[num] = res; }
So we attempt to allocate SHMMNI shared memory segemnts and the last call will fail.
I guess that we can as well attempt to allocate SHMMNI-1 segemnts and expect them to all pass. I do not like ignore any failures that may happen here and cary on with the test. It would be better to TBROK here instead.
Quoted 9 lines
testcases/kernel/syscalls/ipc/shmget/shmget03.c +2
-5+tst_res (TINFO ,"The maximum number(%d) of memory ID's has been reached" , +SHMMNI ); } -/* -* cleanup() - performs all the ONE TIME cleanup for this test at completion -* or premature exit. -*/ -void cleanup (void )
testcases/kernel/syscalls/ipc/shmget/shmget03.c line 59
Quoted 10 lines
testcases/kernel/syscalls/ipc/shmget/shmget03.c +4
-3+ +static void cleanup (void ) {int i; -/* remove the shared memory resources that were created */ -for (i =0 ; i < num_shms; i++) { -rm_shm (shm_id_arr[i]); +for (i =0 ; i <SHMMNI ; i++) { +if (shm_id_arr[i] >=0 )
This is actually not correct, since there are possibly zeros in the array (just because it's global variable and only first position is intialized wiht -1) and we could incorrectly attempt to remove sement with id 0.
I guess that the cleanest way how to handle this would be having global counter for the number of created semgents:
static key_t *keys;
static unsigned int max_key;
setup()
{
...
keys = SAFE_MALLOC(sizeof(key_t) * shmmni);
...
for (;;) {
if (max_key >= shmni)
break;
keys[max_key] = shmget(...);
if (keys[max_key] < 0)
tst_brk(TBROK, ...);
max_key++;
}
}cleanup()
{
key_t key;
for (key = 0; key < max_key; key++)
SAFE_SHMCTL(keys[key], IPC_RMID, NULL);
}Quoted 14 lines
testcases/kernel/syscalls/ipc/shmget/shmget03.c +7
-3+SAFE_SHMCTL (shm_id_arr[i],IPC_RMID ,NULL ); } - -tst_rmdir (); - } + +static struct tst_test test = { + .setup = setup, + .cleanup = cleanup, + .test_all = verify_shmget, +};testcases/kernel/syscalls/ipc/shmget/shmget04.c +0
-0
...
Quoted 4 lines
testcases/kernel/syscalls/ipc/shmget/shmget04.c +4
-0+tst_res (TINFO ,"%s" , tc->message); +TEST (shmget (shmkey,SHM_SIZE , tc->flag)); +if (TST_RET !=-1 ) { +tst_res (TFAIL ,"shmget() returned %li" ,TST_RET );
testcases/kernel/syscalls/ipc/shmget/shmget04.c line 51
Quoted 10 lines
testcases/kernel/syscalls/ipc/shmget/shmget04.c +5
-4+return ; } - -cleanup (); - -tst_exit (); +if (TST_ERR ==EACCES ) +tst_res (TPASS |TTERRNO ,"shmget() failed as expected" ); +else +tst_res (TFAIL |TTERRNO ,"shmget() failed unexpectedly, expected EACCES, bug got" );
TST_EXP_FAIL() here as well.
Quoted 68 lines
}
testcases/kernel/syscalls/ipc/shmget/shmget04.c +18
-41-/* -* setup() - performs all the ONE TIME setup for this test. -*/ -void setup (void ) +static void setup (void ) { -tst_require_root (); - -tst_sig (NOFORK ,DEF_HANDLER , cleanup); +struct passwd *pw; -TEST_PAUSE ; - -/* Switch to nobody user for correct error code collection */ - ltpuser =getpwnam (nobody_uid); -if (setuid (ltpuser->pw_uid) ==-1 ) { -tst_resm (TINFO ,"setuid failed to " -"to set the effective uid to %d" , ltpuser->pw_uid); -perror ("setuid" ); - } + pw =SAFE_GETPWNAM ("nobody" ); +SAFE_SETUID (pw->pw_uid); + shmkey =GETIPCKEY (); -/* -* Create a temporary directory and cd into it. -* This helps to ensure that a unique msgkey is created. -* See libs/libltpipc/libipc.c for more information. -*/ -tst_tmpdir (); - -/* get an IPC resource key */ - shmkey =getipckey (); - -/* create a shared memory segment without read or access permissions */ -if ((shm_id_1 =shmget (shmkey,SHM_SIZE ,IPC_CREAT |IPC_EXCL )) ==-1 ) { -tst_brkm (TBROK , cleanup,"Failed to create shared memory " -"segment in setup" ); - } + shm_id =SAFE_SHMGET (shmkey,SHM_SIZE ,IPC_CREAT |IPC_EXCL ); } -/* -* cleanup() - performs all the ONE TIME cleanup for this test at completion -* or premature exit. -*/ -void cleanup (void ) +static void cleanup (void ) { -/* if it exists, remove the shared memory resource */ -rm_shm (shm_id_1); - -tst_rmdir (); - +if (shm_id >=0 ) +SAFE_SHMCTL (shm_id,IPC_RMID ,NULL ); } + +static struct tst_test test = { + .needs_tmpdir =1 , + .needs_root =1 , + .setup = setup, + .cleanup = cleanup, + .test = verify_shmget, + .tcnt =ARRAY_SIZE (tcases), +};
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH 2/4 syscalls/shmget*: Convert into new api
Hi Cyril
Thanks for your review, will fix these comments on v2.
Quoted 217 lines
Hi!
Quoted 216 lines
1) merge
shmget05.cintoshmget02.c
2) Use SHMMIN -1 and SHMMAX + 1 to trigger EINVAL error
3) UseSHM_RD,SHM_WR,SHM_RWto trigger EACCES error under unpriviledged userSigned-off-by Yang Xu<[email protected]>--- include/lapi/shm.h | 14 + runtest/syscalls | 1 - runtest/syscalls-ipc | 1 - .../kernel/syscalls/ipc/shmget/.gitignore | 1 - testcases/kernel/syscalls/ipc/shmget/Makefile | 4 +- .../kernel/syscalls/ipc/shmget/shmget02.c | 243 +++++++----------- .../kernel/syscalls/ipc/shmget/shmget03.c | 199 ++++---------- .../kernel/syscalls/ipc/shmget/shmget04.c | 193 +++++--------- .../kernel/syscalls/ipc/shmget/shmget05.c | 185 ------------- 9 files changed, 209 insertions(+), 632 deletions(-)delete mode 100644
testcases/kernel/syscalls/ipc/shmget/shmget05.cinclude/lapi/shm.h +14
-0@@ -6,8 +6,22 @@#ifndef LAPI_SHM_H__ #define LAPI_SHM_H__ +#include <limits.h> +#ifndef SHM_STAT_ANY # define SHM_STAT_ANY 15#endif +#ifndef SHMMIN +# define SHMMIN 1 +#endif + +#ifndef SHMMAX +# define SHMMAX (ULONG_MAX - (1UL<< 24)) +#endif + +#ifndef SHMMNI +# define SHMMNI 4096 +#endif +#endif /* LAPI_SHM_H__ */ runtest/syscalls +0
-1@@ -1402,7 +1402,6 @@ shmdt02 shmdt02 shmget02 shmget02 shmget03 shmget03 shmget04 shmget04 -shmget05 shmget05 sigaction01 sigaction01 sigaction02 sigaction02runtest/syscalls-ipc +0
-1@@ -67,4 +67,3 @@ shmdt02 shmdt02 shmget02 shmget02 shmget03 shmget03 shmget04 shmget04 -shmget05 shmget05testcases/kernel/syscalls/ipc/shmget/.gitignore +0
-1@@ -1,4 +1,3 @@ /shmget02 /shmget03 /shmget04 -/shmget05testcases/kernel/syscalls/ipc/shmget/Makefile +2
-2@@ -3,10 +3,10 @@ top_srcdir ?= ../../../../.. -LTPLIBS = ltpipc +LTPLIBS = ltpnewipc include $(top_srcdir)/include/mk/testcases.mk -LTPLDLIBS = -lltpipc +LTPLDLIBS = -lltpnewipc include $(top_srcdir)/include/mk/generic_leaf_target.mktestcases/kernel/syscalls/ipc/shmget/shmget02.c +33
-78@@ -1,184 +1,113 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* +* Copyright (c) International Business Machines Corp., 2001 +* 03/2001 - Written by Wayne Boyer * -* 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 +* Copyright (c) 2008 Renaud Lottiaux ([email protected]) */ -/* -* NAME -* shmget02.c -* -* DESCRIPTION -* shmget02 - check for ENOENT, EEXIST and EINVAL errors +/*\ +* [Description] * -* ALGORITHM -* create a shared memory segment with read& write permissions -* loop if that option was specified -* call shmget() using five different invalid cases -* check the errno value -* issue a PASS message if we get ENOENT, EEXIST or EINVAL -* otherwise, the tests fails -* issue a FAIL message -* call cleanup +* Test for ENOENT, EEXIST, EINVAL, EACCES errors. * -* USAGE:<for command-line> -* shmget02 [-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. -* -* HISTORY -* 03/2001 - Written by Wayne Boyer -* -* 06/03/2008 Renaud Lottiaux ([email protected]) -* - Fix concurrency issue. The second key used for this test could -* conflict with the key from another task. -* -* RESTRICTIONS -* none +* ENOENT - No segment exists for the given key and IPC_CREAT was not specified. +* EEXIST - the segment exists and IPC_CREAT | IPC_EXCL is given. +* EINVAL - A new segment was to be created and size is less than SHMMIN or +* greater than SHMMAX. Or a segment for the given key exists, but size is +* greater than the size of that segment. +* EACCES - The user does not have permission to access the shared memory segment. */ - -#include "ipcshm.h" - -char *TCID ="shmget02" ; -int TST_TOTAL =4 ; - -int shm_id_1 =-1 ; -int shm_nonexisting_key =-1 ; -key_t shmkey2; - -struct test_case_t { -int *skey; -int size; +#include <errno.h> +#include <sys/types.h> +#include <sys/ipc.h> +#include <stdlib.h> +#include <pwd.h> +#include <sys/shm.h> +#include "tst_safe_sysv_ipc.h" +#include "tst_test.h" +#include "libnewipc.h" +#include "lapi/shm.h" + +static int shm_id =-1 ; +static key_t shmkey, shmkey1; +static struct passwd *pw; + +static struct tcase { + int *shmkey; + size_t size; int flags; -int error; -}TC [] = { -/* EINVAL - size is 0 */ - { - &shmkey2,0 ,IPC_CREAT |IPC_EXCL |SHM_RW ,EINVAL }, -/* EINVAL - size is negative */ -// {&shmkey2, -1, IPC_CREAT | IPC_EXCL | SHM_RW, EINVAL}, -/* EINVAL - size is larger than created segment */ - { - &shmkey,SHM_SIZE *2 ,SHM_RW ,EINVAL }, -/* EEXIST - the segment exists and IPC_CREAT | IPC_EXCL is given */ - { - &shmkey,SHM_SIZE ,IPC_CREAT |IPC_EXCL |SHM_RW ,EEXIST }, -/* ENOENT - no segment exists for the key and IPC_CREAT is not given */ -/* use shm_id_2 (-1) as the key */ - { - &shm_nonexisting_key,SHM_SIZE ,SHM_RW ,ENOENT } + /*1: nobody expected 0: root expected */ + int exp_user;
Quoted 8 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c line 47
Quoted 6 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c +6
-0+int exp_err; +} tcases[] = { + {&shmkey1, SHM_SIZE, IPC_EXCL, 0, ENOENT}, + {&shmkey, SHM_SIZE, IPC_CREAT | IPC_EXCL, 0, EEXIST}, + {&shmkey1, SHMMIN - 1, IPC_CREAT | IPC_EXCL, 0, EINVAL}, + {&shmkey1, SHMMAX + 1, IPC_CREAT | IPC_EXCL, 0, EINVAL},Can we please add the zero size EINVAL test as well?
SHMMIN is equal to 1, so we have tested zero size EINVAL test.
Quoted 30 lines
Quoted 4 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c +2
-0+ {&shmkey, SHM_SIZE * 2, IPC_EXCL, 0, EINVAL}, + {&shmkey, SHM_SIZE, SHM_RD, 1, EACCES}, };...
Quoted 23 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c +3
-18+static void do_test (unsigned int n) { +struct tcase *tc =&tcases[n]; +pid_t pid; - tst_sig(NOFORK, DEF_HANDLER, cleanup); - - TEST_PAUSE; - - /* - * Create a temporary directory and cd into it. - * This helps to ensure that a unique msgkey is created. - * See libs/libltpipc/libipc.c for more information. - */ - tst_tmpdir(); - - /* get an IPC resource key */ - shmkey = getipckey(); - - /* Get an new IPC resource key. */ - shmkey2 = getipckey(); - - if ((shm_id_1 = shmget(shmkey, SHM_SIZE, IPC_CREAT | IPC_EXCL |
Quoted 8 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c line 76
Quoted 5 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c +2
-3- SHM_RW)) == -1) { -tst_brkm (TBROK , cleanup,"couldn't create shared memory " -"segment in setup()" ); +if (tc->exp_user ==0 ) { +verify_shmget (tc);Just use the
TST_EXP_FAIL()macro here instead, no need to reinvent the wheel.
Yes, use TST_EXP_FAIL(shmget(*tc->shmkey, tc->size, tc->flags), tc->exp_err, "shmget(%i, %lu, %i)",*tc->shmkey, tc->size, tc->flags) to replace.
Quoted 4 lines
Quoted 4 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c +1
-0+return ; }
Quoted 13 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c line 83
Quoted 11 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c +4
-7-/* Make sure shm_nonexisting_key is a nonexisting key */ -while (1 ) { -while (-1 !=shmget (shm_nonexisting_key,1 ,SHM_RD )) { - shm_nonexisting_key--; - } -if (errno ==ENOENT ) -break ; + pid =SAFE_FORK (); +if (pid ==0 ) { +SAFE_SETUID (pw->pw_uid); +verify_shmget (tc);And here as well.
OK.
Quoted 18 lines
Quoted 18 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c +5
-7+exit (0 ); } +tst_reap_children (); } -/* -* cleanup() - performs all the ONE TIME cleanup for this test at completion -* or premature exit. -*/ -void cleanup (void ) +static void setup (void ) { -/* if it exists, remove the shared memory resource */ -rm_shm (shm_id_1); + shmkey =GETIPCKEY (); + shmkey1 =GETIPCKEY ();
Quoted 6 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c line 96
Quoted 4 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c +3
-1-tst_rmdir (); + shm_id =SAFE_SHMGET (shmkey,SHM_SIZE ,IPC_CREAT |IPC_EXCL ); + pw =SAFE_GETPWNAM ("nobody" ); +tst_res (TINFO ,"%d %d" , shmkey, shmkey1);I'm not sure if this message is useful.
It is debug message, will remove it.
Quoted 27 lines
Quoted 24 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c +15
-0+} +static void cleanup (void ) +{ +if (shm_id>=0 ) +SAFE_SHMCTL (shm_id,IPC_RMID ,NULL ); } + +static struct tst_test test = { + .needs_tmpdir =1 , + .needs_root =1 , + .forks_child =1 , + .setup = setup, + .cleanup = cleanup, + .test = do_test, + .tcnt =ARRAY_SIZE (tcases), +};testcases/kernel/syscalls/ipc/shmget/shmget03.c +1
-0@@ -1,171 +1,68 @@ +// SPDX-License-Identifier: GPL-2.0-or-later ...
Quoted 7 lines
Quoted 1 line
+static int shm_id_arr[SHMMNI] = {-1};
The SHMMNI is just default value, it could be adjusted at runtime by setting
/proc/sys/kernel/shmmniSo we should ideally fix the test to read that value in the test setup and allocate the array based on the value.
Agree.
Quoted 45 lines
Quoted 45 lines
testcases/kernel/syscalls/ipc/shmget/shmget03.c +5
-37+static void verify_shmget (void ) { -int lc; - -tst_parse_opts (ac, av,NULL ,NULL ); - -setup ();/* global setup */ - -/* The following loop checks looping state if -i option given */ - -for (lc =0 ;TEST_LOOPING (lc); lc++) { -/* reset tst_count in case we are looping */ - tst_count =0 ; - -/* -* use the TEST() macro to make the call -*/ - -TEST (shmget (IPC_PRIVATE ,SHM_SIZE ,IPC_CREAT |IPC_EXCL - |SHM_RW )); - -if (TEST_RETURN !=-1 ) { -tst_resm (TFAIL ,"call succeeded when error expected" ); -continue ; - } - -switch (TEST_ERRNO ) { -case ENOSPC : -tst_resm (TPASS ,"expected failure - errno = " -"%d : %s" ,TEST_ERRNO ,strerror (TEST_ERRNO )); -break ; -default : -tst_resm (TFAIL ,"call failed with an " -"unexpected error - %d : %s" , -TEST_ERRNO ,strerror (TEST_ERRNO )); -break ; - } +TEST (shmget (IPC_PRIVATE ,SHM_SIZE ,IPC_CREAT |IPC_EXCL |SHM_RW )); +if (TST_RET !=-1 ) { +tst_res (TFAIL ,"shmget() returned %li" ,TST_RET ); +return ; } - -cleanup ();
Quoted 8 lines
testcases/kernel/syscalls/ipc/shmget/shmget03.c line 37
Quoted 6 lines
testcases/kernel/syscalls/ipc/shmget/shmget03.c +4
-2- -tst_exit (); +if (TST_ERR ==ENOSPC ) +tst_res (TPASS |TTERRNO ,"shmget() failed as expected" ); +else +tst_res (TFAIL |TTERRNO ,"shmget() failed unexpectedly, expected ENOSPC, bug got" );This should be
TST_EXP_FAIL()as well.
Will do it.
Quoted 54 lines
Quoted 40 lines
}testcases/kernel/syscalls/ipc/shmget/shmget03.c +2
-33-/* -* setup() - performs all the ONE TIME setup for this test. -*/ -void setup (void ) +static void setup (void ) { +int res, num; -tst_sig (NOFORK ,DEF_HANDLER , cleanup); - -TEST_PAUSE ; - -/* -* Create a temporary directory and cd into it. -* This helps to ensure that a unique msgkey is created. -* See libs/libltpipc/libipc.c for more information. -*/ -tst_tmpdir (); - -/* get an IPC resource key */ - shmkey =getipckey (); - -/* -* Use a while loop to create the maximum number of memory segments. -* If the loop exceeds MAXIDS, then break the test and cleanup. -*/ -while ((shm_id_1 =shmget (IPC_PRIVATE ,SHM_SIZE ,IPC_CREAT | -IPC_EXCL |SHM_RW )) !=-1 ) { - shm_id_arr[num_shms++] = shm_id_1; -if (num_shms ==MAXIDS ) { -tst_brkm (TBROK , cleanup,"The maximum number of shared " -"memory ID's has been\n\t reached. Please " -"increase the MAXIDS value in the test." ); - } - } - -/* testcases/kernel/syscalls/ipc/shmget/shmget03.c line 48
Quoted 10 lines
testcases/kernel/syscalls/ipc/shmget/shmget03.c +4
-5-* If the errno is other than ENOSPC, then something else is wrong. -*/ -if (errno !=ENOSPC ) { -tst_resm (TINFO ,"errno = %d : %s" , errno,strerror (errno)); -tst_brkm (TBROK , cleanup,"Didn't get ENOSPC in test setup" ); +for (num =0 ; num<SHMMNI ; num++) { + res =shmget (IPC_PRIVATE ,SHM_SIZE ,IPC_CREAT |IPC_EXCL |SHM_RW ); +if (res !=-1 ) + shm_id_arr[num] = res; }So we attempt to allocate SHMMNI shared memory segemnts and the last call will fail.
Quoted 5 lines
I guess that we can as well attempt to allocate SHMMNI-1 segemnts and expect them to all pass. I do not like ignore any failures that may happen here and cary on with the test. It would be better to TBROK here instead.
Sounds reansonable. Will do it.
Quoted 52 lines
Quoted 9 lines
testcases/kernel/syscalls/ipc/shmget/shmget03.c +2
-5+tst_res (TINFO ,"The maximum number(%d) of memory ID's has been reached" , +SHMMNI ); } -/* -* cleanup() - performs all the ONE TIME cleanup for this test at completion -* or premature exit. -*/ -void cleanup (void )testcases/kernel/syscalls/ipc/shmget/shmget03.c
Quoted 10 lines
testcases/kernel/syscalls/ipc/shmget/shmget03.c +4
-3+ +static void cleanup (void ) {int i; -/* remove the shared memory resources that were created */ -for (i =0 ; i< num_shms; i++) { -rm_shm (shm_id_arr[i]); +for (i =0 ; i<SHMMNI ; i++) { +if (shm_id_arr[i]>=0 )This is actually not correct, since there are possibly zeros in the array (just because it's global variable and only first position is intialized wiht -1) and we could incorrectly attempt to remove sement with id 0.
I guess that the cleanest way how to handle this would be having global counter for the number of created semgents:
static
key_t*keys;
static unsigned intmax_key;
setup(){ ... keys = SAFE_MALLOC(sizeof(key_t) * shmmni); ... for (;;) { if (max_key>= shmni) break; keys[max_key] = shmget(...); if (keys[max_key]< 0) tst_brk(TBROK, ...); max_key++; } }
Quoted 10 lines
cleanup(){ key_t key; for (key = 0; key< max_key; key++) SAFE_SHMCTL(keys[key], IPC_RMID, NULL); }
Yes, Will do it in v2.
Quoted 17 lines
Quoted 14 lines
testcases/kernel/syscalls/ipc/shmget/shmget03.c +7
-3+SAFE_SHMCTL (shm_id_arr[i],IPC_RMID ,NULL ); } - -tst_rmdir (); - } + +static struct tst_test test = { + .setup = setup, + .cleanup = cleanup, + .test_all = verify_shmget, +};testcases/kernel/syscalls/ipc/shmget/shmget04.c +0
-0...
Quoted 16 lines
Quoted 4 lines
testcases/kernel/syscalls/ipc/shmget/shmget04.c +4
-0+tst_res (TINFO ,"%s" , tc->message); +TEST (shmget (shmkey,SHM_SIZE , tc->flag)); +if (TST_RET !=-1 ) { +tst_res (TFAIL ,"shmget() returned %li" ,TST_RET );testcases/kernel/syscalls/ipc/shmget/shmget04.c line 51
Quoted 10 lines
testcases/kernel/syscalls/ipc/shmget/shmget04.c +5
-4+return ; } - -cleanup (); - -tst_exit (); +if (TST_ERR ==EACCES ) +tst_res (TPASS |TTERRNO ,"shmget() failed as expected" ); +else +tst_res (TFAIL |TTERRNO ,"shmget() failed unexpectedly, expected EACCES, bug got" );
TST_EXP_FAIL()here as well.
Will do it.
Best Regards
Yang Xu
Quoted 70 lines
Quoted 69 lines
}testcases/kernel/syscalls/ipc/shmget/shmget04.c +18
-41-/* -* setup() - performs all the ONE TIME setup for this test. -*/ -void setup (void ) +static void setup (void ) { -tst_require_root (); - -tst_sig (NOFORK ,DEF_HANDLER , cleanup); +struct passwd *pw; -TEST_PAUSE ; - -/* Switch to nobody user for correct error code collection */ - ltpuser =getpwnam (nobody_uid); -if (setuid (ltpuser->pw_uid) ==-1 ) { -tst_resm (TINFO ,"setuid failed to " -"to set the effective uid to %d" , ltpuser->pw_uid); -perror ("setuid" ); - } + pw =SAFE_GETPWNAM ("nobody" ); +SAFE_SETUID (pw->pw_uid); + shmkey =GETIPCKEY (); -/* -* Create a temporary directory and cd into it. -* This helps to ensure that a unique msgkey is created. -* See libs/libltpipc/libipc.c for more information. -*/ -tst_tmpdir (); - -/* get an IPC resource key */ - shmkey =getipckey (); - -/* create a shared memory segment without read or access permissions */ -if ((shm_id_1 =shmget (shmkey,SHM_SIZE ,IPC_CREAT |IPC_EXCL )) ==-1 ) { -tst_brkm (TBROK , cleanup,"Failed to create shared memory " -"segment in setup" ); - } + shm_id =SAFE_SHMGET (shmkey,SHM_SIZE ,IPC_CREAT |IPC_EXCL ); } -/* -* cleanup() - performs all the ONE TIME cleanup for this test at completion -* or premature exit. -*/ -void cleanup (void ) +static void cleanup (void ) { -/* if it exists, remove the shared memory resource */ -rm_shm (shm_id_1); - -tst_rmdir (); - +if (shm_id>=0 ) +SAFE_SHMCTL (shm_id,IPC_RMID ,NULL ); } + +static struct tst_test test = { + .needs_tmpdir =1 , + .needs_root =1 , + .setup = setup, + .cleanup = cleanup, + .test = verify_shmget, + .tcnt =ARRAY_SIZE (tcases), +};
PATCH v2 1/1 syscalls/shmget*: Convert into new api
In reply to Cyril Hrubis1) merge shmget05.c into shmget02.c
2) Use SHMMIN -1 and SHMMAX + 1 to trigger EINVAL error
3) Use SHM_RD, SHM_WR, SHM_RW to trigger EACCES error under unpriviledged user
4) add EPERM error test
5) Use TST_EXP_FAIL macro
--- include/lapi/shm.h | 14 + runtest/syscalls | 1 - runtest/syscalls-ipc | 1 - .../kernel/syscalls/ipc/shmget/.gitignore | 1 - testcases/kernel/syscalls/ipc/shmget/Makefile | 4 +- .../kernel/syscalls/ipc/shmget/shmget02.c | 244 ++++++------------ .../kernel/syscalls/ipc/shmget/shmget03.c | 204 ++++----------- .../kernel/syscalls/ipc/shmget/shmget04.c | 188 ++++---------- .../kernel/syscalls/ipc/shmget/shmget05.c | 185 ------------- 9 files changed, 206 insertions(+), 636 deletions(-) delete mode 100644 testcases/kernel/syscalls/ipc/shmget/shmget05.c
include/lapi/shm.h +14 -0
@@ -6,8 +6,22 @@#ifndef LAPI_SHM_H__ #define LAPI_SHM_H__ +#include <limits.h> +#ifndef SHM_STAT_ANY # define SHM_STAT_ANY 15#endif +#ifndef SHMMIN +# define SHMMIN 1 +#endif + +#ifndef SHMMAX +# define SHMMAX (ULONG_MAX - (1UL << 24)) +#endif + +#ifndef SHMMNI +# define SHMMNI 4096 +#endif +#endif /* LAPI_SHM_H__ */
runtest/syscalls +0 -1
@@ -1407,7 +1407,6 @@ shmdt02 shmdt02 shmget02 shmget02 shmget03 shmget03 shmget04 shmget04 -shmget05 shmget05 sigaction01 sigaction01 sigaction02 sigaction02
runtest/syscalls-ipc +0 -1
@@ -67,4 +67,3 @@ shmdt02 shmdt02 shmget02 shmget02 shmget03 shmget03 shmget04 shmget04 -shmget05 shmget05
testcases/kernel/syscalls/ipc/shmget/.gitignore +0 -1
@@ -1,4 +1,3 @@ /shmget02 /shmget03 /shmget04 -/shmget05
testcases/kernel/syscalls/ipc/shmget/Makefile +2 -2
@@ -3,10 +3,10 @@ top_srcdir ?= ../../../../.. -LTPLIBS = ltpipc +LTPLIBS = ltpnewipc include $(top_srcdir)/include/mk/testcases.mk -LTPLDLIBS = -lltpipc +LTPLDLIBS = -lltpnewipc include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/ipc/shmget/shmget02.c +83 -161
267 lines not on this page · raw message
testcases/kernel/syscalls/ipc/shmget/shmget03.c +54 -150
225 lines not on this page · raw message
testcases/kernel/syscalls/ipc/shmget/shmget04.c +53 -135
206 lines not on this page · raw message
testcases/kernel/syscalls/ipc/shmget/shmget05.c deleted +0 -185
185 lines not on this page · raw message
Signature · 1 line
2.23.0
PATCH v2 1/1 syscalls/shmget*: Convert into new api
Hi!
Quoted 220 lines
1) merge
shmget05.cintoshmget02.c
2) Use SHMMIN -1 and SHMMAX + 1 to trigger EINVAL error
3) UseSHM_RD,SHM_WR,SHM_RWto trigger EACCES error under unpriviledged user
4) add EPERM error test
5) UseTST_EXP_FAILmacroSigned-off-by Yang Xu <[email protected]>--- include/lapi/shm.h | 14 + runtest/syscalls | 1 - runtest/syscalls-ipc | 1 - .../kernel/syscalls/ipc/shmget/.gitignore | 1 - testcases/kernel/syscalls/ipc/shmget/Makefile | 4 +- .../kernel/syscalls/ipc/shmget/shmget02.c | 244 ++++++------------ .../kernel/syscalls/ipc/shmget/shmget03.c | 204 ++++----------- .../kernel/syscalls/ipc/shmget/shmget04.c | 188 ++++---------- .../kernel/syscalls/ipc/shmget/shmget05.c | 185 ------------- 9 files changed, 206 insertions(+), 636 deletions(-) delete mode 100644 testcases/kernel/syscalls/ipc/shmget/shmget05.cinclude/lapi/shm.h +14
-0@@ -6,8 +6,22 @@#ifndef LAPI_SHM_H__ #define LAPI_SHM_H__ +#include <limits.h> +#ifndef SHM_STAT_ANY # define SHM_STAT_ANY 15#endif +#ifndef SHMMIN +# define SHMMIN 1 +#endif + +#ifndef SHMMAX +# define SHMMAX (ULONG_MAX - (1UL << 24)) +#endif + +#ifndef SHMMNI +# define SHMMNI 4096 +#endif +#endif /* LAPI_SHM_H__ */ runtest/syscalls +0
-1@@ -1407,7 +1407,6 @@ shmdt02 shmdt02 shmget02 shmget02 shmget03 shmget03 shmget04 shmget04 -shmget05 shmget05 sigaction01 sigaction01 sigaction02 sigaction02runtest/syscalls-ipc +0
-1@@ -67,4 +67,3 @@ shmdt02 shmdt02 shmget02 shmget02 shmget03 shmget03 shmget04 shmget04 -shmget05 shmget05testcases/kernel/syscalls/ipc/shmget/.gitignore +0
-1@@ -1,4 +1,3 @@ /shmget02 /shmget03 /shmget04 -/shmget05testcases/kernel/syscalls/ipc/shmget/Makefile +2
-2@@ -3,10 +3,10 @@ top_srcdir ?= ../../../../.. -LTPLIBS = ltpipc +LTPLIBS = ltpnewipc include $(top_srcdir)/include/mk/testcases.mk -LTPLDLIBS = -lltpipc +LTPLDLIBS = -lltpnewipc include $(top_srcdir)/include/mk/generic_leaf_target.mktestcases/kernel/syscalls/ipc/shmget/shmget02.c +35
-77@@ -1,184 +1,106 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* +* Copyright (c) International Business Machines Corp., 2001 +* 03/2001 - Written by Wayne Boyer * -* 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 +* Copyright (c) 2008 Renaud Lottiaux ([email protected]) */ -/* -* NAME -* shmget02.c -* -* DESCRIPTION -* shmget02 - check for ENOENT, EEXIST and EINVAL errors +/*\ +* [Description] * -* ALGORITHM -* create a shared memory segment with read & write permissions -* loop if that option was specified -* call shmget() using five different invalid cases -* check the errno value -* issue a PASS message if we get ENOENT, EEXIST or EINVAL -* otherwise, the tests fails -* issue a FAIL message -* call cleanup +* Test for ENOENT, EEXIST, EINVAL, EACCES, EPERM errors. * -* USAGE: <for command-line> -* shmget02 [-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. -* -* HISTORY -* 03/2001 - Written by Wayne Boyer -* -* 06/03/2008 Renaud Lottiaux ([email protected]) -* - Fix concurrency issue. The second key used for this test could -* conflict with the key from another task. -* -* RESTRICTIONS -* none +* ENOENT - No segment exists for the given key and IPC_CREAT was not specified. +* EEXIST - the segment exists and IPC_CREAT | IPC_EXCL is given. +* EINVAL - A new segment was to be created and size is less than SHMMIN or +* greater than SHMMAX. Or a segment for the given key exists, but size is +* gran eater than the size of that segment. +* EACCES - The user does not have permission to access the shared memory segment. +* EPERM - The SHM_HUGETLB flag was specified, but the caller was not privileged +* (did not have the CAP_IPC_LOCK capability) and is not a member of the +* sysctl_hugetlb_shm_group group. */ -#include "ipcshm.h" - -char *TCID ="shmget02" ; -int TST_TOTAL =4 ; - -int shm_id_1 =-1 ; -int shm_nonexisting_key =-1 ; -key_t shmkey2; - -struct test_case_t { -int *skey; -int size; +#include <errno.h> +#include <sys/types.h> +#include <sys/ipc.h> +#include <stdlib.h> +#include <pwd.h> +#include <sys/shm.h> +#include "tst_safe_sysv_ipc.h" +#include "tst_test.h" +#include "libnewipc.h" +#include "lapi/shm.h" + +static int shm_id =-1 ; +static key_t shmkey, shmkey1; +static struct passwd *pw; + +static struct tcase { + int *shmkey; + size_t size; int flags; -int error; -}TC [] = { -/* EINVAL - size is 0 */ - { - &shmkey2,0 ,IPC_CREAT |IPC_EXCL |SHM_RW ,EINVAL }, -/* EINVAL - size is negative */ -// {&shmkey2, -1, IPC_CREAT | IPC_EXCL | SHM_RW, EINVAL}, -/* EINVAL - size is larger than created segment */ - { - &shmkey,SHM_SIZE *2 ,SHM_RW ,EINVAL }, -/* EEXIST - the segment exists and IPC_CREAT | IPC_EXCL is given */ - { - &shmkey,SHM_SIZE ,IPC_CREAT |IPC_EXCL |SHM_RW ,EEXIST }, -/* ENOENT - no segment exists for the key and IPC_CREAT is not given */ -/* use shm_id_2 (-1) as the key */ - { - &shm_nonexisting_key,SHM_SIZE ,SHM_RW ,ENOENT } + /*1: nobody expected 0: root expected */
testcases/kernel/syscalls/ipc/shmget/shmget02.c line 54
Quoted 10 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c +10
-0+int exp_user; +int exp_err; +} tcases[] = { + {&shmkey1, SHM_SIZE, IPC_EXCL, 0, ENOENT}, + {&shmkey, SHM_SIZE, IPC_CREAT | IPC_EXCL, 0, EEXIST}, + {&shmkey1, SHMMIN - 1, IPC_CREAT | IPC_EXCL, 0, EINVAL}, + {&shmkey1, SHMMAX + 1, IPC_CREAT | IPC_EXCL, 0, EINVAL}, + {&shmkey, SHM_SIZE * 2, IPC_EXCL, 0, EINVAL}, + {&shmkey, SHM_SIZE, SHM_RD, 1, EACCES}, + {&shmkey1, SHM_SIZE, IPC_CREAT | SHM_HUGETLB, 1, EPERM}
This case is a bit more complicated, on my test machine with nr_hugepages == 0 I get ENOMEM, since there are no hugepages allocated in the pool.
When I add .request_hugepages = 1, the the tst_test structure, the hugepage pool size is increased by the test library and this request succeds and creates a SHM segment. See description below on how this has to be fixed.
Quoted 93 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c +18
-65}; -int main (int ac,char **av) +static void do_test (unsigned int n) { -int lc; -int i; - -tst_parse_opts (ac, av,NULL ,NULL ); - -setup ();/* global setup */ - -/* The following loop checks looping state if -i option given */ - -for (lc =0 ;TEST_LOOPING (lc); lc++) { -/* reset tst_count in case we are looping */ - tst_count =0 ; +struct tcase *tc = &tcases[n]; +pid_t pid; -/* loop through the test cases */ -for (i =0 ; i <TST_TOTAL ; i++) { -/* -* Look for a failure ... -*/ - -TEST (shmget (*(TC [i].skey),TC [i].size,TC [i].flags)); - -if (TEST_RETURN !=-1 ) { -tst_resm (TFAIL ,"call succeeded unexpectedly" ); -continue ; - } - -if (TEST_ERRNO ==TC [i].error) { -tst_resm (TPASS ,"expected failure - errno = " -"%d : %s" ,TEST_ERRNO , -strerror (TEST_ERRNO )); - }else { -tst_resm (TFAIL ,"call failed with an " -"unexpected error - %d : %s" , -TEST_ERRNO ,strerror (TEST_ERRNO )); - } - } +if (tc->exp_user ==0 ) { +TST_EXP_FAIL (shmget (*tc->shmkey, tc->size, tc->flags), tc->exp_err, +"shmget(%i, %lu, %i)" , *tc->shmkey, tc->size, tc->flags); +return ; } -cleanup (); - -tst_exit (); + pid =SAFE_FORK (); +if (pid ==0 ) { +SAFE_SETUID (pw->pw_uid); +TST_EXP_FAIL (shmget (*tc->shmkey, tc->size, tc->flags), tc->exp_err, +"shmget(%i, %lu, %i)" , *tc->shmkey, tc->size, tc->flags); +exit (0 ); + } +tst_reap_children (); } -/* -* setup() - performs all the ONE TIME setup for this test. -*/ -void setup (void ) +static void setup (void ) { + shmkey =GETIPCKEY (); + shmkey1 =GETIPCKEY (); -tst_sig (NOFORK ,DEF_HANDLER , cleanup); - -TEST_PAUSE ; - -/* -* Create a temporary directory and cd into it. -* This helps to ensure that a unique msgkey is created. -* See libs/libltpipc/libipc.c for more information. -*/ -tst_tmpdir (); - -/* get an IPC resource key */ - shmkey =getipckey (); - -/* Get an new IPC resource key. */ - shmkey2 =getipckey (); - -if ((shm_id_1 =shmget (shmkey,SHM_SIZE ,IPC_CREAT |IPC_EXCL | -SHM_RW )) ==-1 ) { -tst_brkm (TBROK , cleanup,"couldn't create shared memory " -"segment in setup()" ); - }
testcases/kernel/syscalls/ipc/shmget/shmget02.c line 83
Quoted 10 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c +1
-9- -/* Make sure shm_nonexisting_key is a nonexisting key */ -while (1 ) { -while (-1 !=shmget (shm_nonexisting_key,1 ,SHM_RD )) { - shm_nonexisting_key--; - } -if (errno ==ENOENT ) -break ; - } +SAFE_FILE_PRINTF ("/proc/sys/vm/hugetlb_shm_group" ,"1" );
There is no need to change the default hugetlb group, all that has to be done is to strip the user of all groups as well as there is absolutely no guarantee that group 1 will not be in the list of supplementary groups for a root users.
So when we change uid we as well have to do:
setgroups(0, NULL); SAFE_SETGID(pw->pw_gid); SAFE_SETUID(pw->pw_uid);
This will strip the process of all additional permissions that may have been passed down by the process running under root.
Also ideally we should add SAFE_SETGROUPS() to the test library in a separate patch so that we can make use of it here.
Quoted 243 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c +19
-10+ shm_id =SAFE_SHMGET (shmkey,SHM_SIZE ,IPC_CREAT |IPC_EXCL ); + pw =SAFE_GETPWNAM ("nobody" ); } -/* -* cleanup() - performs all the ONE TIME cleanup for this test at completion -* or premature exit. -*/ -void cleanup (void ) +static void cleanup (void ) { -/* if it exists, remove the shared memory resource */ -rm_shm (shm_id_1); - -tst_rmdir (); - +if (shm_id >=0 ) +SAFE_SHMCTL (shm_id,IPC_RMID ,NULL ); } + +static struct tst_test test = { + .needs_tmpdir =1 , + .needs_root =1 , + .forks_child =1 , + .setup = setup, + .cleanup = cleanup, + .test = do_test, + .tcnt =ARRAY_SIZE (tcases), + .save_restore = (const char *const []) { +"?/proc/sys/vm/hugetlb_shm_group" , +NULL , + } +};testcases/kernel/syscalls/ipc/shmget/shmget03.c +40
-147@@ -1,171 +1,75 @@ +// 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 +* Copyright (c) International Business Machines Corp., 2001 +* 03/2001 - Written by Wayne Boyer */ -/* -* NAME -* shmget03.c +/*\ +* [Description] * -* DESCRIPTION -* shmget03 - test for ENOSPC error +* Test for ENOSPC error. * -* ALGORITHM -* create shared memory segments in a loop until reaching the system limit -* loop if that option was specified -* attempt to create yet another shared memory segment -* check the errno value -* issue a PASS message if we get ENOSPC -* otherwise, the tests fails -* issue a FAIL message -* call cleanup -* -* USAGE: <for command-line> -* shmget03 [-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. -* -* HISTORY -* 03/2001 - Written by Wayne Boyer -* -* RESTRICTIONS -* none +* ENOSPC - All possible shared memory segments have been taken (SHMMNI). */ - -#include "ipcshm.h" - -char *TCID ="shmget03" ; -int TST_TOTAL =1 ; - -/* -* The MAXIDS value is somewhat arbitrary and may need to be increased -* depending on the system being tested. -*/ -#define MAXIDS 8192 - -int shm_id_1 =-1 ; -int num_shms =0 ; - -int shm_id_arr[MAXIDS ]; - -int main (int ac,char **av) +#include <errno.h> +#include <sys/types.h> +#include <sys/ipc.h> +#include <stdlib.h> +#include <pwd.h> +#include <sys/shm.h> +#include "tst_test.h" +#include "tst_safe_sysv_ipc.h" +#include "libnewipc.h" + +static int *queues; +static int maxshms; +static key_t shmkey; + +static void verify_shmget (void ) { -int lc; - -tst_parse_opts (ac, av,NULL ,NULL ); - -setup ();/* global setup */ - -/* The following loop checks looping state if -i option given */ - -for (lc =0 ;TEST_LOOPING (lc); lc++) { -/* reset tst_count in case we are looping */ - tst_count =0 ; - -/* -* use the TEST() macro to make the call -*/ - -TEST (shmget (IPC_PRIVATE ,SHM_SIZE ,IPC_CREAT |IPC_EXCL - |SHM_RW )); - -if (TEST_RETURN !=-1 ) { -tst_resm (TFAIL ,"call succeeded when error expected" ); -continue ; - } - -switch (TEST_ERRNO ) { -case ENOSPC : -tst_resm (TPASS ,"expected failure - errno = " -"%d : %s" ,TEST_ERRNO ,strerror (TEST_ERRNO )); -break ; -default : -tst_resm (TFAIL ,"call failed with an " -"unexpected error - %d : %s" , -TEST_ERRNO ,strerror (TEST_ERRNO )); -break ; - } - } - -cleanup (); - -tst_exit (); +TST_EXP_FAIL (shmget (shmkey + maxshms,SHM_SIZE ,IPC_CREAT |IPC_EXCL |SHM_RW ),ENOSPC , +"shmget(%i, %i, %i)" , shmkey + maxshms,SHM_SIZE ,IPC_CREAT |IPC_EXCL |SHM_RW ); } -/* -* setup() - performs all the ONE TIME setup for this test. -*/ -void setup (void ) +static void setup (void ) { +int res, num; -tst_sig (NOFORK ,DEF_HANDLER , cleanup); + shmkey =GETIPCKEY (); -TEST_PAUSE ; +SAFE_FILE_SCANF ("/proc/sys/kernel/shmmni" ,"%i" , &maxshms); -/* -* Create a temporary directory and cd into it. -* This helps to ensure that a unique msgkey is created. -* See libs/libltpipc/libipc.c for more information. -*/ -tst_tmpdir (); - -/* get an IPC resource key */ - shmkey =getipckey (); - -/* -* Use a while loop to create the maximum number of memory segments. -* If the loop exceeds MAXIDS, then break the test and cleanup. -*/ -while ((shm_id_1 =shmget (IPC_PRIVATE ,SHM_SIZE ,IPC_CREAT | -IPC_EXCL |SHM_RW )) !=-1 ) { - shm_id_arr[num_shms++] = shm_id_1; -if (num_shms ==MAXIDS ) { -tst_brkm (TBROK , cleanup,"The maximum number of shared " -"memory ID's has been\n\t reached. Please " -"increase the MAXIDS value in the test." ); - } - } - -/* -* If the errno is other than ENOSPC, then something else is wrong. -*/ -if (errno !=ENOSPC ) { -tst_resm (TINFO ,"errno = %d : %s" , errno,strerror (errno)); -tst_brkm (TBROK , cleanup,"Didn't get ENOSPC in test setup" ); + queues =SAFE_MALLOC (maxshms *sizeof (int )); +for (num =0 ; num < maxshms; num++) { + queues[num] =-1 ; + res =shmget (shmkey + num,SHM_SIZE ,IPC_CREAT |IPC_EXCL |SHM_RW ); +if (res !=-1 ) + queues[num] = res; +else +tst_brk (TBROK |TERRNO ,"shmget failed unexpectedly" ); } +tst_res (TINFO ,"The maximum number of memory segments (%d) has been reached" , + maxshms); } -/* -* cleanup() - performs all the ONE TIME cleanup for this test at completion -* or premature exit. -*/ -void cleanup (void ) +static void cleanup (void ) { -int i; +int num; -/* remove the shared memory resources that were created */ -for (i =0 ; i < num_shms; i++) {
testcases/kernel/syscalls/ipc/shmget/shmget03.c line 65
Quoted 10 lines
testcases/kernel/syscalls/ipc/shmget/shmget03.c +6
-3-rm_shm (shm_id_arr[i]); - } +if (!queues) +return ; -tst_rmdir (); +for (num =0 ; num < maxshms; num++) { +if (queues[num] !=-1 ) +SAFE_SHMCTL (queues[num],IPC_RMID ,NULL ); + }
This is still not correct, we will pass random data to the SAFE_SHMCTL() in a case shmget() had failed before the loop in setup reached maximal value.
We have to maintain a global variable with the number of the ids in the queues[] array and only remove these that have been created.
for (i = 0; i < maxshms; i++) {
res = shmget(...);
if (res == -1)
tst_brk(TBROK...);
queues[queue_cnt++] = res;
}
for (i = 0; i < queue_cnt; i++)
SAFE_SHMCTL(queues[i], IPC_RMID);Quoted 220 lines
testcases/kernel/syscalls/ipc/shmget/shmget03.c +8
-0+free (queues); } + +static struct tst_test test = { + .needs_tmpdir =1 , + .setup = setup, + .cleanup = cleanup, + .test_all = verify_shmget, +};testcases/kernel/syscalls/ipc/shmget/shmget04.c +53
-135@@ -1,153 +1,71 @@ +// 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 +* Copyright (c) International Business Machines Corp., 2001 +* 03/2001 - Written by Wayne Boyer */ -/* -* NAME -* shmget04.c -* -* DESCRIPTION -* shmget04 - test for EACCES error -* -* ALGORITHM -* create a shared memory segment without read or write permissions -* loop if that option was specified -* call shmget() with SHM_RW flag using TEST() macro -* check the errno value -* issue a PASS message if we get EACCES -* otherwise, the tests fails -* issue a FAIL message -* call cleanup -* -* USAGE: <for command-line> -* shmget04 [-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. +/*\ +* [Description] * -* HISTORY -* 03/2001 - Written by Wayne Boyer +* Test for EACCES error. * -* RESTRICTIONS -* none +* Create a shared memory segment without read or write permissions under +* unpriviledged user and call shmget() with SHM_RD/SHM_WR/SHM_RW flag to +* trigger EACCES error. */ +#include <errno.h> +#include <sys/types.h> +#include <sys/ipc.h> +#include <stdlib.h> #include <pwd.h> -#include "ipcshm.h" - -char *TCID ="shmget04" ; -int TST_TOTAL =1 ; - -char nobody_uid[] ="nobody" ; -struct passwd *ltpuser; - -int shm_id_1 =-1 ; - -int main (int ac,char **av) +#include <sys/shm.h> +#include "tst_safe_sysv_ipc.h" +#include "tst_test.h" +#include "libnewipc.h" +#include "lapi/shm.h" + +static int shm_id =-1 ; +static key_t shmkey; +static struct tcase { +char *message; +int flag; +} tcases[] = { + {"Testing SHM_RD flag" ,SHM_RD }, + {"Testing SHM_WR flag" ,SHM_WR }, + {"Testing SHM_RW flag" ,SHM_RW }, +}; + +static void verify_shmget (unsigned int n) { -int lc; - -tst_parse_opts (ac, av,NULL ,NULL ); - -setup ();/* global setup */ - -/* The following loop checks looping state if -i option given */ - -for (lc =0 ;TEST_LOOPING (lc); lc++) { -/* reset tst_count in case we are looping */ - tst_count =0 ; +struct tcase *tc = &tcases[n]; -/* -* use the TEST() macro to make the call -*/ - -TEST (shmget (shmkey,SHM_SIZE ,SHM_RW )); - -if (TEST_RETURN !=-1 ) { -tst_resm (TFAIL ,"call succeeded when error expected" ); -continue ; - } - -switch (TEST_ERRNO ) { -case EACCES : -tst_resm (TPASS ,"expected failure - errno = " -"%d : %s" ,TEST_ERRNO ,strerror (TEST_ERRNO )); -break ; -default : -tst_resm (TFAIL ,"call failed with an " -"unexpected error - %d : %s" , -TEST_ERRNO ,strerror (TEST_ERRNO )); -break ; - } - } - -cleanup (); - -tst_exit (); +tst_res (TINFO ,"%s" , tc->message); +TST_EXP_FAIL (shmget (shmkey,SHM_SIZE , tc->flag),EACCES ,"shmget(%i, %i, %i)" , + shmkey,SHM_SIZE , tc->flag); } -/* -* setup() - performs all the ONE TIME setup for this test. -*/ -void setup (void ) +static void setup (void ) { -tst_require_root (); - -tst_sig (NOFORK ,DEF_HANDLER , cleanup); +struct passwd *pw; -TEST_PAUSE ; + pw =SAFE_GETPWNAM ("nobody" ); +SAFE_SETUID (pw->pw_uid); + shmkey =GETIPCKEY (); -/* Switch to nobody user for correct error code collection */ - ltpuser =getpwnam (nobody_uid); -if (setuid (ltpuser->pw_uid) ==-1 ) { -tst_resm (TINFO ,"setuid failed to " -"to set the effective uid to %d" , ltpuser->pw_uid); -perror ("setuid" ); - } - -/* -* Create a temporary directory and cd into it. -* This helps to ensure that a unique msgkey is created. -* See libs/libltpipc/libipc.c for more information. -*/ -tst_tmpdir (); - -/* get an IPC resource key */ - shmkey =getipckey (); - -/* create a shared memory segment without read or access permissions */ -if ((shm_id_1 =shmget (shmkey,SHM_SIZE ,IPC_CREAT |IPC_EXCL )) ==-1 ) { -tst_brkm (TBROK , cleanup,"Failed to create shared memory " -"segment in setup" ); - } + shm_id =SAFE_SHMGET (shmkey,SHM_SIZE ,IPC_CREAT |IPC_EXCL ); } -/* -* cleanup() - performs all the ONE TIME cleanup for this test at completion -* or premature exit. -*/ -void cleanup (void ) +static void cleanup (void ) { -/* if it exists, remove the shared memory resource */ -rm_shm (shm_id_1); - -tst_rmdir (); - +if (shm_id >=0 ) +SAFE_SHMCTL (shm_id,IPC_RMID ,NULL ); } + +static struct tst_test test = { + .needs_tmpdir =1 , + .needs_root =1 , + .setup = setup, + .cleanup = cleanup, + .test = verify_shmget, + .tcnt =ARRAY_SIZE (tcases), +};
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v2 1/1 syscalls/shmget*: Convert into new api
Hi Cyril
Quoted 159 lines
Hi!
Quoted 23 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c +5
-17+ +static struct tcase { + int *shmkey; + size_t size; int flags; -int error; -} TC[] = { -/* EINVAL - size is 0 */ - { - &shmkey2, 0, IPC_CREAT | IPC_EXCL | SHM_RW, EINVAL}, -/* EINVAL - size is negative */ -// {&shmkey2, -1, IPC_CREAT | IPC_EXCL | SHM_RW, EINVAL}, -/* EINVAL - size is larger than created segment */ - { - &shmkey, SHM_SIZE * 2, SHM_RW, EINVAL}, -/* EEXIST - the segment exists and IPC_CREAT | IPC_EXCL is given */ - { - &shmkey, SHM_SIZE, IPC_CREAT | IPC_EXCL | SHM_RW, EEXIST}, -/* ENOENT - no segment exists for the key and IPC_CREAT is not given */ -/* use shm_id_2 (-1) as the key */ - { - &shm_nonexisting_key, SHM_SIZE, SHM_RW, ENOENT} + /*1: nobody expected 0: root expected */testcases/kernel/syscalls/ipc/shmget/shmget02.c line 54
Quoted 10 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c +10
-0+int exp_user; +int exp_err; +} tcases[] = { + {&shmkey1, SHM_SIZE, IPC_EXCL, 0, ENOENT}, + {&shmkey, SHM_SIZE, IPC_CREAT | IPC_EXCL, 0, EEXIST}, + {&shmkey1, SHMMIN - 1, IPC_CREAT | IPC_EXCL, 0, EINVAL}, + {&shmkey1, SHMMAX + 1, IPC_CREAT | IPC_EXCL, 0, EINVAL}, + {&shmkey, SHM_SIZE * 2, IPC_EXCL, 0, EINVAL}, + {&shmkey, SHM_SIZE, SHM_RD, 1, EACCES}, + {&shmkey1, SHM_SIZE, IPC_CREAT | SHM_HUGETLB, 1, EPERM}This case is a bit more complicated, on my test machine with
nr_hugepages== 0 I get ENOMEM, since there are no hugepages allocated in the pool.When I add .request_hugepages = 1, the the
tst_teststructure, the hugepage pool size is increased by the test library and this request succeds and creates a SHM segment. See description below on how this has to be fixed.Quoted 93 lines
};testcases/kernel/syscalls/ipc/shmget/shmget02.c +18
-65-int main (int ac,char **av) +static void do_test (unsigned int n) { -int lc; -int i; - -tst_parse_opts (ac, av,NULL ,NULL ); - -setup ();/* global setup */ - -/* The following loop checks looping state if -i option given */ - -for (lc =0 ;TEST_LOOPING (lc); lc++) { -/* reset tst_count in case we are looping */ - tst_count =0 ; +struct tcase *tc =&tcases[n]; +pid_t pid; -/* loop through the test cases */ -for (i =0 ; i<TST_TOTAL ; i++) { -/* -* Look for a failure ... -*/ - -TEST (shmget (*(TC [i].skey),TC [i].size,TC [i].flags)); - -if (TEST_RETURN !=-1 ) { -tst_resm (TFAIL ,"call succeeded unexpectedly" ); -continue ; - } - -if (TEST_ERRNO ==TC [i].error) { -tst_resm (TPASS ,"expected failure - errno = " -"%d : %s" ,TEST_ERRNO , -strerror (TEST_ERRNO )); - }else { -tst_resm (TFAIL ,"call failed with an " -"unexpected error - %d : %s" , -TEST_ERRNO ,strerror (TEST_ERRNO )); - } - } +if (tc->exp_user ==0 ) { +TST_EXP_FAIL (shmget (*tc->shmkey, tc->size, tc->flags), tc->exp_err, +"shmget(%i, %lu, %i)" , *tc->shmkey, tc->size, tc->flags); +return ; } -cleanup (); - -tst_exit (); + pid =SAFE_FORK (); +if (pid ==0 ) { +SAFE_SETUID (pw->pw_uid); +TST_EXP_FAIL (shmget (*tc->shmkey, tc->size, tc->flags), tc->exp_err, +"shmget(%i, %lu, %i)" , *tc->shmkey, tc->size, tc->flags); +exit (0 ); + } +tst_reap_children (); } -/* -* setup() - performs all the ONE TIME setup for this test. -*/ -void setup (void ) +static void setup (void ) { + shmkey =GETIPCKEY (); + shmkey1 =GETIPCKEY (); -tst_sig (NOFORK ,DEF_HANDLER , cleanup); - -TEST_PAUSE ; - -/* -* Create a temporary directory and cd into it. -* This helps to ensure that a unique msgkey is created. -* See libs/libltpipc/libipc.c for more information. -*/ -tst_tmpdir (); - -/* get an IPC resource key */ - shmkey =getipckey (); - -/* Get an new IPC resource key. */ - shmkey2 =getipckey (); - -if ((shm_id_1 =shmget (shmkey,SHM_SIZE ,IPC_CREAT |IPC_EXCL | -SHM_RW )) ==-1 ) { -tst_brkm (TBROK , cleanup,"couldn't create shared memory " -"segment in setup()" ); - }testcases/kernel/syscalls/ipc/shmget/shmget02.c line 83
Quoted 10 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c +1
-9- -/* Make sure shm_nonexisting_key is a nonexisting key */ -while (1 ) { -while (-1 !=shmget (shm_nonexisting_key,1 ,SHM_RD )) { - shm_nonexisting_key--; - } -if (errno ==ENOENT ) -break ; - } +SAFE_FILE_PRINTF ("/proc/sys/vm/hugetlb_shm_group" ,"1" );There is no need to change the default hugetlb group, all that has to be done is to strip the user of all groups as well as there is absolutely no guarantee that group 1 will not be in the list of supplementary groups for a root users.
So when we change uid we as well have to do:
setgroups(0, NULL); SAFE_SETGID(pw->pw_gid); SAFE_SETUID(pw->pw_uid);
Quoted 6 lines
This will strip the process of all additional permissions that may have been passed down by the process running under root.
Also ideally we should add
SAFE_SETGROUPS()to the test library in a separate patch so that we can make use of it here.
Yes, your are right. my origial way is to set 1 and it doesn't work on your envrionment, so it doesn't meet EPERM error and meet the ENOMEM error in kernel hugetlb_file_setup function.
I have check the kernel code, it used in_group_p function to check whether have read access. So using setgroups(0, NULL) is right. Thanks.
Also, I add a ENOMEM test error test.
Quoted 257 lines
Quoted 243 lines
testcases/kernel/syscalls/ipc/shmget/shmget02.c +19
-10+ shm_id =SAFE_SHMGET (shmkey,SHM_SIZE ,IPC_CREAT |IPC_EXCL ); + pw =SAFE_GETPWNAM ("nobody" ); } -/* -* cleanup() - performs all the ONE TIME cleanup for this test at completion -* or premature exit. -*/ -void cleanup (void ) +static void cleanup (void ) { -/* if it exists, remove the shared memory resource */ -rm_shm (shm_id_1); - -tst_rmdir (); - +if (shm_id>=0 ) +SAFE_SHMCTL (shm_id,IPC_RMID ,NULL ); } + +static struct tst_test test = { + .needs_tmpdir =1 , + .needs_root =1 , + .forks_child =1 , + .setup = setup, + .cleanup = cleanup, + .test = do_test, + .tcnt =ARRAY_SIZE (tcases), + .save_restore = (const char *const []) { +"?/proc/sys/vm/hugetlb_shm_group" , +NULL , + } +};testcases/kernel/syscalls/ipc/shmget/shmget03.c +40
-147@@ -1,171 +1,75 @@ +// 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 +* Copyright (c) International Business Machines Corp., 2001 +* 03/2001 - Written by Wayne Boyer */ -/* -* NAME -* shmget03.c +/*\ +* [Description] * -* DESCRIPTION -* shmget03 - test for ENOSPC error +* Test for ENOSPC error. * -* ALGORITHM -* create shared memory segments in a loop until reaching the system limit -* loop if that option was specified -* attempt to create yet another shared memory segment -* check the errno value -* issue a PASS message if we get ENOSPC -* otherwise, the tests fails -* issue a FAIL message -* call cleanup -* -* USAGE:<for command-line> -* shmget03 [-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. -* -* HISTORY -* 03/2001 - Written by Wayne Boyer -* -* RESTRICTIONS -* none +* ENOSPC - All possible shared memory segments have been taken (SHMMNI). */ - -#include "ipcshm.h" - -char *TCID ="shmget03" ; -int TST_TOTAL =1 ; - -/* -* The MAXIDS value is somewhat arbitrary and may need to be increased -* depending on the system being tested. -*/ -#define MAXIDS 8192 - -int shm_id_1 =-1 ; -int num_shms =0 ; - -int shm_id_arr[MAXIDS ]; - -int main (int ac,char **av) +#include <errno.h> +#include <sys/types.h> +#include <sys/ipc.h> +#include <stdlib.h> +#include <pwd.h> +#include <sys/shm.h> +#include "tst_test.h" +#include "tst_safe_sysv_ipc.h" +#include "libnewipc.h" + +static int *queues; +static int maxshms; +static key_t shmkey; + +static void verify_shmget (void ) { -int lc; - -tst_parse_opts (ac, av,NULL ,NULL ); - -setup ();/* global setup */ - -/* The following loop checks looping state if -i option given */ - -for (lc =0 ;TEST_LOOPING (lc); lc++) { -/* reset tst_count in case we are looping */ - tst_count =0 ; - -/* -* use the TEST() macro to make the call -*/ - -TEST (shmget (IPC_PRIVATE ,SHM_SIZE ,IPC_CREAT |IPC_EXCL - |SHM_RW )); - -if (TEST_RETURN !=-1 ) { -tst_resm (TFAIL ,"call succeeded when error expected" ); -continue ; - } - -switch (TEST_ERRNO ) { -case ENOSPC : -tst_resm (TPASS ,"expected failure - errno = " -"%d : %s" ,TEST_ERRNO ,strerror (TEST_ERRNO )); -break ; -default : -tst_resm (TFAIL ,"call failed with an " -"unexpected error - %d : %s" , -TEST_ERRNO ,strerror (TEST_ERRNO )); -break ; - } - } - -cleanup (); - -tst_exit (); +TST_EXP_FAIL (shmget (shmkey + maxshms,SHM_SIZE ,IPC_CREAT |IPC_EXCL |SHM_RW ),ENOSPC , +"shmget(%i, %i, %i)" , shmkey + maxshms,SHM_SIZE ,IPC_CREAT |IPC_EXCL |SHM_RW ); } -/* -* setup() - performs all the ONE TIME setup for this test. -*/ -void setup (void ) +static void setup (void ) { +int res, num; -tst_sig (NOFORK ,DEF_HANDLER , cleanup); + shmkey =GETIPCKEY (); -TEST_PAUSE ; +SAFE_FILE_SCANF ("/proc/sys/kernel/shmmni" ,"%i" ,&maxshms); -/* -* Create a temporary directory and cd into it. -* This helps to ensure that a unique msgkey is created. -* See libs/libltpipc/libipc.c for more information. -*/ -tst_tmpdir (); - -/* get an IPC resource key */ - shmkey =getipckey (); - -/* -* Use a while loop to create the maximum number of memory segments. -* If the loop exceeds MAXIDS, then break the test and cleanup. -*/ -while ((shm_id_1 =shmget (IPC_PRIVATE ,SHM_SIZE ,IPC_CREAT | -IPC_EXCL |SHM_RW )) !=-1 ) { - shm_id_arr[num_shms++] = shm_id_1; -if (num_shms ==MAXIDS ) { -tst_brkm (TBROK , cleanup,"The maximum number of shared " -"memory ID's has been\n\t reached. Please " -"increase the MAXIDS value in the test." ); - } - } - -/* -* If the errno is other than ENOSPC, then something else is wrong. -*/ -if (errno !=ENOSPC ) { -tst_resm (TINFO ,"errno = %d : %s" , errno,strerror (errno)); -tst_brkm (TBROK , cleanup,"Didn't get ENOSPC in test setup" ); + queues =SAFE_MALLOC (maxshms *sizeof (int )); +for (num =0 ; num< maxshms; num++) { + queues[num] =-1 ; + res =shmget (shmkey + num,SHM_SIZE ,IPC_CREAT |IPC_EXCL |SHM_RW ); +if (res !=-1 ) + queues[num] = res; +else +tst_brk (TBROK |TERRNO ,"shmget failed unexpectedly" ); } +tst_res (TINFO ,"The maximum number of memory segments (%d) has been reached" , + maxshms); } -/* -* cleanup() - performs all the ONE TIME cleanup for this test at completion -* or premature exit. -*/ -void cleanup (void ) +static void cleanup (void ) { -int i; +int num; -/* remove the shared memory resources that were created */ -for (i =0 ; i< num_shms; i++) {testcases/kernel/syscalls/ipc/shmget/shmget03.c line 65
Quoted 10 lines
testcases/kernel/syscalls/ipc/shmget/shmget03.c +6
-3-rm_shm (shm_id_arr[i]); - } +if (!queues) +return ; -tst_rmdir (); +for (num =0 ; num< maxshms; num++) { +if (queues[num] !=-1 ) +SAFE_SHMCTL (queues[num],IPC_RMID ,NULL ); + }This is still not correct, we will pass random data to the
SAFE_SHMCTL()in a caseshmget()had failed before the loop in setup reached maximal value.
Quoted 2 lines
We have to maintain a global variable with the number of the ids in the queues[] array and only remove these that have been created.
Yes, I have added a global count.
Best Regards
Yang Xu
Quoted 237 lines
for (i = 0; i< maxshms; i++) { res = shmget(...); if (res == -1) tst_brk(TBROK...); queues[queue_cnt++] = res; } for (i = 0; i< queue_cnt; i++) SAFE_SHMCTL(queues[i], IPC_RMID);Quoted 221 lines
testcases/kernel/syscalls/ipc/shmget/shmget03.c +8
-0+free (queues); } + +static struct tst_test test = { + .needs_tmpdir =1 , + .setup = setup, + .cleanup = cleanup, + .test_all = verify_shmget, +};testcases/kernel/syscalls/ipc/shmget/shmget04.c +53
-135@@ -1,153 +1,71 @@ +// 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 +* Copyright (c) International Business Machines Corp., 2001 +* 03/2001 - Written by Wayne Boyer */ -/* -* NAME -* shmget04.c -* -* DESCRIPTION -* shmget04 - test for EACCES error -* -* ALGORITHM -* create a shared memory segment without read or write permissions -* loop if that option was specified -* call shmget() with SHM_RW flag using TEST() macro -* check the errno value -* issue a PASS message if we get EACCES -* otherwise, the tests fails -* issue a FAIL message -* call cleanup -* -* USAGE:<for command-line> -* shmget04 [-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. +/*\ +* [Description] * -* HISTORY -* 03/2001 - Written by Wayne Boyer +* Test for EACCES error. * -* RESTRICTIONS -* none +* Create a shared memory segment without read or write permissions under +* unpriviledged user and call shmget() with SHM_RD/SHM_WR/SHM_RW flag to +* trigger EACCES error. */ +#include <errno.h> +#include <sys/types.h> +#include <sys/ipc.h> +#include <stdlib.h> #include <pwd.h> -#include "ipcshm.h" - -char *TCID ="shmget04" ; -int TST_TOTAL =1 ; - -char nobody_uid[] ="nobody" ; -struct passwd *ltpuser; - -int shm_id_1 =-1 ; - -int main (int ac,char **av) +#include <sys/shm.h> +#include "tst_safe_sysv_ipc.h" +#include "tst_test.h" +#include "libnewipc.h" +#include "lapi/shm.h" + +static int shm_id =-1 ; +static key_t shmkey; +static struct tcase { +char *message; +int flag; +} tcases[] = { + {"Testing SHM_RD flag" ,SHM_RD }, + {"Testing SHM_WR flag" ,SHM_WR }, + {"Testing SHM_RW flag" ,SHM_RW }, +}; + +static void verify_shmget (unsigned int n) { -int lc; - -tst_parse_opts (ac, av,NULL ,NULL ); - -setup ();/* global setup */ - -/* The following loop checks looping state if -i option given */ - -for (lc =0 ;TEST_LOOPING (lc); lc++) { -/* reset tst_count in case we are looping */ - tst_count =0 ; +struct tcase *tc =&tcases[n]; -/* -* use the TEST() macro to make the call -*/ - -TEST (shmget (shmkey,SHM_SIZE ,SHM_RW )); - -if (TEST_RETURN !=-1 ) { -tst_resm (TFAIL ,"call succeeded when error expected" ); -continue ; - } - -switch (TEST_ERRNO ) { -case EACCES : -tst_resm (TPASS ,"expected failure - errno = " -"%d : %s" ,TEST_ERRNO ,strerror (TEST_ERRNO )); -break ; -default : -tst_resm (TFAIL ,"call failed with an " -"unexpected error - %d : %s" , -TEST_ERRNO ,strerror (TEST_ERRNO )); -break ; - } - } - -cleanup (); - -tst_exit (); +tst_res (TINFO ,"%s" , tc->message); +TST_EXP_FAIL (shmget (shmkey,SHM_SIZE , tc->flag),EACCES ,"shmget(%i, %i, %i)" , + shmkey,SHM_SIZE , tc->flag); } -/* -* setup() - performs all the ONE TIME setup for this test. -*/ -void setup (void ) +static void setup (void ) { -tst_require_root (); - -tst_sig (NOFORK ,DEF_HANDLER , cleanup); +struct passwd *pw; -TEST_PAUSE ; + pw =SAFE_GETPWNAM ("nobody" ); +SAFE_SETUID (pw->pw_uid); + shmkey =GETIPCKEY (); -/* Switch to nobody user for correct error code collection */ - ltpuser =getpwnam (nobody_uid); -if (setuid (ltpuser->pw_uid) ==-1 ) { -tst_resm (TINFO ,"setuid failed to " -"to set the effective uid to %d" , ltpuser->pw_uid); -perror ("setuid" ); - } - -/* -* Create a temporary directory and cd into it. -* This helps to ensure that a unique msgkey is created. -* See libs/libltpipc/libipc.c for more information. -*/ -tst_tmpdir (); - -/* get an IPC resource key */ - shmkey =getipckey (); - -/* create a shared memory segment without read or access permissions */ -if ((shm_id_1 =shmget (shmkey,SHM_SIZE ,IPC_CREAT |IPC_EXCL )) ==-1 ) { -tst_brkm (TBROK , cleanup,"Failed to create shared memory " -"segment in setup" ); - } + shm_id =SAFE_SHMGET (shmkey,SHM_SIZE ,IPC_CREAT |IPC_EXCL ); } -/* -* cleanup() - performs all the ONE TIME cleanup for this test at completion -* or premature exit. -*/ -void cleanup (void ) +static void cleanup (void ) { -/* if it exists, remove the shared memory resource */ -rm_shm (shm_id_1); - -tst_rmdir (); - +if (shm_id>=0 ) +SAFE_SHMCTL (shm_id,IPC_RMID ,NULL ); } + +static struct tst_test test = { + .needs_tmpdir =1 , + .needs_root =1 , + .setup = setup, + .cleanup = cleanup, + .test = verify_shmget, + .tcnt =ARRAY_SIZE (tcases), +};
PATCH 3/4 syscalls/shmget05: Add test for /proc/sys/kernel/shm_next_id
In reply to Yang XuThis case is similar to msgget04.c.
--- runtest/syscalls | 1 + runtest/syscalls-ipc | 1 + .../kernel/syscalls/ipc/shmget/.gitignore | 1 + .../kernel/syscalls/ipc/shmget/shmget05.c | 69 +++++++++++++++++++ 4 files changed, 72 insertions(+) create mode 100644 testcases/kernel/syscalls/ipc/shmget/shmget05.c
runtest/syscalls +1 -0
@@ -1402,6 +1402,7 @@ shmdt02 shmdt02 shmget02 shmget02 shmget03 shmget03 shmget04 shmget04 +shmget05 shmget05 sigaction01 sigaction01 sigaction02 sigaction02
runtest/syscalls-ipc +1 -0
@@ -67,3 +67,4 @@ shmdt02 shmdt02 shmget02 shmget02 shmget03 shmget03 shmget04 shmget04 +shmget05 shmget05
testcases/kernel/syscalls/ipc/shmget/.gitignore +1 -0
@@ -1,3 +1,4 @@ /shmget02 /shmget03 /shmget04 +/shmget05
testcases/kernel/syscalls/ipc/shmget/shmget05.c new file +69 -0
69 lines not on this page · raw message
Signature · 1 line
2.23.0
PATCH 3/4 syscalls/shmget05: Add test for /proc/sys/kernel/shm_next_id
Hi Cyril
Since the previous patches have been merged, this patch can be continued.
Best Regards
Yang Xu
Quoted 116 lines
This case is similar to
msgget04.c.Signed-off-by Yang Xu<[email protected]>--- runtest/syscalls | 1 + runtest/syscalls-ipc | 1 + .../kernel/syscalls/ipc/shmget/.gitignore | 1 + .../kernel/syscalls/ipc/shmget/shmget05.c | 69 +++++++++++++++++++ 4 files changed, 72 insertions(+)create mode 100644
testcases/kernel/syscalls/ipc/shmget/shmget05.cruntest/syscalls +1
-0@@ -1402,6 +1402,7 @@ shmdt02 shmdt02 shmget02 shmget02 shmget03 shmget03 shmget04 shmget04 +shmget05 shmget05 sigaction01 sigaction01 sigaction02 sigaction02runtest/syscalls-ipc +1
-0@@ -67,3 +67,4 @@ shmdt02 shmdt02 shmget02 shmget02 shmget03 shmget03 shmget04 shmget04 +shmget05 shmget05testcases/kernel/syscalls/ipc/shmget/.gitignore +1
-0@@ -1,3 +1,4 @@ /shmget02 /shmget03 /shmget04 +/shmget05testcases/kernel/syscalls/ipc/shmget/shmget05.c new file +69
-0@@ -0,0 +1,69 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2021 FUJITSU LIMITED. All rights reserved. +* Author: Yang Xu<[email protected]> +*/ + +/*\ +* [Description] +* +* It is a basic test about shm_next_id. +* +* shm_next_id specifies desired id for next allocated IPC shared memory. By +* default they are equal to -1, which means generic allocation logic. +* Possible values to set are in range {0..INT_MAX}. +* Toggle with non-default value will be set back to -1 by kernel after +* successful IPC object allocation. +*/ + +#include <errno.h> +#include <string.h> +#include <sys/types.h> +#include <sys/ipc.h> +#include <sys/shm.h> +#include "tst_test.h" +#include "tst_safe_sysv_ipc.h" +#include "libnewipc.h" + +#define NEXT_ID_PATH "/proc/sys/kernel/shm_next_id" +static int shm_id, pid; +static key_t shmkey; + +static void verify_shmget (void ) +{ +SAFE_FILE_PRINTF (NEXT_ID_PATH ,"%d" , pid); + + shm_id =SAFE_SHMGET (shmkey,SHM_SIZE ,SHM_RW |IPC_CREAT ); +if (shm_id == pid) +tst_res (TPASS ,"shm_next_id succeeded, shm id %d" , pid); +else +tst_res (TFAIL ,"shm_next_id failed, expected id %d, but got %d" , pid, shm_id); + +TST_ASSERT_INT (NEXT_ID_PATH ,-1 ); +SAFE_SHMCTL (shm_id,IPC_RMID ,NULL ); + pid++; +} + +static void setup (void ) +{ + shmkey =GETIPCKEY (); + pid =getpid (); +} + +static void cleanup (void ) +{ +if (shm_id !=-1 ) +SAFE_SHMCTL (shm_id,IPC_RMID ,NULL ); +} + +static struct tst_test test = { + .needs_tmpdir =1 , + .setup = setup, + .cleanup = cleanup, + .test_all = verify_shmget, + .needs_kconfigs = (const char *[]) { +"CONFIG_CHECKPOINT_RESTORE=y" , +NULL + }, + .needs_root =1 , +};
PATCH 3/4 syscalls/shmget05: Add test for /proc/sys/kernel/shm_next_id
Hi
Ping.
ps:On lastest ltp, this patch still can be merged without rebase.
Best Regards
Yang Xu
Quoted 123 lines
Hi Cyril
Since the previous patches have been merged, this patch can be continued.
Best Regards
Yang XuQuoted 116 lines
This case is similar to
msgget04.c.Signed-off-by Yang Xu<[email protected]>--- runtest/syscalls | 1 + runtest/syscalls-ipc | 1 + .../kernel/syscalls/ipc/shmget/.gitignore | 1 + .../kernel/syscalls/ipc/shmget/shmget05.c | 69 +++++++++++++++++++ 4 files changed, 72 insertions(+)create mode 100644
testcases/kernel/syscalls/ipc/shmget/shmget05.cruntest/syscalls +1
-0@@ -1402,6 +1402,7 @@ shmdt02 shmdt02 shmget02 shmget02 shmget03 shmget03 shmget04 shmget04 +shmget05 shmget05 sigaction01 sigaction01 sigaction02 sigaction02runtest/syscalls-ipc +1
-0@@ -67,3 +67,4 @@ shmdt02 shmdt02 shmget02 shmget02 shmget03 shmget03 shmget04 shmget04 +shmget05 shmget05testcases/kernel/syscalls/ipc/shmget/.gitignore +1
-0@@ -1,3 +1,4 @@ /shmget02 /shmget03 /shmget04 +/shmget05testcases/kernel/syscalls/ipc/shmget/shmget05.c new file +69
-0@@ -0,0 +1,69 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2021 FUJITSU LIMITED. All rights reserved. +* Author: Yang Xu<[email protected]> +*/ + +/*\ +* [Description] +* +* It is a basic test about shm_next_id. +* +* shm_next_id specifies desired id for next allocated IPC shared memory. By +* default they are equal to -1, which means generic allocation logic. +* Possible values to set are in range {0..INT_MAX}. +* Toggle with non-default value will be set back to -1 by kernel after +* successful IPC object allocation. +*/ + +#include <errno.h> +#include <string.h> +#include <sys/types.h> +#include <sys/ipc.h> +#include <sys/shm.h> +#include "tst_test.h" +#include "tst_safe_sysv_ipc.h" +#include "libnewipc.h" + +#define NEXT_ID_PATH "/proc/sys/kernel/shm_next_id" +static int shm_id, pid; +static key_t shmkey; + +static void verify_shmget (void ) +{ +SAFE_FILE_PRINTF (NEXT_ID_PATH ,"%d" , pid); + + shm_id =SAFE_SHMGET (shmkey,SHM_SIZE ,SHM_RW |IPC_CREAT ); +if (shm_id == pid) +tst_res (TPASS ,"shm_next_id succeeded, shm id %d" , pid); +else +tst_res (TFAIL ,"shm_next_id failed, expected id %d, but got %d" , pid, shm_id); + +TST_ASSERT_INT (NEXT_ID_PATH ,-1 ); +SAFE_SHMCTL (shm_id,IPC_RMID ,NULL ); + pid++; +} + +static void setup (void ) +{ + shmkey =GETIPCKEY (); + pid =getpid (); +} + +static void cleanup (void ) +{ +if (shm_id !=-1 ) +SAFE_SHMCTL (shm_id,IPC_RMID ,NULL ); +} + +static struct tst_test test = { + .needs_tmpdir =1 , + .setup = setup, + .cleanup = cleanup, + .test_all = verify_shmget, + .needs_kconfigs = (const char *[]) { +"CONFIG_CHECKPOINT_RESTORE=y" , +NULL + }, + .needs_root =1 , +};
PATCH 3/4 syscalls/shmget05: Add test for /proc/sys/kernel/shm_next_id
In reply to Yang XuHi!
First of all, sorry for the late response.
Quoted 6 lines
testcases/kernel/syscalls/ipc/shmget/shmget05.c new file +0
-0
testcases/kernel/syscalls/ipc/shmget/shmget05.c line 10
Quoted 10 lines
testcases/kernel/syscalls/ipc/shmget/shmget05.c new file +10
-0@@ -0,0 +1,69 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2021 FUJITSU LIMITED. All rights reserved. +* Author: Yang Xu <[email protected]> +*/ + +/*\ +* [Description] +* +* It is a basic test about shm_next_id.
^ for
testcases/kernel/syscalls/ipc/shmget/shmget05.c line 13
Quoted 3 lines
testcases/kernel/syscalls/ipc/shmget/shmget05.c new file +3
-0+* +* shm_next_id specifies desired id for next allocated IPC shared memory. By +* default they are equal to -1, which means generic allocation logic.
^
it's instead of 'they are'
testcases/kernel/syscalls/ipc/shmget/shmget05.c line 15
Quoted 2 lines
testcases/kernel/syscalls/ipc/shmget/shmget05.c new file +2
-0+* Possible values to set are in range {0..INT_MAX}. +* Toggle with non-default value will be set back to -1 by kernel after
This would probably be better with just: "The value will be set back ..."
Quoted 35 lines
testcases/kernel/syscalls/ipc/shmget/shmget05.c new file +35
-0+* successful IPC object allocation. +*/ + +#include <errno.h> +#include <string.h> +#include <sys/types.h> +#include <sys/ipc.h> +#include <sys/shm.h> +#include "tst_test.h" +#include "tst_safe_sysv_ipc.h" +#include "libnewipc.h" + +#define NEXT_ID_PATH "/proc/sys/kernel/shm_next_id" +static int shm_id, pid; +static key_t shmkey; + +static void verify_shmget (void ) +{ +SAFE_FILE_PRINTF (NEXT_ID_PATH ,"%d" , pid); + + shm_id =SAFE_SHMGET (shmkey,SHM_SIZE ,SHM_RW |IPC_CREAT ); +if (shm_id == pid) +tst_res (TPASS ,"shm_next_id succeeded, shm id %d" , pid); +else +tst_res (TFAIL ,"shm_next_id failed, expected id %d, but got %d" , pid, shm_id); + +TST_ASSERT_INT (NEXT_ID_PATH ,-1 ); +SAFE_SHMCTL (shm_id,IPC_RMID ,NULL ); + pid++; +} + +static void setup (void ) +{ + shmkey =GETIPCKEY (); + pid =getpid ();
testcases/kernel/syscalls/ipc/shmget/shmget05.c line 60
Quoted 10 lines
testcases/kernel/syscalls/ipc/shmget/shmget05.c new file +10
-0+} + +static void cleanup (void ) +{ +if (shm_id !=-1 ) +SAFE_SHMCTL (shm_id,IPC_RMID ,NULL ); +} + +static struct tst_test test = { + .needs_tmpdir =1 ,
I guess that we want this for the GETIPCKEY() right?
testcases/kernel/syscalls/ipc/shmget/shmget05.c line 69
Quoted 9 lines
testcases/kernel/syscalls/ipc/shmget/shmget05.c new file +9
-0+ .setup = setup, + .cleanup = cleanup, + .test_all = verify_shmget, + .needs_kconfigs = (const char *[]) { +"CONFIG_CHECKPOINT_RESTORE=y" , +NULL + }, + .needs_root = 1, +};
Looks good.
With the minor adjustements in the test description:
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH 3/4 syscalls/shmget05: Add test for /proc/sys/kernel/shm_next_id
Hi Cyril
Quoted 70 lines
Hi!
First of all, sorry for the late response.Quoted 6 lines
testcases/kernel/syscalls/ipc/shmget/shmget05.c new file +0
-0testcases/kernel/syscalls/ipc/shmget/shmget05.c line 10
Quoted 10 lines
testcases/kernel/syscalls/ipc/shmget/shmget05.c new file +10
-0@@ -0,0 +1,69 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2021 FUJITSU LIMITED. All rights reserved. +* Author: Yang Xu<[email protected]> +*/ + +/*\ +* [Description] +* +* It is a basic test about shm_next_id. ^ fortestcases/kernel/syscalls/ipc/shmget/shmget05.c line 13
Quoted 3 lines
testcases/kernel/syscalls/ipc/shmget/shmget05.c new file +3
-0+* +* shm_next_id specifies desired id for next allocated IPC shared memory. By +* default they are equal to -1, which means generic allocation logic. ^
it's instead of 'they are'testcases/kernel/syscalls/ipc/shmget/shmget05.c line 15
Quoted 2 lines
testcases/kernel/syscalls/ipc/shmget/shmget05.c new file +2
-0+* Possible values to set are in range {0..INT_MAX}. +* Toggle with non-default value will be set back to -1 by kernel after This would probably be better with just: "The value will be set back ..."
Quoted 39 lines
testcases/kernel/syscalls/ipc/shmget/shmget05.c new file +39
-0+* successful IPC object allocation. +*/ + +#include <errno.h> +#include <string.h> +#include <sys/types.h> +#include <sys/ipc.h> +#include <sys/shm.h> +#include "tst_test.h" +#include "tst_safe_sysv_ipc.h" +#include "libnewipc.h" + +#define NEXT_ID_PATH "/proc/sys/kernel/shm_next_id" +static int shm_id, pid; +static key_t shmkey; + +static void verify_shmget (void ) +{ +SAFE_FILE_PRINTF (NEXT_ID_PATH ,"%d" , pid); + + shm_id =SAFE_SHMGET (shmkey,SHM_SIZE ,SHM_RW |IPC_CREAT ); +if (shm_id == pid) +tst_res (TPASS ,"shm_next_id succeeded, shm id %d" , pid); +else +tst_res (TFAIL ,"shm_next_id failed, expected id %d, but got %d" , pid, shm_id); + +TST_ASSERT_INT (NEXT_ID_PATH ,-1 ); +SAFE_SHMCTL (shm_id,IPC_RMID ,NULL ); + pid++; +} + +static void setup (void ) +{ + shmkey =GETIPCKEY (); + pid =getpid (); +} + +static void cleanup (void ) +{
Quoted 9 lines
testcases/kernel/syscalls/ipc/shmget/shmget05.c line 60
Quoted 6 lines
testcases/kernel/syscalls/ipc/shmget/shmget05.c new file +6
-0+if (shm_id !=-1 ) +SAFE_SHMCTL (shm_id,IPC_RMID ,NULL ); +} + +static struct tst_test test = { + .needs_tmpdir =1 ,I guess that we want this for the
GETIPCKEY()right?
Yes.
Quoted 12 lines
testcases/kernel/syscalls/ipc/shmget/shmget05.c line 69
Quoted 9 lines
testcases/kernel/syscalls/ipc/shmget/shmget05.c new file +9
-0+ .setup = setup, + .cleanup = cleanup, + .test_all = verify_shmget, + .needs_kconfigs = (const char *[]) { +"CONFIG_CHECKPOINT_RESTORE=y" , +NULL + }, + .needs_root = 1, +};Looks good.
Quoted 3 lines
With the minor adjustements in the test description:
Reviewed-by Cyril Hrubis<[email protected]>
Thanks for your review. Will send v2.
Quoted 1 line
PATCH 4/4 syscalls/shmget06: Add test when the id of shm_next_id has existed
In reply to Yang XuWhen the identifier of the System V shared memory segment that shm_next_id has existed, shmget() with different key will return the another shm id. But kernel doesn't guarantee desired id, I just compare with existed id, if not equal, the test succeeded.
This case is similar to msgget05.c.
--- runtest/syscalls | 1 + runtest/syscalls-ipc | 1 + .../kernel/syscalls/ipc/shmget/.gitignore | 1 + .../kernel/syscalls/ipc/shmget/shmget06.c | 77 +++++++++++++++++++ 4 files changed, 80 insertions(+) create mode 100644 testcases/kernel/syscalls/ipc/shmget/shmget06.c
runtest/syscalls +1 -0
@@ -1403,6 +1403,7 @@ shmget02 shmget02 shmget03 shmget03 shmget04 shmget04 shmget05 shmget05 +shmget06 shmget06 sigaction01 sigaction01 sigaction02 sigaction02
runtest/syscalls-ipc +1 -0
@@ -68,3 +68,4 @@ shmget02 shmget02 shmget03 shmget03 shmget04 shmget04 shmget05 shmget05 +shmget06 shmget06
testcases/kernel/syscalls/ipc/shmget/.gitignore +1 -0
@@ -2,3 +2,4 @@ /shmget03 /shmget04 /shmget05 +/shmget06
testcases/kernel/syscalls/ipc/shmget/shmget06.c new file +77 -0
77 lines not on this page · raw message
Signature · 1 line
2.23.0
PATCH 4/4 syscalls/shmget06: Add test when the id of shm_next_id has existed
Hi!
Quoted 6 lines
testcases/kernel/syscalls/ipc/shmget/shmget06.c new file +0
-0
testcases/kernel/syscalls/ipc/shmget/shmget06.c line 10
Quoted 10 lines
testcases/kernel/syscalls/ipc/shmget/shmget06.c new file +10
-0@@ -0,0 +1,77 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2021 FUJITSU LIMITED. All rights reserved. +* Author: Yang Xu <[email protected]> +*/ + +/*\ +* [Description] +* +* It is a basic test about shm_next_id.
^ for
testcases/kernel/syscalls/ipc/shmget/shmget06.c line 13
Quoted 3 lines
testcases/kernel/syscalls/ipc/shmget/shmget06.c new file +3
-0+* +* When the shared memory segment identifier that shm_next_id stored has +* existed, call shmget with different key just use another unused value in range
^ ^
'does exist' instead of 'has existed' |
or even better 'is allready in use' |will
testcases/kernel/syscalls/ipc/shmget/shmget06.c line 14
Quoted 1 line
testcases/kernel/syscalls/ipc/shmget/shmget06.c new file +1
-0+* [0,INT_MAX]. kernel doesn't guarantee the desired id.
^
Capital letter at the start of the sentence.
Quoted 27 lines
testcases/kernel/syscalls/ipc/shmget/shmget06.c new file +27
-0+*/ + +#include <errno.h> +#include <string.h> +#include <sys/types.h> +#include <sys/ipc.h> +#include <sys/shm.h> +#include "tst_test.h" +#include "tst_safe_sysv_ipc.h" +#include "libnewipc.h" + +#define NEXT_ID_PATH "/proc/sys/kernel/shm_next_id" + +static int shm_id[2 ], pid; +static key_t shmkey[2 ]; + +static void verify_shmget (void ) +{ +SAFE_FILE_PRINTF (NEXT_ID_PATH ,"%d" , shm_id[0 ]); + + shm_id[1 ] =SAFE_SHMGET (shmkey[1 ],SHM_SIZE ,IPC_CREAT |SHM_RW ); +if (shm_id[1 ] == shm_id[0 ]) +tst_res (TFAIL ,"shm id %d has existed, shmget() returns the" +" same shm id unexpectedly" , shm_id[0 ]); +else +tst_res (TPASS ,"shm id %d has existed, shmget() returns the" +" new shm id %d" , shm_id[0 ], shm_id[1 ]);
testcases/kernel/syscalls/ipc/shmget/shmget06.c line 51
Quoted 10 lines
testcases/kernel/syscalls/ipc/shmget/shmget06.c new file +10
-0+ +SAFE_SHMCTL (shm_id[1 ],IPC_RMID ,NULL ); +} + +static void setup (void ) +{ + shmkey[0 ] =GETIPCKEY (); + shmkey[1 ] =GETIPCKEY (); + pid =getpid (); +SAFE_FILE_PRINTF (NEXT_ID_PATH ,"%d" , pid);
So we are using this to "randomize" the id here right?
testcases/kernel/syscalls/ipc/shmget/shmget06.c line 54
Quoted 3 lines
testcases/kernel/syscalls/ipc/shmget/shmget06.c new file +3
-0+ shm_id[0 ] =SAFE_SHMGET (shmkey[0 ],SHM_SIZE ,IPC_CREAT |SHM_RW ); +tst_res (TINFO ,"Test shm_next_id effects on shmget(different key) " +"when this identifier of shared memory segment has existed" );
I do not think that printing test description is useful, especially since we have nicely formatted test description in the test source which gets exported into the metadata.
Quoted 13 lines
testcases/kernel/syscalls/ipc/shmget/shmget06.c new file +13
-0+} + +static void cleanup (void ) +{ +int i; + +for (i =0 ; i <2 ; i++) { +if (shm_id[i] !=-1 ) +SAFE_SHMCTL (shm_id[i],IPC_RMID ,NULL ); + } +} + +static struct tst_test test = {
testcases/kernel/syscalls/ipc/shmget/shmget06.c line 77
Quoted 10 lines
testcases/kernel/syscalls/ipc/shmget/shmget06.c new file +10
-0+ .needs_tmpdir = 1, + .setup = setup, + .cleanup = cleanup, + .test_all = verify_shmget, + .needs_kconfigs = (const char *[]) { +"CONFIG_CHECKPOINT_RESTORE=y" , +NULL + }, + .needs_root = 1, +};
With the minor adjustements in description:
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH 4/4 syscalls/shmget06: Add test when the id of shm_next_id has existed
Hi Cyril
Quoted 22 lines
Hi!
Quoted 6 lines
testcases/kernel/syscalls/ipc/shmget/shmget06.c new file +0
-0testcases/kernel/syscalls/ipc/shmget/shmget06.c line 10
Quoted 10 lines
testcases/kernel/syscalls/ipc/shmget/shmget06.c new file +10
-0@@ -0,0 +1,77 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2021 FUJITSU LIMITED. All rights reserved. +* Author: Yang Xu<[email protected]> +*/ + +/*\ +* [Description] +* +* It is a basic test about shm_next_id. ^ fortestcases/kernel/syscalls/ipc/shmget/shmget06.c line 13
Quoted 3 lines
testcases/kernel/syscalls/ipc/shmget/shmget06.c new file +3
-0+* +* When the shared memory segment identifier that shm_next_id stored has +* existed, call shmget with different key just use another unused value in range
Quoted 8 lines
^ ^ 'does exist' instead of 'has existed' | or even better 'is allready in use' |will
testcases/kernel/syscalls/ipc/shmget/shmget06.c line 14
Quoted 1 line
testcases/kernel/syscalls/ipc/shmget/shmget06.c new file +1
-0+* [0,INT_MAX]. kernel doesn't guarantee the desired id. ^
Capital letter at the start of the sentence.Quoted 1 line
testcases/kernel/syscalls/ipc/shmget/shmget06.c new file +1
-0+*/ \
Will do.
Quoted 30 lines
Quoted 30 lines
testcases/kernel/syscalls/ipc/shmget/shmget06.c new file +30
-0+ +#include <errno.h> +#include <string.h> +#include <sys/types.h> +#include <sys/ipc.h> +#include <sys/shm.h> +#include "tst_test.h" +#include "tst_safe_sysv_ipc.h" +#include "libnewipc.h" + +#define NEXT_ID_PATH "/proc/sys/kernel/shm_next_id" + +static int shm_id[2 ], pid; +static key_t shmkey[2 ]; + +static void verify_shmget (void ) +{ +SAFE_FILE_PRINTF (NEXT_ID_PATH ,"%d" , shm_id[0 ]); + + shm_id[1 ] =SAFE_SHMGET (shmkey[1 ],SHM_SIZE ,IPC_CREAT |SHM_RW ); +if (shm_id[1 ] == shm_id[0 ]) +tst_res (TFAIL ,"shm id %d has existed, shmget() returns the" +" same shm id unexpectedly" , shm_id[0 ]); +else +tst_res (TPASS ,"shm id %d has existed, shmget() returns the" +" new shm id %d" , shm_id[0 ], shm_id[1 ]); + +SAFE_SHMCTL (shm_id[1 ],IPC_RMID ,NULL ); +} +
Quoted 8 lines
testcases/kernel/syscalls/ipc/shmget/shmget06.c line 51
Quoted 6 lines
testcases/kernel/syscalls/ipc/shmget/shmget06.c new file +6
-0+static void setup (void ) +{ + shmkey[0 ] =GETIPCKEY (); + shmkey[1 ] =GETIPCKEY (); + pid =getpid (); +SAFE_FILE_PRINTF (NEXT_ID_PATH ,"%d" , pid);So we are using this to "randomize" the id here right?
Yes.
Quoted 8 lines
testcases/kernel/syscalls/ipc/shmget/shmget06.c line 54
Quoted 4 lines
testcases/kernel/syscalls/ipc/shmget/shmget06.c new file +3
-0+ shm_id[0 ] =SAFE_SHMGET (shmkey[0 ],SHM_SIZE ,IPC_CREAT |SHM_RW ); +tst_res (TINFO ,"Test shm_next_id effects on shmget(different key) " +"when this identifier of shared memory segment has existed" );I do not think that printing test description is useful, especially since we have nicely formatted test description in the test source which gets exported into the metadata.
Will remove it on v2.
Quoted 29 lines
Quoted 14 lines
testcases/kernel/syscalls/ipc/shmget/shmget06.c new file +13
-0+} + +static void cleanup (void ) +{ +int i; + +for (i =0 ; i<2 ; i++) { +if (shm_id[i] !=-1 ) +SAFE_SHMCTL (shm_id[i],IPC_RMID ,NULL ); + } +} + +static struct tst_test test = {testcases/kernel/syscalls/ipc/shmget/shmget06.c line 77
Quoted 10 lines
testcases/kernel/syscalls/ipc/shmget/shmget06.c new file +10
-0+ .needs_tmpdir = 1, + .setup = setup, + .cleanup = cleanup, + .test_all = verify_shmget, + .needs_kconfigs = (const char *[]) { +"CONFIG_CHECKPOINT_RESTORE=y" , +NULL + }, + .needs_root = 1, +};With the minor adjustements in description:
Reivewed-by Cyril Hrubis<[email protected]>
PATCH v2 1/2 syscalls/shmget05: Add test for /proc/sys/kernel/shm_next_id
In reply to Cyril HrubisThis case is similar to msgget04.c.
--- runtest/syscalls | 1 + runtest/syscalls-ipc | 1 + .../kernel/syscalls/ipc/shmget/.gitignore | 1 + .../kernel/syscalls/ipc/shmget/shmget05.c | 69 +++++++++++++++++++ 4 files changed, 72 insertions(+) create mode 100644 testcases/kernel/syscalls/ipc/shmget/shmget05.c
runtest/syscalls +1 -0
@@ -1412,6 +1412,7 @@ shmdt02 shmdt02 shmget02 shmget02 shmget03 shmget03 shmget04 shmget04 +shmget05 shmget05 sigaction01 sigaction01 sigaction02 sigaction02
runtest/syscalls-ipc +1 -0
@@ -67,3 +67,4 @@ shmdt02 shmdt02 shmget02 shmget02 shmget03 shmget03 shmget04 shmget04 +shmget05 shmget05
testcases/kernel/syscalls/ipc/shmget/.gitignore +1 -0
@@ -1,3 +1,4 @@ /shmget02 /shmget03 /shmget04 +/shmget05
testcases/kernel/syscalls/ipc/shmget/shmget05.c new file +69 -0
69 lines not on this page · raw message
Signature · 1 line
2.23.0
PATCH v2 2/2 syscalls/shmget06: Add test when shm_next_id is already in use
When the identifier of the System V shared memory segment that shm_next_id stored is already in use, shmget() with different key will return the another shm id. But kernel doesn't guarantee desired id, I just compare with the existed id, if not equal, the test succeeds.
This case is similar to msgget05.c.
--- runtest/syscalls | 1 + runtest/syscalls-ipc | 1 + .../kernel/syscalls/ipc/shmget/.gitignore | 1 + .../kernel/syscalls/ipc/shmget/shmget06.c | 75 +++++++++++++++++++ 4 files changed, 78 insertions(+) create mode 100644 testcases/kernel/syscalls/ipc/shmget/shmget06.c
runtest/syscalls +1 -0
@@ -1413,6 +1413,7 @@ shmget02 shmget02 shmget03 shmget03 shmget04 shmget04 shmget05 shmget05 +shmget06 shmget06 sigaction01 sigaction01 sigaction02 sigaction02
runtest/syscalls-ipc +1 -0
@@ -68,3 +68,4 @@ shmget02 shmget02 shmget03 shmget03 shmget04 shmget04 shmget05 shmget05 +shmget06 shmget06
testcases/kernel/syscalls/ipc/shmget/.gitignore +1 -0
@@ -2,3 +2,4 @@ /shmget03 /shmget04 /shmget05 +/shmget06
testcases/kernel/syscalls/ipc/shmget/shmget06.c new file +75 -0
75 lines not on this page · raw message
Signature · 1 line
2.23.0
PATCH v2 2/2 syscalls/shmget06: Add test when shm_next_id is already in use
Hi Cyril
I have merged this patchset, thanks for your review.
Best Regards
Yang Xu
Quoted 128 lines
When the identifier of the System V shared memory segment that
shm_next_idstored is already in use,shmget()with different key will return the another shm id. But kernel doesn't guarantee desired id, I just compare with the existed id, if not equal, the test succeeds.This case is similar to
msgget05.c.Reviewed-by Cyril Hrubis<[email protected]>Signed-off-by Yang Xu<[email protected]>--- runtest/syscalls | 1 + runtest/syscalls-ipc | 1 + .../kernel/syscalls/ipc/shmget/.gitignore | 1 + .../kernel/syscalls/ipc/shmget/shmget06.c | 75 +++++++++++++++++++ 4 files changed, 78 insertions(+)create mode 100644
testcases/kernel/syscalls/ipc/shmget/shmget06.cruntest/syscalls +1
-0@@ -1413,6 +1413,7 @@ shmget02 shmget02 shmget03 shmget03 shmget04 shmget04 shmget05 shmget05 +shmget06 shmget06 sigaction01 sigaction01 sigaction02 sigaction02runtest/syscalls-ipc +1
-0@@ -68,3 +68,4 @@ shmget02 shmget02 shmget03 shmget03 shmget04 shmget04 shmget05 shmget05 +shmget06 shmget06testcases/kernel/syscalls/ipc/shmget/.gitignore +1
-0@@ -2,3 +2,4 @@ /shmget03 /shmget04 /shmget05 +/shmget06testcases/kernel/syscalls/ipc/shmget/shmget06.c new file +75
-0@@ -0,0 +1,75 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2021 FUJITSU LIMITED. All rights reserved. +* Author: Yang Xu<[email protected]> +*/ + +/*\ +* [Description] +* +* It is a basic test for shm_next_id. +* +* When the shared memory segment identifier that shm_next_id stored is already +* in use, call shmget with different key just use another unused value in range +* [0,INT_MAX]. Kernel doesn't guarantee the desired id. +*/ + +#include <errno.h> +#include <string.h> +#include <sys/types.h> +#include <sys/ipc.h> +#include <sys/shm.h> +#include "tst_test.h" +#include "tst_safe_sysv_ipc.h" +#include "libnewipc.h" + +#define NEXT_ID_PATH "/proc/sys/kernel/shm_next_id" + +static int shm_id[2 ], pid; +static key_t shmkey[2 ]; + +static void verify_shmget (void ) +{ +SAFE_FILE_PRINTF (NEXT_ID_PATH ,"%d" , shm_id[0 ]); + + shm_id[1 ] =SAFE_SHMGET (shmkey[1 ],SHM_SIZE ,IPC_CREAT |SHM_RW ); +if (shm_id[1 ] == shm_id[0 ]) +tst_res (TFAIL ,"shm id %d has existed, shmget() returns the" +" same shm id unexpectedly" , shm_id[0 ]); +else +tst_res (TPASS ,"shm id %d has existed, shmget() returns the" +" new shm id %d" , shm_id[0 ], shm_id[1 ]); + +SAFE_SHMCTL (shm_id[1 ],IPC_RMID ,NULL ); +} + +static void setup (void ) +{ + shmkey[0 ] =GETIPCKEY (); + shmkey[1 ] =GETIPCKEY (); + pid =getpid (); +SAFE_FILE_PRINTF (NEXT_ID_PATH ,"%d" , pid); + shm_id[0 ] =SAFE_SHMGET (shmkey[0 ],SHM_SIZE ,IPC_CREAT |SHM_RW ); +} + +static void cleanup (void ) +{ +int i; + +for (i =0 ; i<2 ; i++) { +if (shm_id[i] !=-1 ) +SAFE_SHMCTL (shm_id[i],IPC_RMID ,NULL ); + } +} + +static struct tst_test test = { + .needs_tmpdir =1 , + .setup = setup, + .cleanup = cleanup, + .test_all = verify_shmget, + .needs_kconfigs = (const char *[]) { +"CONFIG_CHECKPOINT_RESTORE=y" , +NULL + }, + .needs_root =1 , +};
PATCH 1/4 syscalls/shmget01: Remove it
In reply to Yang XuHi!
Applied, thanks.
Signature · 2 lines
Cyril Hrubis [email protected]