From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752633AbbKKQgN (ORCPT ); Wed, 11 Nov 2015 11:36:13 -0500 Received: from mga14.intel.com ([192.55.52.115]:44904 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752562AbbKKQgG (ORCPT ); Wed, 11 Nov 2015 11:36:06 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,276,1444719600"; d="scan'208";a="598375938" From: Andy Shevchenko To: Rasmus Villemoes , Andrew Morton , linux-kernel@vger.kernel.org Cc: Andy Shevchenko Subject: [PATCH v1 6/7] test_hexdump: test all possible group sizes for overflow Date: Wed, 11 Nov 2015 18:35:17 +0200 Message-Id: <1447259718-19647-7-git-send-email-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1447259718-19647-1-git-send-email-andriy.shevchenko@linux.intel.com> References: <1447259718-19647-1-git-send-email-andriy.shevchenko@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently only one combination is tested for overflow, i.e. rowsize = 16, groupsize = 1, len = 1. Do various test to go all possible branches. Signed-off-by: Andy Shevchenko --- lib/test_hexdump.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/lib/test_hexdump.c b/lib/test_hexdump.c index 9b95b67..fa2f4af 100644 --- a/lib/test_hexdump.c +++ b/lib/test_hexdump.c @@ -126,12 +126,13 @@ 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]; - size_t len = 1; - int rs = 16, gs = 1; + int rs = rowsize, gs = groupsize; int ae, he, e, r; bool a; @@ -170,6 +171,18 @@ 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; + + do { + int gs = 1 << i; + size_t len = get_random_int() % 16 + gs; + + test_hexdump_overflow(buflen, rounddown(len, gs), 16, gs, ascii); + } while (i++ < 3); +} + static int __init test_hexdump_init(void) { unsigned int i; @@ -186,10 +199,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; } -- 2.6.2