From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 24 Apr 2024 09:09:08 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rzWke-00ER47-2c for lore@lore.pengutronix.de; Wed, 24 Apr 2024 09:09:08 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rzWkc-0006NF-LC for lore@pengutronix.de; Wed, 24 Apr 2024 09:09:08 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=IoHaCuKlC9lrdyIz+xPo8nER2QD2wc1HEUkfzMcjy0c=; b=aUaeMW90nkSE83REl8vrx7lNLR 2/FrmwzxZrtqoXCFSnfBpLrwXS2oMegWk0nbSO43ObPwbWsV70si/1kl9B7O2QF147gupjq+hxEon HuaqTI3CnDToGc5ilEkNWgthT/BrBdLvX7wDTRsqLjdAM74PQu7LYK43/iSjcKAFxR9164NNGV9yJ JR7Ib2wAEvaIznkEySKkvMptMYJ3wwur7w8CiB7zpgPnaFF1JBWlr3VjLVTrgxV/8k3kRdhdVvKTs kGpsemtvZP8qDJ/WNsalQ5PqRnJPiNxv7vPu9IzflFGTojbDotPU9z+jobLZD36UKN9JugBNYd7V5 EAmhvFow==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rzWk6-00000003215-1wQt; Wed, 24 Apr 2024 07:08:34 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rzWjx-000000031t6-0jYp for barebox@lists.infradead.org; Wed, 24 Apr 2024 07:08:28 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rzWjv-0005cF-Ns; Wed, 24 Apr 2024 09:08:23 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rzWjv-00E24Z-9c; Wed, 24 Apr 2024 09:08:23 +0200 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1rzWJT-00F8kt-1K; Wed, 24 Apr 2024 08:41:03 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Enrico Scholz , Ahmad Fatoum Date: Wed, 24 Apr 2024 08:40:45 +0200 Message-Id: <20240424064058.3608016-11-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240424064058.3608016-1-a.fatoum@pengutronix.de> References: <20240424064058.3608016-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240424_000825_636177_C0FEFEBD X-CRM114-Status: GOOD ( 10.21 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.4 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH master 10/23] include: linux/slab: fix possible overflow in kmalloc_array X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) If we are unlucky, n * size would overflow size_t and we'll instead allocate a small truncated value, which may lead to memory corruption. Fix this by using size_mul, which saturates at SIZE_MAX. Signed-off-by: Ahmad Fatoum --- include/linux/slab.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/linux/slab.h b/include/linux/slab.h index dc80808938f4..36b93bdd2f1b 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -4,6 +4,7 @@ #define _LINUX_SLAB_H #include +#include #include #define SLAB_CONSISTENCY_CHECKS 0 @@ -98,7 +99,7 @@ static inline void *kzalloc(size_t size, gfp_t flags) */ static inline void *kmalloc_array(size_t n, size_t size, gfp_t flags) { - return kmalloc(n * size, flags); + return kmalloc(size_mul(n, size), flags); } static inline void *kcalloc(size_t n, size_t size, gfp_t flags) -- 2.39.2