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 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 AACCEC4332F for ; Mon, 30 May 2022 13:33:28 +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=EaBrLyIkQ0JrwcDnLQcbaQ13WjisZzylVIGAY6S3I5w=; b=LrhL9+wf3cFBFd NhGk7/8IqOSccio64jYGyxe4vY4l57BXaB5Q7yBRAitmMyNvET+dv5xPXLLQy1+6YmcahzzJjTNgx ASzeEBvWn3LDlWRueF0Ug7hFUjMG6RfcSDrv4vHtygceJsk7O5qWPT0E788fbLmKal2dp+mnFTPoy uW7sANVuVTaFBYY5QOmJIIDCz1ypWVKJ+SruGnOpilBlohFvnPFvL4gnHaJbPbiw38ZaAXd22MGUa qAqZKzO7KsTUDgLI+FU86D04i5kHtqP1piGQorwOKv/a6ML1rpS0IW/TV2yr4Ow9bfbtKlhPnDcVV 7pWGOMqPINYuGjZT/TWw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nvfV6-006jZr-Vp; Mon, 30 May 2022 13:32:05 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nvfSk-006iAl-Fc; Mon, 30 May 2022 13:29:41 +0000 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 0813560F14; Mon, 30 May 2022 13:29:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2B5BEC3411C; Mon, 30 May 2022 13:29:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653917377; bh=phB7LXbMznbVSVQXBgVCBso+VRteL7PNg//ZRtMP2a8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vr79skjFFK/kJnhqLUgBGm9AwBPwuKxAjcw8wDBCnBtLtT/vGto/4RxVsLq2Nqa1R xHe3ZkH/qFKLl0OcEFjyqgmKpO5QsodlpxII/WYSk2PXzlr8n6FRVBA0bUawHLo44X IfSVv3/tNaEAZ9SAwrmCcWjqZ9hlb4gs6biO4XWEJnZpdSSQjjRoJ9IukAVKM7ql0Q aRlFxzyRtLFQPQp43cyufveRnEkMW+XorPA+YYgod6IoPeddbWFS3ERVz4YpyObv0h POTXoPUrkmKuqJej5ZcWj+vlCityAQhvTibMe5JLUMbb2D7x6KlptynVtVHdZhhoOx Jr1/Fs3BLi29A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hangyu Hua , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin , jacob-chen@iotwrt.com, ezequiel@vanguardiasur.com.ar, heiko@sntech.de, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.18 112/159] media: rga: fix possible memory leak in rga_probe Date: Mon, 30 May 2022 09:23:37 -0400 Message-Id: <20220530132425.1929512-112-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220530132425.1929512-1-sashal@kernel.org> References: <20220530132425.1929512-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220530_062938_613832_3976807F X-CRM114-Status: GOOD ( 13.18 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Hangyu Hua [ Upstream commit a71eb6025305192e646040cd76ccacb5bd48a1b5 ] rga->m2m_dev needs to be freed when rga_probe fails. Signed-off-by: Hangyu Hua Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/rockchip/rga/rga.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c index 3d3d1062e212..2f8df74ad0fd 100644 --- a/drivers/media/platform/rockchip/rga/rga.c +++ b/drivers/media/platform/rockchip/rga/rga.c @@ -865,7 +865,7 @@ static int rga_probe(struct platform_device *pdev) ret = pm_runtime_resume_and_get(rga->dev); if (ret < 0) - goto rel_vdev; + goto rel_m2m; rga->version.major = (rga_read(rga, RGA_VERSION_INFO) >> 24) & 0xFF; rga->version.minor = (rga_read(rga, RGA_VERSION_INFO) >> 20) & 0x0F; @@ -881,7 +881,7 @@ static int rga_probe(struct platform_device *pdev) DMA_ATTR_WRITE_COMBINE); if (!rga->cmdbuf_virt) { ret = -ENOMEM; - goto rel_vdev; + goto rel_m2m; } rga->src_mmu_pages = @@ -918,6 +918,8 @@ static int rga_probe(struct platform_device *pdev) free_dma: dma_free_attrs(rga->dev, RGA_CMDBUF_SIZE, rga->cmdbuf_virt, rga->cmdbuf_phy, DMA_ATTR_WRITE_COMBINE); +rel_m2m: + v4l2_m2m_release(rga->m2m_dev); rel_vdev: video_device_release(vfd); unreg_v4l2_dev: -- 2.35.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel