test_hexdump: test all possible group sizes for overflow

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 <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>

diff --git a/lib/test_hexdump.c b/lib/test_hexdump.c
index 16a7593..11d45f5 100644 (file)
--- a/lib/test_hexdump.c
+++ b/lib/test_hexdump.c
@@ -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];
@@ -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;
@@ -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;
 }