From patchwork Tue Oct 27 13:48:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 313114 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 EBEB5C388F9 for ; Tue, 27 Oct 2020 13:57:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A8A0221655 for ; Tue, 27 Oct 2020 13:57:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603807051; bh=0lCCpahTBNuXu2xc+K/yXybvTM+ozJ1f/gEnyV0NCIw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yniFGw8joS2NpLcpWfI9awnHLN1lyOHdHsYMqsyujSP7kFUBUfKluHhGXWJFED8K5 0DYRSccH5WOHIm/vLaiUbNJSaDOf+8KtBjkxArLGNu/MvGM4EAWy0GqP321a/bhPK2 XPKroQk9ZjMtmQAnRasaBvbOKMKh33x9Eb5y+vAw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752883AbgJ0N5a (ORCPT ); Tue, 27 Oct 2020 09:57:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:44280 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752878AbgJ0N53 (ORCPT ); Tue, 27 Oct 2020 09:57:29 -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 52A692072E; Tue, 27 Oct 2020 13:57:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603807048; bh=0lCCpahTBNuXu2xc+K/yXybvTM+ozJ1f/gEnyV0NCIw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1sD4FnJm7LtPeC8PWyBh8mjYtGnV1avZSd6vnwneLQKHl5fYxwi9fnfuWd3rYqBB/ WM+pgUUM4+hk1Fj8CsOFysGsTbo7UBo7vdQR9VloTfBNOPShlGDH+orLUalQAsjyPf 7vioB84ErIcTM0Sqa9+1nb7f3pB2aXM7RAVxsieo= 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 4.4 023/112] media: omap3isp: Fix memleak in isp_probe Date: Tue, 27 Oct 2020 14:48:53 +0100 Message-Id: <20201027134901.664945159@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027134900.532249571@linuxfoundation.org> References: <20201027134900.532249571@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 f41e0d08de93e..4c6842202e47c 100644 --- a/drivers/media/platform/omap3isp/isp.c +++ b/drivers/media/platform/omap3isp/isp.c @@ -2388,8 +2388,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);