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=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 56967C4740C for ; Sun, 22 Sep 2019 19:06:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2737F206C2 for ; Sun, 22 Sep 2019 19:06:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569179218; bh=fDOgN/V7NzxO0VMh+Nd6y7W61naiUhNP+roMN4RfvuA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0XQjX9dFW6d0h6WBDQXWMROuCspGbmd1QT2YNWlgFxmV6tXHHrW9Ijnptw7r4whbw 38kMlnY50FB6CKWjE0KR7VSO4YQkegOr3nahSt9/5eD4RadNP6NFo30TA4gxa8JSln g3DKneauZl/SKck/qWvP7Gf4xJ2xzJgsiHvKOJFc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730228AbfIVTG5 (ORCPT ); Sun, 22 Sep 2019 15:06:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:36002 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2395144AbfIVTAV (ORCPT ); Sun, 22 Sep 2019 15:00:21 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.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 6D2F0206C2; Sun, 22 Sep 2019 19:00:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178821; bh=fDOgN/V7NzxO0VMh+Nd6y7W61naiUhNP+roMN4RfvuA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HzbJB4LAvfHX+zQzoQTQiPI1loT/dHWFz23kDeXD2zPHQh1DHjeYkbw5GK2YtIy+n kOh7f3dHPqsQf7ykjQulpiRWvsycxMvXnZddoruxtenabS8TbpjAt7HEQ7L/qV91zi E7KXzlBpEdM9hfO5NIyovAtxWJKW/sMhGkdoFtto= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wenwen Wang , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 33/60] media: saa7146: add cleanup in hexium_attach() Date: Sun, 22 Sep 2019 14:59:06 -0400 Message-Id: <20190922185934.4305-33-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922185934.4305-1-sashal@kernel.org> References: <20190922185934.4305-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: 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