Commit a3d601fc authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Torvalds

test_hexdump: go through all possible lengths of buffer

When test for overflow do iterate the buffer length in a range 0 ..
BUF_SIZE.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3db4a987
...@@ -133,17 +133,16 @@ static void __init test_hexdump_set(int rowsize, bool ascii) ...@@ -133,17 +133,16 @@ static void __init test_hexdump_set(int rowsize, bool ascii)
test_hexdump(len, rowsize, 1, ascii); test_hexdump(len, rowsize, 1, ascii);
} }
static void __init test_hexdump_overflow(bool ascii) static void __init test_hexdump_overflow(size_t buflen, bool ascii)
{ {
char buf[56]; char buf[TEST_HEXDUMP_BUF_SIZE];
const char *t = test_data_1_le[0]; const char *t = test_data_1_le[0];
size_t l = get_random_int() % sizeof(buf);
bool a; bool a;
int e, r; int e, r;
memset(buf, FILL_CHAR, sizeof(buf)); memset(buf, FILL_CHAR, sizeof(buf));
r = hex_dump_to_buffer(data_b, 1, 16, 1, buf, l, ascii); r = hex_dump_to_buffer(data_b, 1, 16, 1, buf, buflen, ascii);
if (ascii) if (ascii)
e = 50; e = 50;
...@@ -151,15 +150,15 @@ static void __init test_hexdump_overflow(bool ascii) ...@@ -151,15 +150,15 @@ static void __init test_hexdump_overflow(bool ascii)
e = 2; e = 2;
buf[e + 2] = '\0'; buf[e + 2] = '\0';
if (!l) { if (!buflen) {
a = r == e && buf[0] == FILL_CHAR; a = r == e && buf[0] == FILL_CHAR;
} else if (l < 3) { } else if (buflen < 3) {
a = r == e && buf[0] == '\0'; a = r == e && buf[0] == '\0';
} else if (l < 4) { } else if (buflen < 4) {
a = r == e && !strcmp(buf, t); a = r == e && !strcmp(buf, t);
} else if (ascii) { } else if (ascii) {
if (l < 51) if (buflen < 51)
a = r == e && buf[l - 1] == '\0' && buf[l - 2] == FILL_CHAR; a = r == e && buf[buflen - 1] == '\0' && buf[buflen - 2] == FILL_CHAR;
else else
a = r == e && buf[50] == '\0' && buf[49] == '.'; a = r == e && buf[50] == '\0' && buf[49] == '.';
} else { } else {
...@@ -167,7 +166,7 @@ static void __init test_hexdump_overflow(bool ascii) ...@@ -167,7 +166,7 @@ static void __init test_hexdump_overflow(bool ascii)
} }
if (!a) { if (!a) {
pr_err("Len: %zu rc: %u strlen: %zu\n", l, r, strlen(buf)); pr_err("Len: %zu rc: %u strlen: %zu\n", buflen, r, strlen(buf));
pr_err("Result: '%s'\n", buf); pr_err("Result: '%s'\n", buf);
} }
} }
...@@ -187,11 +186,11 @@ static int __init test_hexdump_init(void) ...@@ -187,11 +186,11 @@ static int __init test_hexdump_init(void)
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
test_hexdump_set(rowsize, true); test_hexdump_set(rowsize, true);
for (i = 0; i < 16; i++) for (i = 0; i <= TEST_HEXDUMP_BUF_SIZE; i++)
test_hexdump_overflow(false); test_hexdump_overflow(i, false);
for (i = 0; i < 16; i++) for (i = 0; i <= TEST_HEXDUMP_BUF_SIZE; i++)
test_hexdump_overflow(true); test_hexdump_overflow(i, true);
return -EINVAL; return -EINVAL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment