Skip to contentSkip to conversation

ima: rewrite ima_mmap auxiliary with TST_NO_DEFAULT_MAIN

PATCH In review Li Wang 5 participants 6 messages May 7 – May 12

lore
Share & tools
lore

Li Wang

author
#0 lore raw

PATCH 1/1 ima: rewrite ima_mmap auxiliary with TST_NO_DEFAULT_MAIN

Commit 7276e7c154 ("ima_violations.sh: ima_mmap.c: Replace sleep with checkpoints") called tst_reinit() inside the run() callback of a struct tst_test based binary. This is incorrect because the test framework has already initialized the IPC during setup, and calling tst_reinit() re-maps the shared memory to the parent shell's IPC region, corrupting the C binary's own test infrastructure.

Fix this by converting ima_mmap to a TST_NO_DEFAULT_MAIN helper binary. In this mode there is no prior framework initialization, so tst_reinit() correctly attaches to the parent shell test's shared memory for checkpoint communication, following the same pattern used by other LTP helper binaries (e.g. execvp01_child).

Fixes 7276e7c154 ("ima_violations.sh: ima_mmap.c: Replace sleep with checkpoints")
---
 .../security/integrity/ima/src/ima_mmap.c     | 40 ++++++-------------
 .../integrity/ima/tests/ima_violations.sh     |  5 +--
 2 files changed, 14 insertions(+), 31 deletions(-)
testcases/kernel/security/integrity/ima/src/ima_mmap.c +12 -28
index 09b22fd4f..1861147f8 100644
@@ -7,46 +7,30 @@
  * Mimi Zohar <[email protected]>
  */
 
+#define TST_NO_DEFAULT_MAIN
 #include "tst_test.h"
 
 #define MMAPSIZE 1024
 
-static char *filename;
-static void *file;
-static int fd;
-
-static void cleanup(void)
+int main(int argc, char *argv[])
 {
-	if (file)
-		SAFE_MUNMAP(file, MMAPSIZE);
-
-	if (fd > 0)
-		SAFE_CLOSE(fd);
-}
+	int fd;
+	void *file;
 
-static void run(void)
-{
-	if (!filename)
-		tst_brk(TBROK, "missing filename (-f filename)");
+	tst_reinit();
 
-	fd = SAFE_OPEN(filename, O_CREAT | O_RDWR, S_IRWXU);
+	if (argc != 2)
+		tst_brk(TBROK, "usage: ima_mmap <filename>");
 
+	fd = SAFE_OPEN(argv[1], O_CREAT | O_RDWR, S_IRWXU);
 	file = SAFE_MMAP(NULL, MMAPSIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
 	SAFE_CLOSE(fd);
 
-	tst_reinit();
-	TST_CHECKPOINT_WAIT(0);
-	/* keep running until ima_violations.sh open and close file */
+	/* Waiting until ima_violations.sh open and close file */
 	TST_CHECKPOINT_WAKE_AND_WAIT(0);
 
+	SAFE_MUNMAP(file, MMAPSIZE);
 	tst_res(TPASS, "test completed");
-}
 
-static struct tst_test test = {
-	.options = (struct tst_option[]) {
-		{"f:", &filename, "File to mmap"},
-		{}
-	},
-	.test_all = run,
-	.cleanup = cleanup,
-};
+	return 0;
+}
testcases/kernel/security/integrity/ima/tests/ima_violations.sh +2 -3
index d7dcd077b..6271bba35 100755
@@ -170,11 +170,10 @@ test3()
 
 	echo 'testing testing' > $FILE
 
-	ima_mmap -f $FILE &
+	ima_mmap $FILE &
 	pid=$!
 
-	# wait for violations appear in logs
-	TST_CHECKPOINT_WAKE_AND_WAIT 0
+	TST_CHECKPOINT_WAIT 0
 
 	open_file_read
 	close_file_read
Signature · 5 lines
2.54.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
Reviewed-by LTP AI Reviewer on v1 1/1
#4 lore raw
In reply to Li Wang

Hi Li,

Quoted 6 lines · Li Wang

ima: rewrite ima_mmap auxiliary with TST_NO_DEFAULT_MAIN

testcases/kernel/security/integrity/ima/src/ima_mmap.c +2 -0
+#define TST_NO_DEFAULT_MAIN
 #include "tst_test.h"
 
+	tst_reinit();

testcases/kernel/security/integrity/ima/src/ima_mmap.c line 33

Quoted 10 lines
testcases/kernel/security/integrity/ima/src/ima_mmap.c +6 -0
+	if (argc != 2)
+		tst_brk(TBROK, "usage: ima_mmap <filename>");
+
+	fd = SAFE_OPEN(argv[1], O_CREAT | O_RDWR, S_IRWXU);
 	file = SAFE_MMAP(NULL, MMAPSIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
 	SAFE_CLOSE(fd);
+	/* Waiting until ima_violations.sh open and close file */
 	TST_CHECKPOINT_WAKE_AND_WAIT(0);
+	SAFE_MUNMAP(file, MMAPSIZE);
 	tst_res(TPASS, "test completed");

Correct pattern. Moving tst_reinit() before any framework use and switching to TST_NO_DEFAULT_MAIN properly fixes the IPC corruption. The checkpoint handshake inversion between the helper and the shell script is consistent.

---
Note:

Our agent completed the review of the patch. The full review can be found at: (not available)

The agent can sometimes produce false positives although often its findings are genuine. If you find issues with the review, please comment this email or ignore the suggestions.

Regards,
LTP AI Reviewer

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
#5 lore raw
In reply to Li Wang

Hi Li, all,

Quoted 7 lines

Commit 7276e7c154 ("ima_violations.sh: ima_mmap.c: Replace sleep with checkpoints") called tst_reinit() inside the run() callback of a struct tst_test based binary. This is incorrect because the test framework has already initialized the IPC during setup, and calling tst_reinit() re-maps the shared memory to the parent shell's IPC region, corrupting the C binary's own test infrastructure.

Quoted 7 lines

Fix this by converting ima_mmap to a TST_NO_DEFAULT_MAIN helper binary. In this mode there is no prior framework initialization, so tst_reinit() correctly attaches to the parent shell test's shared memory for checkpoint communication, following the same pattern used by other LTP helper binaries (e.g. execvp01_child).

Fixes 7276e7c154 ("ima_violations.sh: ima_mmap.c: Replace sleep with checkpoints")

Li, thanks for fixing the problem I introduced. It's nice to get from vacation and see the work has been done :).

And using TST_NO_DEFAULT_MAIN is indeed the best way for these simple helpers.

Kind regards,
Petr

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