From patchwork Wed Oct 16 13:02:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 13838459 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 4573FD1AD55 for ; Wed, 16 Oct 2024 13:07:22 +0000 (UTC) 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=L94I5CM+hQh+Wsef3g+krYpG3LMzpJKsa58lVNX+5SA=; b=ZW0FYIKspiS3uWz+SPrkwm/NrW dwTOlC1zKxe5HWNuVk4t++5WZxEzFavHYxz3o596ftClrv3v5JNUoQYQZN9uxElHP2MYcSchUTG9H N/vMf6qeAQL9BGyzexfl0o9h/Rgcy6dNLwvnu51ESp14xamTwgKpPGpmfehU7L3WrQ06NXyQs3Zy2 OkeWQVw03S/VIJ7Nh4KSLqGsmDhMw30MVukVCQMDFjlIwYtuiov3cuwlF6R1QJTPtSjvdL/PokQv/ Ea7hi1F/o5qt3xh6pJiMvR++2JAGdONjJpkNV28ZSDR3S+dJojjRbFRCQM8Xi9tLohOW9qxbO655z 4lRPh4vw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t13k4-0000000Bs2E-47pM; Wed, 16 Oct 2024 13:07:09 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t13fl-0000000BrMa-0iJ2; Wed, 16 Oct 2024 13:02:43 +0000 Received: from umang.jain (unknown [IPv6:2405:201:2015:f873:55d7:c02e:b2eb:ee3f]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 21533F86; Wed, 16 Oct 2024 15:00:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1729083656; bh=eFZWbOo+TJEgq/Jip7gO5D6X+BXYGORK47hl/bD23Ec=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cF4pGfVNL10E8IRO47Cp96CaNFhK5FCkk7fM0g1yOKYCHXKFpPa5lGY6POiXVJR8e j4Zj3qwMWy/keHdk9pWH8tUCQ8RCoSaCBdSm//8DQHrPvQFtBf1KVOLIv3n8siionG 1bdxZnCsgj00p/pIOuQmxKlirjifL1h/E7g7ZHew= From: Umang Jain To: Greg Kroah-Hartman , Broadcom internal kernel review list Cc: linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Kieran Bingham , Laurent Pinchart , Stefan Wahren , kernel-list@raspberrypi.com, Umang Jain , stable@vger.kernel.org, Dan Carpenter Subject: [PATCH v4 2/2] staging: vchiq_arm: Use devm_kzalloc() for drv_mgmt allocation Date: Wed, 16 Oct 2024 18:32:25 +0530 Message-ID: <20241016130225.61024-3-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241016130225.61024-1-umang.jain@ideasonboard.com> References: <20241016130225.61024-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241016_060241_373067_1F388B8C X-CRM114-Status: GOOD ( 10.46 ) 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 The struct drv_mgmt 'mgmt' is currently allocated dynamically using kzalloc(). Unfortunately, it is subjected to memory leaks in the error handling paths of the probe() function. To address this issue, use device resource management helper devm_kzalloc(), to ensure cleanup after the allocation. Cc: stable@vger.kernel.org Fixes: 1c9e16b73166 ("staging: vc04_services: vchiq_arm: Split driver static and runtime data") Signed-off-by: Umang Jain Reviewed-by: Dan Carpenter --- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c index 7ece82c361ee..8412be7183fc 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -1343,7 +1343,7 @@ static int vchiq_probe(struct platform_device *pdev) return -ENOENT; } - mgmt = kzalloc(sizeof(*mgmt), GFP_KERNEL); + mgmt = devm_kzalloc(&pdev->dev, sizeof(*mgmt), GFP_KERNEL); if (!mgmt) return -ENOMEM; @@ -1397,8 +1397,6 @@ static void vchiq_remove(struct platform_device *pdev) arm_state = vchiq_platform_get_arm_state(&mgmt->state); kthread_stop(arm_state->ka_thread); - - kfree(mgmt); } static struct platform_driver vchiq_driver = {