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 X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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 E04FACA9EB9 for ; Sat, 26 Oct 2019 04:25:38 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 97738214DA for ; Sat, 26 Oct 2019 04:25:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="LkEZ2GNF"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gZRJSPMG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 97738214DA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=osnWc9An7V4/DzV19StO9MwfHeuKS95b2JPi8il9jZ0=; b=LkE Z2GNFLBcrc86e90pfoaWhlxFZjM0sZK2CDTG3+42Bx6PQci9XGeDD+qGO0vITOL1aHRoVON6/hrCB /dVISZCsctidCfACiJkRADcO19KeFih5jR53B9lBe1TfL4AUebg1+kfHci0PQRudtohwXY94cgBdl g/tTXot1OQnDaM3OYUbVGjzDh3nIKBN+iSj+aXtQFUfRqESWAPtAxveEC860nf5KD4mDp1u9v93OZ CoJ0y1024jD2lfAA16tuNQIGv0atT00/x2zNrgWhsFBl5f7GzfILFGmodP53D7TxcEjibKuzkKvaQ 8FJ5MT5gjcmxXNLjBc0k8fjbFhAtfmw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iODdx-0007iL-EK; Sat, 26 Oct 2019 04:25:37 +0000 Received: from mail-io1-xd41.google.com ([2607:f8b0:4864:20::d41]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iODdu-0007hs-BZ for linux-arm-kernel@lists.infradead.org; Sat, 26 Oct 2019 04:25:35 +0000 Received: by mail-io1-xd41.google.com with SMTP id p6so4718589iod.7 for ; Fri, 25 Oct 2019 21:25:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=rHeRkxrHD5GX5EWDlQ98vXy+a783uwWXtM2tQKGXdug=; b=gZRJSPMGxM1UPw1FdEvVFtbG4SqDkm9JN/GP92+GDY/bQVm73xFX5T2lkdkRAXJ9uw 4K927+DEPOjX0v2NhbOsDZjCOyTgg/PgzXqgwivEM6QeBnGHV0CLxMfG1XeHJninS6Jn d3HUaWWFRPVWG+u/urTqRNtrGbQyLiZdTXq6MhvYlWjtoC7vQBAz3Rn6Mb3cxkdt1/Po nUZHC0Eiw1kMMsF1PkX5MSMnY53N8J0Q3vB8vM9pSuefryXU7vr8bduXoiI452R8NKud SwAzjj4yI/LFANHdC8I/m+7ITtp+iUIKP8EtGIgHjMBdZ+gFerdXZYr/VS+jNVHKs/wb 4H6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=rHeRkxrHD5GX5EWDlQ98vXy+a783uwWXtM2tQKGXdug=; b=GUfmK+jX2DWxmAeTooCK0gQjO1hAMuaLJsueF5X6BDF6eGcGXEKbSV9OBmUnlyfT34 2EJQ+vfeizl/V+0OhIpcihYOcVnn+pa+7s0QZI5kgKHCwvOrS/rappfxFTbNCZYyOJNT gDiZ/qiJ+RRDMflUoVQNYs0COqnLuK8dfmuGvBAgk/jQ6RCsIj0n0DfhBAeG7EW4DG/C 7toUy81EoUcqqa7lOCsB/wG34t9+hrXI8GsF+qRdlcnHi+Zxv61SkpUsivytOEZiLl7/ pjbvLvPFxsX8ycViuFrsa+7Ccie6c/rwFBkfMzEOpq8YceLTreI8+Lxm0Ct/YxFbPkWF W7LA== X-Gm-Message-State: APjAAAVFGUtbwmwCDd7NozPWJ1o03lxQpPX1nOdE/E8HZqTJ++mDI+Aj xsqNJH/zKhnekjn3zxdEKQk= X-Google-Smtp-Source: APXvYqwyjakLVT85RTryWMHfy6AKHouMUXRj6cegqSHqrg9AmKKAZBYTX2iEX2LdU+HgQdpe1I/m7g== X-Received: by 2002:a5d:980a:: with SMTP id a10mr7426699iol.225.1572063932870; Fri, 25 Oct 2019 21:25:32 -0700 (PDT) Received: from cs-dulles.cs.umn.edu (cs-dulles.cs.umn.edu. [128.101.35.54]) by smtp.googlemail.com with ESMTPSA id n123sm452068iod.62.2019.10.25.21.25.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Oct 2019 21:25:32 -0700 (PDT) From: Navid Emamdoost To: Subject: [PATCH] media: aspeed-video: Fix memory leaks in aspeed_video_probe Date: Fri, 25 Oct 2019 23:25:18 -0500 Message-Id: <20191026042519.29446-1-navid.emamdoost@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191025_212534_420855_6BF9AB64 X-CRM114-Status: GOOD ( 11.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-aspeed@lists.ozlabs.org, Andrew Jeffery , kjlu@umn.edu, openbmc@lists.ozlabs.org, Eddie James , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, emamd001@umn.edu, Joel Stanley , smccaman@umn.edu, Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, Navid Emamdoost MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org In the implementation of aspeed_video_probe() the allocated memory for video should be released in case of failure. Release video if either devm_ioremap_resource() or aspeed_video_init() or aspeed_video_setup_video() fails. Fixes: d2b4387f3bdf ("media: platform: Add Aspeed Video Engine driver") Signed-off-by: Navid Emamdoost --- drivers/media/platform/aspeed-video.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c index eb12f3793062..8c473356132d 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -1663,18 +1663,24 @@ static int aspeed_video_probe(struct platform_device *pdev) video->base = devm_ioremap_resource(video->dev, res); - if (IS_ERR(video->base)) - return PTR_ERR(video->base); + if (IS_ERR(video->base)) { + rc = PTR_ERR(video->base); + goto free_video; + } rc = aspeed_video_init(video); if (rc) - return rc; + goto free_video; rc = aspeed_video_setup_video(video); if (rc) - return rc; + goto free_video; return 0; + +free_video: + kfree(video); + return rc; } static int aspeed_video_remove(struct platform_device *pdev) -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel