Skip to content

Commit

Permalink
test_hexdump: test all possible group sizes for overflow
Browse files Browse the repository at this point in the history
Currently the only one combination is tested for overflow, i.e.  rowsize =
16, groupsize = 1, len = 1.  Do various test to go through all possible
branches.

Signed-off-by: Andy Shevchenko <[email protected]>
Cc: Rasmus Villemoes <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
andy-shev authored and torvalds committed Jan 21, 2016
1 parent cc77a71 commit 1dacd9d
Showing 1 changed file with 18 additions and 3 deletions.
21 changes: 18 additions & 3 deletions lib/test_hexdump.c
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,9 @@ static void __init test_hexdump_set(int rowsize, bool ascii)
test_hexdump(len, rowsize, 1, ascii);
}

static void __init test_hexdump_overflow(size_t buflen, bool ascii)
static void __init test_hexdump_overflow(size_t buflen, size_t len,
int rowsize, int groupsize,
bool ascii)
{
char test[TEST_HEXDUMP_BUF_SIZE];
char buf[TEST_HEXDUMP_BUF_SIZE];
Expand Down Expand Up @@ -176,6 +178,19 @@ static void __init test_hexdump_overflow(size_t buflen, bool ascii)
}
}

static void __init test_hexdump_overflow_set(size_t buflen, bool ascii)
{
unsigned int i = 0;
int rs = (get_random_int() % 2 + 1) * 16;

do {
int gs = 1 << i;
size_t len = get_random_int() % rs + gs;

test_hexdump_overflow(buflen, rounddown(len, gs), rs, gs, ascii);
} while (i++ < 3);
}

static int __init test_hexdump_init(void)
{
unsigned int i;
Expand All @@ -192,10 +207,10 @@ static int __init test_hexdump_init(void)
test_hexdump_set(rowsize, true);

for (i = 0; i <= TEST_HEXDUMP_BUF_SIZE; i++)
test_hexdump_overflow(i, false);
test_hexdump_overflow_set(i, false);

for (i = 0; i <= TEST_HEXDUMP_BUF_SIZE; i++)
test_hexdump_overflow(i, true);
test_hexdump_overflow_set(i, true);

return -EINVAL;
}
Expand Down

0 comments on commit 1dacd9d

Please sign in to comment.