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,USER_AGENT_GIT autolearn=unavailable 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 AAC02C32792 for ; Thu, 3 Oct 2019 17:37:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7AF062086A for ; Thu, 3 Oct 2019 17:37:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570124240; bh=fDOgN/V7NzxO0VMh+Nd6y7W61naiUhNP+roMN4RfvuA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BdkFffBYkd7TUosifzdlJe8XQQQZYotfg8GOxrzGy77gL4n8Muc97OWgoZ3TFAos8 arzNHVaRRLtlNm9H+3uIBxlKcN6+3e1E2nxCLm2+zjpg9ZUQoqOE6Kp4A04xq3ukmL RCMRGelk7RyaxPw1g/yivxGcF4/DclnGUBRu4tkg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732218AbfJCQD2 (ORCPT ); Thu, 3 Oct 2019 12:03:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:48784 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732190AbfJCQD1 (ORCPT ); Thu, 3 Oct 2019 12:03:27 -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 3C583215EA; Thu, 3 Oct 2019 16:03:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570118606; bh=fDOgN/V7NzxO0VMh+Nd6y7W61naiUhNP+roMN4RfvuA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b0mCrnj6qhrEB2w4VqfRPItgmgCfUDz4ebblNWul7YUbsEvmfuwyorr5Kci3Y63eG F2LZAqj3SMhJAttZ9LHkMw1UM8GWd/e4jF5tl8tfkZPPwdz07eT+Us4ha6tS9Xr6Mx 3wEdbtwfjYsfDFxb3rEoY0w6Dv0ocjeO8vjgtma4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wenwen Wang , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.9 071/129] media: saa7146: add cleanup in hexium_attach() Date: Thu, 3 Oct 2019 17:53:14 +0200 Message-Id: <20191003154350.457538097@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154318.081116689@linuxfoundation.org> References: <20191003154318.081116689@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: Wenwen Wang [ Upstream commit 42e64117d3b4a759013f77bbcf25ab6700e55de7 ] If saa7146_register_device() fails, no cleanup is executed, leading to memory/resource leaks. To fix this issue, perform necessary cleanup work before returning the error. Signed-off-by: Wenwen Wang Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/pci/saa7146/hexium_gemini.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/media/pci/saa7146/hexium_gemini.c b/drivers/media/pci/saa7146/hexium_gemini.c index f5fc8bcbd14b1..be85a2c4318e7 100644 --- a/drivers/media/pci/saa7146/hexium_gemini.c +++ b/drivers/media/pci/saa7146/hexium_gemini.c @@ -304,6 +304,9 @@ static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_d ret = saa7146_register_device(&hexium->video_dev, dev, "hexium gemini", VFL_TYPE_GRABBER); if (ret < 0) { pr_err("cannot register capture v4l2 device. skipping.\n"); + saa7146_vv_release(dev); + i2c_del_adapter(&hexium->i2c_adapter); + kfree(hexium); return ret; } -- 2.20.1