From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932476AbbJ0OGg (ORCPT ); Tue, 27 Oct 2015 10:06:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50679 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932125AbbJ0OGd (ORCPT ); Tue, 27 Oct 2015 10:06:33 -0400 From: Vitaly Kuznetsov To: Andrew Morton Cc: Rasmus Villemoes , Andy Shevchenko , Ulf Hansson , James Bottomley , Kees Cook , linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] lib/string_helpers: change blk_size to u32 for string_get_size() interface Date: Tue, 27 Oct 2015 15:06:25 +0100 Message-Id: <1445954787-18104-2-git-send-email-vkuznets@redhat.com> In-Reply-To: <1445954787-18104-1-git-send-email-vkuznets@redhat.com> References: <1445954787-18104-1-git-send-email-vkuznets@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org string_get_size() can't really handle huge block sizes, especially blk_size > U32_MAX but string_get_size() interface states the opposite. Change blk_size from u64 to u32 to reflect the reality. Signed-off-by: Vitaly Kuznetsov --- include/linux/string_helpers.h | 2 +- lib/string_helpers.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/string_helpers.h b/include/linux/string_helpers.h index dabe643..1223e80 100644 --- a/include/linux/string_helpers.h +++ b/include/linux/string_helpers.h @@ -10,7 +10,7 @@ enum string_size_units { STRING_UNITS_2, /* use binary powers of 2^10 */ }; -void string_get_size(u64 size, u64 blk_size, enum string_size_units units, +void string_get_size(u64 size, u32 blk_size, enum string_size_units units, char *buf, int len); #define UNESCAPE_SPACE 0x01 diff --git a/lib/string_helpers.c b/lib/string_helpers.c index 5939f63..f6c27dc 100644 --- a/lib/string_helpers.c +++ b/lib/string_helpers.c @@ -26,7 +26,7 @@ * at least 9 bytes and will always be zero terminated. * */ -void string_get_size(u64 size, u64 blk_size, const enum string_size_units units, +void string_get_size(u64 size, u32 blk_size, const enum string_size_units units, char *buf, int len) { static const char *const units_10[] = { @@ -58,7 +58,7 @@ void string_get_size(u64 size, u64 blk_size, const enum string_size_units units, i++; } - exp = divisor[units] / (u32)blk_size; + exp = divisor[units] / blk_size; /* * size must be strictly greater than exp here to ensure that remainder * is greater than divisor[units] coming out of the if below. -- 2.4.3