From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755665AbbJ1KsZ (ORCPT ); Wed, 28 Oct 2015 06:48:25 -0400 Received: from mga01.intel.com ([192.55.52.88]:16998 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751397AbbJ1KsY (ORCPT ); Wed, 28 Oct 2015 06:48:24 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,209,1444719600"; d="scan'208";a="821334298" From: Andy Shevchenko To: Andrew Morton , Linus Torvalds , linux-kernel@vger.kernel.org, Aaro Koskinen , Al Viro , Catalin Marinas Cc: Andy Shevchenko Subject: [RFT, PATCH v1 1/1] hexdump: truncate output in case of overflow Date: Wed, 28 Oct 2015 12:48:19 +0200 Message-Id: <1446029299-34523-1-git-send-email-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.6.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There is a classical off-by-one error in case when we try to place, for example, 1+1 bytes as hex in the buffer of size 6. The expected result is to get an output truncated, but in the reality we get 6 bytes filed followed by terminating NUL. Change the logic how we fill the output in case of byte dumping into limited space. This will follow the snprintf() behaviour by truncating output even on half bytes. Fixes: 114fc1afb2de (hexdump: make it return number of bytes placed in buffer) Reported-by: Aaro Koskinen Signed-off-by: Andy Shevchenko --- Waiting for Aaro's Tested-by: tag, that's why RFT. Meanwhile I will update test-hexdump to cover all corner case in overflow. Linus, it would be nice to promote the fix when we get Aaro's confirmation. lib/hexdump.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/hexdump.c b/lib/hexdump.c index 8d74c20..992457b 100644 --- a/lib/hexdump.c +++ b/lib/hexdump.c @@ -169,11 +169,15 @@ int hex_dump_to_buffer(const void *buf, size_t len, int rowsize, int groupsize, } } else { for (j = 0; j < len; j++) { - if (linebuflen < lx + 3) + if (linebuflen < lx + 2) goto overflow2; ch = ptr[j]; linebuf[lx++] = hex_asc_hi(ch); + if (linebuflen < lx + 2) + goto overflow2; linebuf[lx++] = hex_asc_lo(ch); + if (linebuflen < lx + 2) + goto overflow2; linebuf[lx++] = ' '; } if (j) -- 2.6.1