From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752358AbbKKQhs (ORCPT ); Wed, 11 Nov 2015 11:37:48 -0500 Received: from mga02.intel.com ([134.134.136.20]:30798 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752499AbbKKQgG (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="848598063" From: Andy Shevchenko To: Rasmus Villemoes , Andrew Morton , linux-kernel@vger.kernel.org Cc: Andy Shevchenko Subject: [PATCH v1 5/7] test_hexdump: check all bytes in real buffer Date: Wed, 11 Nov 2015 18:35:16 +0200 Message-Id: <1447259718-19647-6-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 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. This is provided by plain strcmp() call including check for the terminating NUL. Part 2. Check if the buffer is dirty beyond needed. We fill the buffer by ' ' (space) characters, so, we expect to have the tail of buffer will be left untouched. Check all bytes in the tail of the buffer. Part 3. Return code should be as expected. Signed-off-by: Andy Shevchenko --- lib/test_hexdump.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/test_hexdump.c b/lib/test_hexdump.c index a3e3b01..9b95b67 100644 --- a/lib/test_hexdump.c +++ b/lib/test_hexdump.c @@ -128,10 +128,9 @@ static void __init test_hexdump_set(int rowsize, 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]; - const char *t = test_data_1_le[0]; size_t len = 1; - size_t l = buflen; int rs = 16, gs = 1; int ae, he, e, r; bool a; @@ -147,26 +146,27 @@ static void __init test_hexdump_overflow(size_t buflen, bool ascii) e = ae; else e = he; - buf[e + 2] = '\0'; if (!buflen) { - a = r == e && buf[0] == ' '; - } else if (l < 3) { - a = r == e && buf[0] == '\0'; - } else if (l < 4) { - a = r == e && !strcmp(buf, t); - } else if (ascii) { - if (l < 51) - a = r == e && buf[l - 1] == '\0' && buf[l - 2] == ' '; - else - a = r == e && buf[50] == '\0' && buf[49] == '.'; + memset(test, ' ', sizeof(test)); + test[sizeof(buf) - 1] = '\0'; + + a = r == e && !memchr_inv(buf, ' ', sizeof(buf)); } else { - a = r == e && buf[e] == '\0'; + int f = min_t(int, e + 1, buflen); + + test_hexdump_prepare_test(len, rs, gs, test, sizeof(test), ascii); + test[f - 1] = '\0'; + + a = r == e && !memchr_inv(buf + f, ' ', sizeof(buf) - f) && !strcmp(buf, test); } + buf[sizeof(buf) - 1] = '\0'; + if (!a) { - pr_err("Len: %zu rc: %u strlen: %zu\n", buflen, r, strlen(buf)); - pr_err("Result: '%s'\n", buf); + pr_err("Len: %zu buflen: %zu strlen: %zu\n", len, buflen, strlen(buf)); + pr_err("Result: %d '%s'\n", r, buf); + pr_err("Expect: %d '%s'\n", e, test); } } -- 2.6.2