From patchwork Fri Jun 1 00:42:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10442203 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 111E8603D7 for ; Fri, 1 Jun 2018 00:43:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0BD1A28E43 for ; Fri, 1 Jun 2018 00:43:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 004A728E58; Fri, 1 Jun 2018 00:43:50 +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 6E1D828E43 for ; Fri, 1 Jun 2018 00:43:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F2DFF6B000D; Thu, 31 May 2018 20:43:45 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id D86C46B000E; Thu, 31 May 2018 20:43:45 -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 C72EA6B0010; Thu, 31 May 2018 20:43:45 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg0-f69.google.com (mail-pg0-f69.google.com [74.125.83.69]) by kanga.kvack.org (Postfix) with ESMTP id 871D36B000D for ; Thu, 31 May 2018 20:43:45 -0400 (EDT) Received: by mail-pg0-f69.google.com with SMTP id d1-v6so5568622pga.15 for ; Thu, 31 May 2018 17:43:45 -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=ZsXet6Fymf0wO5Ui/0SM21bQng4g15iJzLMz3qz4VeIF7gKNr/HBkkOGdE82XderPl 5KXFjup8gsPZsEwEe4Fl09JsNdSg6v5u3raSF0/JBzKs+bqozo8CXe+4KGuXbp6TMj18 x0n+SWlpNHj1mDIsMyRjkSpF9uYALLjS8oBhbQHQvzdU045/FZUH1IUD6Xv1/PJaHv1T QIhvgzB6X0nHBrBTYWfE7n3wRDbhTfVq43HCRHh3wXokmzs979pFEAse46E45hlsQdM/ ZhBcMD9azbsSwRCOWwxSaviuiUbU22dhzlsZi6GjRg/ajhcyG9N2cQ4xhrsq2huvjY7t X6tw== X-Gm-Message-State: ALKqPwffcclU+K8LvXSyMtiJ7JTPllpAmtLetsT8viZk5AE4qEicWwCL 0AY019+WWPB+9ofbbR4EdeQt252SWGGD+gIok8OovYNXoHHQykNEvtuiR6m0BDWhrD1fS1jv/Uv YaGPqiTGYci/8VNVPPjYa83BKNWMN1jy20tAv5vIGRQacmnEAafpwjOVVZc6s55GTgefEyYTdzv 7Y41nUSa3mPP3Do95rIOFKiuaNnbYfRd1LNYsxRo72+4MEhpzYpD5L3ygQSTtelSknp+AqSaVTv atGrrsIn7s0ZZUyew9K5pRWh5V6/jN4I5SHfoBxH6a8M+IH+gJL1lIIybZnysh3UVdXtl5PcGsI g33OdpfUAaLDH4XS0jx3MX3YOErJoNFevSDqT8Eq6kXkdhrrjOH7wqjfyhqUwOYw+c036mvzQoo C X-Received: by 2002:a17:902:64cf:: with SMTP id y15-v6mr9089713pli.53.1527813825239; Thu, 31 May 2018 17:43:45 -0700 (PDT) X-Received: by 2002:a17:902:64cf:: with SMTP id y15-v6mr9089678pli.53.1527813824359; Thu, 31 May 2018 17:43:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527813824; cv=none; d=google.com; s=arc-20160816; b=aUOjvD1HIOp+u+3wZdlLVqXCvdJ7xcUyAEOkcUzOGut5ygvPvnRctI0JO2cQEp4v8U JpijNmNmv+FreDtvbg5pvl15eRrgDjyr3yElEaYVsHOI4soP4pRpl7Epnbw6gwFeccB+ UQUEoyb+lADn2g4lpdzho7vlpkVIVl0fkg2puww2U+xSqYPFpky0ee/S381RLGTzFfrs qltQk+dFvyGu4AAHyP1eXEJeMjBVPLvWXraYmBG7Ozla9CcRmoqndp067XE7dw2bUcg+ KWVR4AzjTGgN7696LaKw0MtgmDKQTbS26PXWFuE+0kD6uFizg6C561JPX6rLRfsGrCQB lQsw== 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=lIAnjbb2OUXdZtxbbp/X5V0PwOxBLnVreIZGZKhYcS3O7eV+t5mYMDT0pLLlt1r1OG OIeU1+r7EWbSuSfL83FqSWgXFiKjxrNtIjZNIjq3Z+cA2leMYu5RbhU7iFQuHMabmgHm MT1fwcms1RfA6p7LRJwreLopQaGCVg9djMSUgHoWOSrIXeN3+Keul4GiK9LMPHSnoTf4 YZre49GDqTU2HxhbD5yUI/OdEWNTaSF2EX5g0EYGMI+anzk0yCd+pDgXEcohOP+EsQU7 8nC/9JDNQMhZTPtetIA9j6gAtGyOZgAG2PwniNx2W6DkcNvztBen4jt4woVT7cRbQt7J xrcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=EXk+RP02; 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 p62-v6sor4179151pfj.101.2018.05.31.17.43.44 for (Google Transport Security); Thu, 31 May 2018 17:43:44 -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=EXk+RP02; 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=EXk+RP02joUquARcmSVcxcz4nKFrbdlzGalSKg6hr5iZk/ZU/Q7uJ9z27PBYhgt5t6 ZIpLmd1Y5rsCW9ow02Uzsatv8F8+RbQYLlesVlcQLldRzBcXCussCqEC95exlPTSI0kR mSOsvWzoZr7aguf2+Gpru7gEjm0HHG07LT/34= X-Google-Smtp-Source: ADUXVKLMrKRSE4/s7HVmnLXp3WMkLCLxX5QpUKWNicT1OIr8m5ZGikdbvvNY5/9nN5TR6fKkXLZNtg== X-Received: by 2002:a62:d712:: with SMTP id b18-v6mr8811422pfh.70.1527813824083; Thu, 31 May 2018 17:43:44 -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 u9-v6sm73623048pfi.60.2018.05.31.17.43.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 May 2018 17:43:41 -0700 (PDT) From: Kees Cook To: Matthew Wilcox Cc: Kees Cook , Linus Torvalds , Rasmus Villemoes , Matthew Wilcox , LKML , Linux-MM , Kernel Hardening Subject: [PATCH v3 04/16] overflow.h: Add allocation size calculation helpers Date: Thu, 31 May 2018 17:42:21 -0700 Message-Id: <20180601004233.37822-5-keescook@chromium.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180601004233.37822-1-keescook@chromium.org> References: <20180601004233.37822-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 */