From patchwork Wed May 9 20:02:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10390749 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2ACBA60353 for ; Wed, 9 May 2018 20:02:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 09973286B0 for ; Wed, 9 May 2018 20:02:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 081A3286B1; Wed, 9 May 2018 20:02:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 38291286F7 for ; Wed, 9 May 2018 20:02:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A97B66B057E; Wed, 9 May 2018 16:02:37 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A1F7A6B057F; Wed, 9 May 2018 16:02:37 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8C2066B0580; Wed, 9 May 2018 16:02:37 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f70.google.com (mail-pl0-f70.google.com [209.85.160.70]) by kanga.kvack.org (Postfix) with ESMTP id 46A2D6B057E for ; Wed, 9 May 2018 16:02:37 -0400 (EDT) Received: by mail-pl0-f70.google.com with SMTP id o23-v6so4259073pll.12 for ; Wed, 09 May 2018 13:02:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=NrIBfyyqyx8jb8dbKBswbeGqrEMLMvOWV2ml3aS6UOY=; b=IunyJ5BcJNlU1ytPvhHbnJXlnfPKrNuY3UgQeqdXBqn3WasSK4DyLdi1eXwjdhYg1I hIk3mtfBYpLIXcEgcxxahVfqFXbhPcWbbDA2gmLfLCdWpozhELptTkIO/ed/JKFVqX+V WLm8bvWngOQbLCBcWxj9oxjgvSslcLfgT0r0n+SdN8Dr5oN0SgeOp4QWKrNe9h6HR/XV 3Vckw4D42Rnf3UcvyRGcwp9ON0LdP4QSIQxvgBqsWhIi4vCizDuJO03uv02aeVwp13qs mnrBqP9JVSJ2LrIboGOopTFR0dtpR/kRcG6bmEAEYH8blR5QC7IMz5VLlqXQZfYr8MGo RAlg== X-Gm-Message-State: ALQs6tCqTM3nGGUR2tv6iGvFabH947UuVLI2ivyEl3ocNTSvfcqpPQu4 9vDcXCt4/EuOKVLxUszBh77dCeS+Nm6lFWvD0tjWO3cW7uTQbzMe6wGadq3q37SRn+bBXuU/ULm 35yC/d/+p/CCjFzUZ9i3ZgRHBJIzYuwgOGFxUKqSKIOrfG5mPwZbad+37yWVlXKgun9CJYmZTYB /oJPhBEy9LYdtKqgl7vg5Vts3bEGJhtls9NTGxKZm7t1gY/BPBqQU7qSX1QjbP0Z9rYgmPGV3mw e7bJheSAMXVtufhUTYutyL+Mgu/pdSkNw9RLaVjow4urSMmguo5IqLWUD2e1aHZUhQpZKhyQlfT Tkd2njKK78/O47AtoXWqKPjqJYf6A00P9M0q7QNSQU10nga7GYbbV849FOBHSpqoRK5MJlUHxZK 6 X-Received: by 2002:a65:5c88:: with SMTP id a8-v6mr36143700pgt.373.1525896156853; Wed, 09 May 2018 13:02:36 -0700 (PDT) X-Received: by 2002:a65:5c88:: with SMTP id a8-v6mr36143641pgt.373.1525896155634; Wed, 09 May 2018 13:02:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525896155; cv=none; d=google.com; s=arc-20160816; b=O5tKVFcmiHZRwWCiBC921GsdFc587npVohtf6kSUHCkXw5DGKMLYGucHU3ZZ5QtzoG vqA9ZF+nqXAE2zpHWEnCLtVBHehAIb20Xbxtp3G7wvrW2gVbpBFOZONeE9QQMhwzB/tg vQLtSx9LJIasT2Wf2ilM3FE9FryU1HOoOPNsuk8e8FbL++VE3wm19CcVffnwTgm3W686 LjMBX6D97neeg4fhp8ZlYbrw+bCFo3mdyzl1ujIa1a0UgKyVX/4IybgBipNk21wU3Tld LE5ON3M0QI8lsqzJD2T+xzCXNH/pCXm3fNYLFNXCa9xHkrVZPBqXzIXVnwTZVhzhutZb 5FgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=NrIBfyyqyx8jb8dbKBswbeGqrEMLMvOWV2ml3aS6UOY=; b=rcVX0KubKlIg5NIIc5UNAYvMj2H7wJRXXi7U8ic4teZL0J0bMkLimc501NZYpevGfa pkUL+aP4F0ts4mNXhIWjA/Hp3XnbqqlTzBpKAbW9Ey7awVmXaNJKqJPyDiWeJ2t09L7q xYU6B0AjRqkvtViGS3G56CnO2QWw34q131DnbrhMhDKHbK2IFSH+N1A3fqn8BF71s7kn 0hrDVRybXCIB3KNdj13j+v8m7Q2vYg659JDMm9iRoWTx7IV0bostN/8MT5iHEesZVGnR nruDHuPvaX+y6UCIrC4WTR1nJmWzUZbcMBf5ZvWhhRD2JHJKmaw7ok+f9vUeoCuQbdsQ mb4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=TdHN+xy/; spf=pass (google.com: domain of keescook@chromium.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=keescook@chromium.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id u19-v6sor2988157pgv.304.2018.05.09.13.02.35 for (Google Transport Security); Wed, 09 May 2018 13:02:35 -0700 (PDT) Received-SPF: pass (google.com: domain of keescook@chromium.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=TdHN+xy/; spf=pass (google.com: domain of keescook@chromium.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=keescook@chromium.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NrIBfyyqyx8jb8dbKBswbeGqrEMLMvOWV2ml3aS6UOY=; b=TdHN+xy/C3ZaS4Uj4jaeDn/pIxm/u+cvxhzJj/p0MrKQCXdxhg0ccayHRM3+hkgXe8 dyIB6iCdbyPnXG20jVmrUp15OiLfI6UXFKmm+mc2QC+kp1euHJlux4byKas3VVCHFMyx pRQff74b/dUAgJ+aERJJoPFb699PT4LK4xB/Y= X-Google-Smtp-Source: AB8JxZpxxdaO3aUFb7uNIRCR0P036CSV0TW+q198g6+QJoFcrEXepADotHqHAH/uxJ4RdROUKS2f1Q== X-Received: by 2002:a65:6188:: with SMTP id c8-v6mr37001282pgv.131.1525896155022; Wed, 09 May 2018 13:02:35 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id g76sm58372078pfj.102.2018.05.09.13.02.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 May 2018 13:02:33 -0700 (PDT) From: Kees Cook To: Matthew Wilcox Cc: Kees Cook , Rasmus Villemoes , Matthew Wilcox , LKML , Linux-MM , Kernel Hardening Subject: [PATCH v2 3/6] overflow.h: Add allocation size calculation helpers Date: Wed, 9 May 2018 13:02:20 -0700 Message-Id: <20180509200223.22451-4-keescook@chromium.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180509200223.22451-1-keescook@chromium.org> References: <20180509200223.22451-1-keescook@chromium.org> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP In preparation for replacing unchecked overflows for memory allocations, this creates helpers for the 3 most common calculations: array_size(a, b): 2-dimensional array array3_size(a, b, c): 3-dimensional array struct_size(ptr, member, n): struct followed by n-many trailing members Each of these return SIZE_MAX on overflow instead of wrapping around. (Additionally renames a variable named "array_size" to avoid future collision.) Co-developed-by: Matthew Wilcox Signed-off-by: Kees Cook --- drivers/md/dm-table.c | 10 +++--- include/linux/overflow.h | 73 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 5 deletions(-) diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index 0589a4da12bb..caa51dd351b6 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c @@ -548,14 +548,14 @@ static int adjoin(struct dm_table *table, struct dm_target *ti) * On the other hand, dm-switch needs to process bulk data using messages and * excessive use of GFP_NOIO could cause trouble. */ -static char **realloc_argv(unsigned *array_size, char **old_argv) +static char **realloc_argv(unsigned *size, char **old_argv) { char **argv; unsigned new_size; gfp_t gfp; - if (*array_size) { - new_size = *array_size * 2; + if (*size) { + new_size = *size * 2; gfp = GFP_KERNEL; } else { new_size = 8; @@ -563,8 +563,8 @@ static char **realloc_argv(unsigned *array_size, char **old_argv) } argv = kmalloc(new_size * sizeof(*argv), gfp); if (argv) { - memcpy(argv, old_argv, *array_size * sizeof(*argv)); - *array_size = new_size; + memcpy(argv, old_argv, *size * sizeof(*argv)); + *size = new_size; } kfree(old_argv); diff --git a/include/linux/overflow.h b/include/linux/overflow.h index c8890ec358a7..8712ff70995f 100644 --- a/include/linux/overflow.h +++ b/include/linux/overflow.h @@ -202,4 +202,77 @@ #endif /* COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW */ +/** + * array_size() - Calculate size of 2-dimensional array. + * + * @a: dimension one + * @b: dimension two + * + * Calculates size of 2-dimensional array: @a * @b. + * + * Returns: number of bytes needed to represent the array or SIZE_MAX on + * overflow. + */ +static inline __must_check size_t array_size(size_t a, size_t b) +{ + size_t bytes; + + if (check_mul_overflow(a, b, &bytes)) + return SIZE_MAX; + + return bytes; +} + +/** + * array3_size() - Calculate size of 3-dimensional array. + * + * @a: dimension one + * @b: dimension two + * @c: dimension three + * + * Calculates size of 3-dimensional array: @a * @b * @c. + * + * Returns: number of bytes needed to represent the array or SIZE_MAX on + * overflow. + */ +static inline __must_check size_t array3_size(size_t a, size_t b, size_t c) +{ + size_t bytes; + + if (check_mul_overflow(a, b, &bytes)) + return SIZE_MAX; + if (check_mul_overflow(bytes, c, &bytes)) + return SIZE_MAX; + + return bytes; +} + +static inline __must_check size_t __ab_c_size(size_t n, size_t size, size_t c) +{ + size_t bytes; + + if (check_mul_overflow(n, size, &bytes)) + return SIZE_MAX; + if (check_add_overflow(bytes, c, &bytes)) + return SIZE_MAX; + + return bytes; +} + +/** + * struct_size() - Calculate size of structure with trailing array. + * @p: Pointer to the structure. + * @member: Name of the array member. + * @n: Number of elements in the array. + * + * Calculates size of memory needed for structure @p followed by an + * array of @n @member elements. + * + * Return: number of bytes needed or SIZE_MAX on overflow. + */ +#define struct_size(p, member, n) \ + __ab_c_size(n, \ + sizeof(*(p)->member) + __must_be_array((p)->member),\ + sizeof(*(p))) + #endif /* __LINUX_OVERFLOW_H */