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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 3D704C7618F for ; Mon, 15 Jul 2019 14:46:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 170F521530 for ; Mon, 15 Jul 2019 14:46:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563201994; bh=zIisIauz+syGA6owX30It7U7QMsPtdRcL8coptYim0U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bZwW7LDdfIE+niiZ6eKghgUN6eLpxUEVd6V0ZnTSi4tLQT3/U+lwNndjLhG5GuKQ6 i3xjUDZt/rmgIsijeccgIjfDOn8V0DbxHjOWkqhr2n5IKiV5uo3/3afTQDqIiy9Wid KQs4k0z+0IVCNbdukd2H9CWGzSdfOTBgzRA/3Co0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405075AbfGOOqc (ORCPT ); Mon, 15 Jul 2019 10:46:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:37450 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405071AbfGOOqb (ORCPT ); Mon, 15 Jul 2019 10:46:31 -0400 Received: from sasha-vm.mshome.net (unknown [73.61.17.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 817BD20861; Mon, 15 Jul 2019 14:46:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563201991; bh=zIisIauz+syGA6owX30It7U7QMsPtdRcL8coptYim0U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=adtHEdxjNPlFHEA6xVJUQU/ltuQBBwzky7DwFtDGpHIDV30cq/wyur4RkY2sLsEhJ /kGtuhEO1l0g7yt23DFX1qopyBdLxCbjzuaetnytUeYl0rb7dB3OKZqEP53qxIjBXJ nXi0Vej76TpQZ1xzqomeNwFDcSNM61G3erOh9UmE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Shailendra Verma , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org, devel@driverdev.osuosl.org Subject: [PATCH AUTOSEL 4.4 16/53] media: staging: media: davinci_vpfe: - Fix for memory leak if decoder initialization fails. Date: Mon, 15 Jul 2019 10:44:58 -0400 Message-Id: <20190715144535.11636-16-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190715144535.11636-1-sashal@kernel.org> References: <20190715144535.11636-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Shailendra Verma [ 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 0fdff91624fd..43474f562b43 100644 --- a/drivers/staging/media/davinci_vpfe/vpfe_video.c +++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c @@ -406,6 +406,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