From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E999C3DA7C for ; Sat, 24 Dec 2022 01:31:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236571AbiLXBbm (ORCPT ); Fri, 23 Dec 2022 20:31:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236444AbiLXBbQ (ORCPT ); Fri, 23 Dec 2022 20:31:16 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F62B2EFB8; Fri, 23 Dec 2022 17:30:23 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A310561FA3; Sat, 24 Dec 2022 01:30:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DABBC433F0; Sat, 24 Dec 2022 01:30:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671845414; bh=pQ9kLCTsb5EKb530KCcu7KaWdxbadgwvbpfzDbtxqrw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uRZazHd/vcZC9p9RNXUeQBugLWVgneHifmUYPhejZ6r+4xMDL+8jFI65UAfFgnyuy mvGsGocN2zDb6jOYiUm54qIxsOMGQHtuodfuZt4/AQkWO8KzzBgksvBX6gQcvt692d ewQr1JlbLwOdkGjaZucUw9okx6/fXfs6eaSJ1mq7VIpoqw0phv6SEjhBTur/iTiCmT kG6Wq20QXa8qoT2INOYnZeft1q35viSJCOUQOJLmek7QD/w8vEnaI2TzelVDYlVNNw 88j+jorI9gLssbgec30eex/sScnU7tbVjzUbJWA+HX+THEZQqHQj7lr19XuoQyF0Vs AiwRNqvbxVpAQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kees Cook , Greg Kroah-Hartman , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH AUTOSEL 6.1 14/26] devres: Use kmalloc_size_roundup() to match ksize() usage Date: Fri, 23 Dec 2022 20:29:18 -0500 Message-Id: <20221224012930.392358-14-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221224012930.392358-1-sashal@kernel.org> References: <20221224012930.392358-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kees Cook [ Upstream commit 6fcd7e702d3d91cc2c3194acffd7d67b2c10b81f ] Round up allocations with kmalloc_size_roundup() so that devres's use of ksize() is always accurate and no special handling of the memory is needed by KASAN, UBSAN_BOUNDS, nor FORTIFY_SOURCE. Cc: Greg Kroah-Hartman Cc: "Rafael J. Wysocki" Signed-off-by: Kees Cook Link: https://lore.kernel.org/r/20221018090406.never.856-kees@kernel.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/base/devres.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/base/devres.c b/drivers/base/devres.c index 4ab2b50ee38f..c0e100074aa3 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c @@ -101,6 +101,9 @@ static bool check_dr_size(size_t size, size_t *tot_size) size, tot_size))) return false; + /* Actually allocate the full kmalloc bucket size. */ + *tot_size = kmalloc_size_roundup(*tot_size); + return true; } -- 2.35.1