Skip to contentSkip to conversation

shmget02: fix EPERM test when RLIMIT_MEMLOCK is large enough

PATCH New Thadeu Lima de Souza Cascardo 2 participants 3 messages Jul 6, 2021 – Jul 8, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 shmget02: fix EPERM test when RLIMIT_MEMLOCK is large enough

shmget(..., SHM_HUGETLB) will not fail with EPERM if there is enough space for RLIMIT_MEMLOCK. If the limit is 0, it will fail with EPERM as expected when a not enough privileged user calls it.

Set RLIMIT_MEMLOCK to 0 for all calls, as this is the only one which will fail because of that limit, unless we are talking about very old kernels (before 2.6.9).

Fixes 4dc493b44a85 ("syscalls/shmget*: Convert into new api")
---
 testcases/kernel/syscalls/ipc/shmget/shmget02.c | 2 ++
 1 file changed, 2 insertions(+)
testcases/kernel/syscalls/ipc/shmget/shmget02.c +2 -0
index 6be8d8157999..8857207cfd3d 100644
@@ -64,6 +64,7 @@ static void do_test(unsigned int n)
 {
 	struct tcase *tc = &tcases[n];
 	pid_t pid;
+	struct rlimit rl = { 0, 0 };
 
 	if (tc->exp_user == 0 && tc->exp_group == 0) {
 		TST_EXP_FAIL2(shmget(*tc->shmkey, tc->size, tc->flags), tc->exp_err,
@@ -78,6 +79,7 @@ static void do_test(unsigned int n)
 			SAFE_SETGID(pw->pw_gid);
 		}
 		SAFE_SETUID(pw->pw_uid);
+		SAFE_SETRLIMIT(RLIMIT_MEMLOCK, &rl);
 		TST_EXP_FAIL2(shmget(*tc->shmkey, tc->size, tc->flags), tc->exp_err,
 			"shmget(%i, %lu, %i)", *tc->shmkey, tc->size, tc->flags);
 		exit(0);
Signature · 1 line
2.30.2
#1 lore raw

PATCH 1/1 shmget02: fix EPERM test when RLIMIT_MEMLOCK is large enough

Hi Thadeu

Quoted 10 lines

shmget(..., SHM_HUGETLB) will not fail with EPERM if there is enough space for RLIMIT_MEMLOCK. If the limit is 0, it will fail with EPERM as expected when a not enough privileged user calls it.

Set RLIMIT_MEMLOCK to 0 for all calls, as this is the only one which will fail because of that limit, unless we are talking about very old kernels (before 2.6.9).

Fixes 4dc493b44a85 ("syscalls/shmget*: Convert into new api")

Thanks for the fix!

just a small nit: Since a child process created via fork(2) inherits its parent's resource limits. I prefer to move it to setup function, so we don't need to set it in each sub case.

Best Regards
Yang Xu

Quoted 24 lines
---
  testcases/kernel/syscalls/ipc/shmget/shmget02.c | 2 ++
  1 file changed, 2 insertions(+)
testcases/kernel/syscalls/ipc/shmget/shmget02.c +2 -0
index 6be8d8157999..8857207cfd3d 100644
@@ -64,6 +64,7 @@ static void do_test(unsigned int n)
  {
  	struct tcase *tc =&tcases[n];
  	pid_t pid;
+	struct rlimit rl = { 0, 0 };
 
  	if (tc->exp_user == 0&&  tc->exp_group == 0) {
  		TST_EXP_FAIL2(shmget(*tc->shmkey, tc->size, tc->flags), tc->exp_err,
@@ -78,6 +79,7 @@ static void do_test(unsigned int n)
  			SAFE_SETGID(pw->pw_gid);
  		}
  		SAFE_SETUID(pw->pw_uid);
+		SAFE_SETRLIMIT(RLIMIT_MEMLOCK,&rl);
  		TST_EXP_FAIL2(shmget(*tc->shmkey, tc->size, tc->flags), tc->exp_err,
  			"shmget(%i, %lu, %i)", *tc->shmkey, tc->size, tc->flags);
  		exit(0);
#2 lore raw

PATCH 1/1 shmget02: fix EPERM test when RLIMIT_MEMLOCK is large enough

Hi!
Pushed with moving this into setup, thanks.

Best Regards
Yang Xu

Quoted 47 lines

Hi Thadeu

Quoted 6 lines

shmget(..., SHM_HUGETLB) will not fail with EPERM if there is enough space
for RLIMIT_MEMLOCK. If the limit is 0, it will fail with EPERM as expected
when a not enough privileged user calls it.

Quoted 6 lines

Set RLIMIT_MEMLOCK to 0 for all calls, as this is the only one which will fail because of that limit, unless we are talking about very old kernels (before 2.6.9).

Fixes 4dc493b44a85 ("syscalls/shmget*: Convert into new api")

Thanks for the fix!

just a small nit: Since a child process created via fork(2) inherits its parent's resource limits. I prefer to move it to setup function, so we don't need to set it in each sub case.

Best Regards
Yang Xu

Quoted 25 lines

---
testcases/kernel/syscalls/ipc/shmget/shmget02.c | 2 ++

1 file changed, 2 insertions(+)
testcases/kernel/syscalls/ipc/shmget/shmget02.c +2 -0
index 6be8d8157999..8857207cfd3d 100644
@@ -64,6 +64,7 @@ static void do_test(unsigned int n)
 {
 struct tcase *tc =&tcases[n];
 pid_t pid;
+ struct rlimit rl = { 0, 0 };
 
 if (tc->exp_user == 0&& tc->exp_group == 0) {
 TST_EXP_FAIL2(shmget(*tc->shmkey, tc->size, tc->flags), tc->exp_err,
@@ -78,6 +79,7 @@ static void do_test(unsigned int n)
 SAFE_SETGID(pw->pw_gid);
 }
 SAFE_SETUID(pw->pw_uid);
+ SAFE_SETRLIMIT(RLIMIT_MEMLOCK,&rl);
 TST_EXP_FAIL2(shmget(*tc->shmkey, tc->size, tc->flags), tc->exp_err,
 "shmget(%i, %lu, %i)", *tc->shmkey, tc->size, tc->flags);
 exit(0);