From patchwork Tue Oct 27 13:50:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 307049 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B8257C388F9 for ; Tue, 27 Oct 2020 17:43:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 651A820578 for ; Tue, 27 Oct 2020 17:43:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603820619; bh=FgPRMoSunv3G1y1M1ozPMDrfOB2t6eK1RvgOyrdsDlQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=W/cGLc9SWLB1W0T+/03+fjsITFfTMM2xMDqZDtvHGtw/26aJ8hDefDIo7JBiuNUw+ UjLoUmPLQhWx06xhYE9MA6jBYJbBvAqTk3zFGWY/C79/Z1SxtST14eDN01yMw+QjZ6 wnGtzFMQwz1wnhjVCMHYBtBavbx8MDbToYgqrTmA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1821406AbgJ0Rnh (ORCPT ); Tue, 27 Oct 2020 13:43:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:58732 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2902264AbgJ0Obw (ORCPT ); Tue, 27 Oct 2020 10:31:52 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 00D4F206DC; Tue, 27 Oct 2020 14:31:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603809111; bh=FgPRMoSunv3G1y1M1ozPMDrfOB2t6eK1RvgOyrdsDlQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OFnqupJK1eizZ5LkilImDfYYGUrE8JheRJIDzb/usNLJqiJzC/WC0qohoTJvqm+6V BE5UJP6a3Y17mHtsoGHcFoMqeifkva7XwPz/37WzTBbglI/cI1ttCT4SupLciQIYNr 96YDrOafx4q0OVXR8BxvDXi1+YFP3+xubhK73na0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dinghao Liu , Sakari Ailus , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.4 078/408] media: omap3isp: Fix memleak in isp_probe Date: Tue, 27 Oct 2020 14:50:16 +0100 Message-Id: <20201027135458.675919186@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135455.027547757@linuxfoundation.org> References: <20201027135455.027547757@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dinghao Liu [ Upstream commit d8fc21c17099635e8ebd986d042be65a6c6b5bd0 ] When devm_ioremap_resource() fails, isp should be freed just like other error paths in isp_probe. Fixes: 8644cdf972dd6 ("[media] omap3isp: Replace many MMIO regions by two") Signed-off-by: Dinghao Liu Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/omap3isp/isp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c index 327c5716922ac..dce6b3685e135 100644 --- a/drivers/media/platform/omap3isp/isp.c +++ b/drivers/media/platform/omap3isp/isp.c @@ -2330,8 +2330,10 @@ static int isp_probe(struct platform_device *pdev) mem = platform_get_resource(pdev, IORESOURCE_MEM, i); isp->mmio_base[map_idx] = devm_ioremap_resource(isp->dev, mem); - if (IS_ERR(isp->mmio_base[map_idx])) - return PTR_ERR(isp->mmio_base[map_idx]); + if (IS_ERR(isp->mmio_base[map_idx])) { + ret = PTR_ERR(isp->mmio_base[map_idx]); + goto error; + } } ret = isp_get_clocks(isp);