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.8 required=3.0 tests=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 A1DD2C76186 for ; Wed, 24 Jul 2019 20:02:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 78B02205C9 for ; Wed, 24 Jul 2019 20:02:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563998558; bh=Z2hmDGN+mgbu0yExtGcl9Mh4wjSJtrdVA/vW//rB7s0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vc/19XegrdXXu5XnYYJhPSRgWpPo73AinxrE4awGiCgMcQ/VGJIvOZwwh9+v80VMR lbIUcv5nqSJfK+HzIWvuEmJ4SkvXfhz7kjfrnJnJUverKFvTG6vBUHUW9N8Ndaw21F 9VbQcmtJyflQqKM/a9HtZXtWlOl0JL3s8UuWY9Vs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392243AbfGXUCg (ORCPT ); Wed, 24 Jul 2019 16:02:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:52490 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404190AbfGXUCg (ORCPT ); Wed, 24 Jul 2019 16:02:36 -0400 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 5B33F205C9; Wed, 24 Jul 2019 20:02:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563998555; bh=Z2hmDGN+mgbu0yExtGcl9Mh4wjSJtrdVA/vW//rB7s0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YA0loYC9SUMVtVOar5iLono0dPmf9CqBUb+yrqh/YWcMNbcG1cyZZo49GZid3HFfC Vyv1VGDYDaMRZLnvtLmAjewYmfC9AD7hsKQUO3uqKOkKtzuOpq8Zesb0ElYg/UrfV8 Y5DIoxYJBWgeVFlXNtBjRR5B3si5Mbb7NfJbH30Y= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shailendra Verma , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.19 033/271] media: staging: media: davinci_vpfe: - Fix for memory leak if decoder initialization fails. Date: Wed, 24 Jul 2019 21:18:22 +0200 Message-Id: <20190724191658.026710820@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191655.268628197@linuxfoundation.org> References: <20190724191655.268628197@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 [ Upstream commit 6995a659101bd4effa41cebb067f9dc18d77520d ] Fix to avoid possible memory leak if the decoder initialization got failed.Free the allocated memory for file handle object before return in case decoder initialization fails. Signed-off-by: Shailendra Verma Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/staging/media/davinci_vpfe/vpfe_video.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c index 1269a983455e..13b890b9ef18 100644 --- a/drivers/staging/media/davinci_vpfe/vpfe_video.c +++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c @@ -422,6 +422,9 @@ static int vpfe_open(struct file *file) /* If decoder is not initialized. initialize it */ if (!video->initialized && vpfe_update_pipe_state(video)) { mutex_unlock(&video->lock); + v4l2_fh_del(&handle->vfh); + v4l2_fh_exit(&handle->vfh); + kfree(handle); return -ENODEV; } /* Increment device users counter */ -- 2.20.1