Merge pull request torvalds#332 from laijs/lkl/stackoverflow

fix stackoverflow in test_getdents64()
laijs · Feb 16, 2017 · 84f6a9b · 84f6a9b
2 parents 311a4ee + 9045528
commit 84f6a9b
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/tools/lkl/tests/boot.c b/tools/lkl/tests/boot.c
@@ -599,18 +599,16 @@ static int test_getdents64(char *str, int len)
 	ret = lkl_sys_getdents64(dir_fd, de, sizeof(buf));
 
 	wr = snprintf(str, len, "%d ", dir_fd);
-	str += wr;
-	len -= wr;
 
 	if (ret < 0)
 		return TEST_FAILURE;
 
 	for (pos = buf; pos - buf < ret; pos += de->d_reclen) {
 		de = (struct lkl_linux_dirent64 *)pos;
 
-		wr = snprintf(str, len, "%s ", de->d_name);
-		str += wr;
-		len -= wr;
+		wr += snprintf(str + wr, len - wr, "%s ", de->d_name);
+		if (wr >= len)
+			break;
 	}
 
 	return TEST_SUCCESS;