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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 C1214C43603 for ; Wed, 23 Dec 2020 02:32:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A65FC206EC for ; Wed, 23 Dec 2020 02:32:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729813AbgLWCc2 (ORCPT ); Tue, 22 Dec 2020 21:32:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:55712 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729539AbgLWCZU (ORCPT ); Tue, 22 Dec 2020 21:25:20 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 235F4221E5; Wed, 23 Dec 2020 02:24:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1608690279; bh=MtdmVI51KGlsdcDnJIWYE1WKTLsMFbdiPwdG4XWsvfw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tcaykQt5s61GqumNDR2XJ79sSYUEH2JvJ48DYKBsJku0k1RK4ggPs9Ls59kcqDw5l WwooNXD+zs3+br4FuHNAeEQlYozc+NBm0C0tVMo+rfiGTEXcbdT+B9U/2cHCq6w7yE NedJeFvc7X2U8lnazV4mYQ2YtxPvc5DYnzslnHLwFGFL7K2jw/ItAnvan/EpLZ2K8U o67FPld7xUJqTZNQOOZA/vyNt6QjWyNRl58bHm/pPMvRcvoyNj1gvG7yReGPOShWmJ V0Iuaj3Wbq3brdPpnknizkoUcFWNFvvJVetvZBxv/g424R+XvlSZhSxmn3eqBIq+Nw DE3GE6c5hlT6w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dinghao Liu , Sean Young , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 19/48] media: dvbdev: Fix memleak in dvb_register_device Date: Tue, 22 Dec 2020 21:23:47 -0500 Message-Id: <20201223022417.2794032-19-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201223022417.2794032-1-sashal@kernel.org> References: <20201223022417.2794032-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dinghao Liu [ Upstream commit 167faadfcf9339088910e9e85a1b711fcbbef8e9 ] When device_create() fails, dvbdev and dvbdevfops should be freed just like when dvb_register_media_device() fails. Signed-off-by: Dinghao Liu Signed-off-by: Sean Young Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/dvb-core/dvbdev.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c index a1cc1c1e53182..ffd01d54edca8 100644 --- a/drivers/media/dvb-core/dvbdev.c +++ b/drivers/media/dvb-core/dvbdev.c @@ -515,6 +515,9 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, if (IS_ERR(clsdev)) { printk(KERN_ERR "%s: failed to create device dvb%d.%s%d (%ld)\n", __func__, adap->num, dnames[type], id, PTR_ERR(clsdev)); + dvb_media_device_free(dvbdev); + kfree(dvbdevfops); + kfree(dvbdev); return PTR_ERR(clsdev); } dprintk(KERN_DEBUG "DVB: register adapter%d/%s%d @ minor: %i (0x%02x)\n", -- 2.27.0