Skip to contentSkip to conversation

android: madvise08: fix for android devices.

PATCH New Sandeep Patil 2 participants 2 messages Sep 5, 2017 – Sep 8, 2017

lore
Share & tools
lore

Sandeep Patil

author
#0 lore raw

PATCH v2 1/1 android: madvise08: fix for android devices.

The test uses '%m' conversion specifier for vfscanf() that is not supported in bionic. Use '%s' instead with a buffer that is substatially larger than the current maximum coredump file name length of 128 bytes.

Signed-off-by Sandeep Patil <[email protected]>

---
v1->v2
---
- Fix the possibility of incorrectly replacing the coredump filename pattern by an empty string in the test failure path.

 testcases/kernel/syscalls/madvise/madvise08.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
testcases/kernel/syscalls/madvise/madvise08.c +6 -5
index 296c2bff3..a6fd9671c 100644
@@ -49,10 +49,12 @@
 #define CORE_FILTER "/proc/self/coredump_filter"
 #define YCOUNT 0x500L
 #define FMEMSIZE (YCOUNT + 0x2L)
+#define CORENAME_MAX_SIZE 512
 
 static int dfd;
 static void *fmem;
-static char *cpattern;
+static char cpattern[CORENAME_MAX_SIZE];
+static int restore_cpattern;
 
 static void setup(void)
 {

@@ -80,7 +82,8 @@ static void setup(void)
 	if (!(0x1 & filter))
 		tst_brk(TCONF, "Anonymous private memory is not dumpable.");
 
-	SAFE_FILE_SCANF(CORE_PATTERN, "%m[^\n]", &cpattern);
+	SAFE_FILE_SCANF(CORE_PATTERN, "%s[^\n]", cpattern);
+	restore_cpattern = 1;
 	tst_res(TINFO, "System core pattern is '%s'", cpattern);
 
 	SAFE_GETCWD(cwd, sizeof(cwd));

@@ -108,11 +111,9 @@ static void setup(void)
 
 static void cleanup(void)
 {
-	if (cpattern)
+	if (restore_cpattern)
 		SAFE_FILE_PRINTF(CORE_PATTERN, "%s", cpattern);
 
-	free(cpattern);
-
 	if (fmem)
 		SAFE_MUNMAP(fmem, FMEMSIZE);
Signature · 1 line
2.14.1.581.gf28d330327-goog