From patchwork Thu Mar 9 15:03:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Clark X-Patchwork-Id: 13167732 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D9844C61DA4 for ; Thu, 9 Mar 2023 15:22:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=b1oJrb6CUgzgaZ3EnQIIgTM1FNlSHwQ0NtkbeLorjt0=; b=et7VbOXCGjVDV8 G3IekphPdvMazkcpTX/yIguOcQtqMb+8tmcEM4odh0nH0CbuChKlpYohU6z8ObPRE/D7ktbTpcyrE LtkGNdbEncHFsMjcTHdkTRYb1K7gf6tY2mKdD4Tx+eHyAU6okQZj/4cyPIJescrbp5KQHT4q0RRnc sEQIE0Pjm6Jaj4rUDLXqqOLw7POwJ6/mf7Xl5hVCsiBN7KpxuPu5Li/V0sJMkUqtBdJ6cpee33U/0 R/JJpvwsFKuolm1dcgRVjB5y4cosCLjHf3lPqaBnE0C7kc3OPg+LcrXwEb1Mpl+cr+IIGhqe0eJg/ PM/pHrj1vsmd3FvuZqgw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1paI5F-00ArMg-Hz; Thu, 09 Mar 2023 15:21:33 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1paHo5-00AlRj-3a for linux-arm-kernel@lists.infradead.org; Thu, 09 Mar 2023 15:03:50 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CF6CEFEC; Thu, 9 Mar 2023 07:04:29 -0800 (PST) Received: from e127643.arm.com (unknown [10.57.48.23]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 5324F3F5A1; Thu, 9 Mar 2023 07:03:43 -0800 (PST) From: James Clark To: linux-kernel@vger.kernel.org, linux@roeck-us.net, michal.simek@amd.com Cc: James Clark , Jonathan Corbet , Jean Delvare , Anand Ashok Dumbre , Jonathan Cameron , Lars-Peter Clausen , Michal Simek , Andy Gross , Bjorn Andersson , Konrad Dybcio , Greg Kroah-Hartman , Jiri Slaby , linux-doc@vger.kernel.org, linux-hwmon@vger.kernel.org, linux-iio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org Subject: [PATCH v2 1/4] devres: Provide krealloc_array Date: Thu, 9 Mar 2023 15:03:30 +0000 Message-Id: <20230309150334.216760-2-james.clark@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230309150334.216760-1-james.clark@arm.com> References: <20230309150334.216760-1-james.clark@arm.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230309_070349_227319_C7AE0F19 X-CRM114-Status: UNSURE ( 8.73 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org There is no krealloc_array equivalent in devres. Users would have to do their own multiplication overflow check so provide one. Signed-off-by: James Clark Reviewed-by: Jonathan Cameron --- Documentation/driver-api/driver-model/devres.rst | 1 + include/linux/device.h | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/Documentation/driver-api/driver-model/devres.rst b/Documentation/driver-api/driver-model/devres.rst index 4249eb4239e0..8be086b3f829 100644 --- a/Documentation/driver-api/driver-model/devres.rst +++ b/Documentation/driver-api/driver-model/devres.rst @@ -364,6 +364,7 @@ MEM devm_kmalloc_array() devm_kmemdup() devm_krealloc() + devm_krealloc_array() devm_kstrdup() devm_kstrdup_const() devm_kvasprintf() diff --git a/include/linux/device.h b/include/linux/device.h index 1508e637bb26..0dd5956c8516 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -223,6 +223,16 @@ static inline void *devm_kcalloc(struct device *dev, { return devm_kmalloc_array(dev, n, size, flags | __GFP_ZERO); } +static inline __realloc_size(3, 4) void * __must_check +devm_krealloc_array(struct device *dev, void *p, size_t new_n, size_t new_size, gfp_t flags) +{ + size_t bytes; + + if (unlikely(check_mul_overflow(new_n, new_size, &bytes))) + return NULL; + return devm_krealloc(dev, p, bytes, flags); +} + void devm_kfree(struct device *dev, const void *p); char *devm_kstrdup(struct device *dev, const char *s, gfp_t gfp) __malloc; const char *devm_kstrdup_const(struct device *dev, const char *s, gfp_t gfp);