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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 4D925C33CB6 for ; Thu, 16 Jan 2020 23:25:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1E7482072B for ; Thu, 16 Jan 2020 23:25:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579217147; bh=aMZfEZ9WPffdZ40h5Px2Fl5qTJYWmpilN2V1ex5ejwI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SOhkhQI5DxTfo7wnaF4VIj1sZ7TuV81MuxOJ1ltizcuqu4FBew16SSerH2fyZTqpx ygSoMoSiERHETeeMD/yNkcry4Zyl/pQ3CoznM1br1PrgmZWO65GosQ5oqPqn/I0Hpl lQuecixzoY0UIqW+8u4GrvIdYLizXxqLD5jA3Yyk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388951AbgAPXZn (ORCPT ); Thu, 16 Jan 2020 18:25:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:55542 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388865AbgAPXZm (ORCPT ); Thu, 16 Jan 2020 18:25:42 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 9E0BC206D9; Thu, 16 Jan 2020 23:25:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579217142; bh=aMZfEZ9WPffdZ40h5Px2Fl5qTJYWmpilN2V1ex5ejwI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lAAuS22cLd0ySbvcNIjSZVyFeaw6k2BejhjE/GeXkzGh97ciwnMsA9PFvZB87F5HB V5KvmPkhbC5eMWZF7LEjTdBtoHXpOSk/Vi6yoi4rvf26ZOXQsApyZeE2HK6ZCI3eti jAmikQvg/+RnlDk+KYBjeblNVKCYCJov+nj6UoII= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Navid Emamdoost , Jae Hyun Yoo , Eddie James , Hans Verkuil , Mauro Carvalho Chehab Subject: [PATCH 5.4 157/203] media: aspeed-video: Fix memory leaks in aspeed_video_probe Date: Fri, 17 Jan 2020 00:17:54 +0100 Message-Id: <20200116231758.521169123@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200116231745.218684830@linuxfoundation.org> References: <20200116231745.218684830@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Navid Emamdoost commit c3df30a01da4955e04fa068c503cd784b31dad92 upstream. In the implementation of aspeed_video_probe() the allocated memory for video should be released if either devm_ioremap_resource() or aspeed_video_init() or aspeed_video_setup_video() fails. Replace kzalloc() with devm_kzalloc to avoid explicit release for video. Fixes: d2b4387f3bdf ("media: platform: Add Aspeed Video Engine driver") Signed-off-by: Navid Emamdoost Reviewed-by: Jae Hyun Yoo Reviewed-by: Eddie James Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/platform/aspeed-video.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -1658,7 +1658,8 @@ static int aspeed_video_probe(struct pla { int rc; struct resource *res; - struct aspeed_video *video = kzalloc(sizeof(*video), GFP_KERNEL); + struct aspeed_video *video = + devm_kzalloc(&pdev->dev, sizeof(*video), GFP_KERNEL); if (!video) return -ENOMEM;