luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test_hexdump: check all bytes in real buffer

Browse Source 
After processing by hex_dump_to_buffer() check all the parts to be expected.

Part 1. The actual expected hex dump with or without ASCII part.

Part 2. Check if the buffer is dirty beyond needed.

Part 3. Return code should be as expected.

This is done by using comparison of the return code and memcmp() against
the test buffer.  We fill the buffer by FILL_CHAR ('#') characters, so, we
expect to have a tail of the buffer will be left untouched.  The
terminating NUL is also checked by memcmp().

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andy Shevchenko 2016-01-20 14:59:01 -08:00 committed by Linus Torvalds
parent 7047d81371
commit cc77a719a5
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/test_hexdump.c
View File

@ -135,11 +135,10 @@ static void __init test_hexdump_set(int rowsize, bool ascii)
static void __init test_hexdump_overflow(size_t buflen, bool ascii) static void __init test_hexdump_overflow(size_t buflen, bool ascii)
{ {
char test[TEST_HEXDUMP_BUF_SIZE];
char buf[TEST_HEXDUMP_BUF_SIZE]; char buf[TEST_HEXDUMP_BUF_SIZE];
const char *t = test_data_1_le[0]; int rs = rowsize, gs = groupsize;
size_t len = 1; int ae, he, e, f, r;
int rs = 16, gs = 1;
int ae, he, e, r;
bool a; bool a;
memset(buf, FILL_CHAR, sizeof(buf)); memset(buf, FILL_CHAR, sizeof(buf));
@ -157,26 +156,23 @@ static void __init test_hexdump_overflow(size_t buflen, bool ascii)
e = ae; e = ae;
else else
e = he; e = he;
buf[e + 2] = '\0';
if (!buflen) { f = min_t(int, e + 1, buflen);
a = r == e && buf[0] == FILL_CHAR; if (buflen) {
} else if (buflen < 3) { test_hexdump_prepare_test(len, rs, gs, test, sizeof(test), ascii);
a = r == e && buf[0] == '\0'; test[f - 1] = '\0';
} else if (buflen < 4) {
a = r == e && !strcmp(buf, t);
} else if (ascii) {
if (buflen < 51)
a = r == e && buf[buflen - 1] == '\0' && buf[buflen - 2] == FILL_CHAR;
else
a = r == e && buf[50] == '\0' && buf[49] == '.';
} else {
a = r == e && buf[e] == '\0';
} }
memset(test + f, FILL_CHAR, sizeof(test) - f);
a = r == e && !memcmp(test, buf, TEST_HEXDUMP_BUF_SIZE);
buf[sizeof(buf) - 1] = '\0';
if (!a) { if (!a) {
pr_err("Len: %zu rc: %u strlen: %zu\n", buflen, r, strlen(buf)); pr_err("Len: %zu buflen: %zu strlen: %zu\n",
pr_err("Result: '%s'\n", buf); len, buflen, strnlen(buf, sizeof(buf)));
pr_err("Result: %d '%s'\n", r, buf);
pr_err("Expect: %d '%s'\n", e, test);
} }
} }