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 0039FC4740C for ; Sun, 22 Sep 2019 19:11:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C1271206C2 for ; Sun, 22 Sep 2019 19:11:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569179478; bh=BmCxRh3AFZo6roUst32OqGMBUYL85uQbOxwAP4cI02Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QHRcAUVaJpohFEdrVuZu8BTZPHRbvmrxuUuaT5TNS6iAyHWF2TlB03FwO+z04uCwE NUDNjwPyl6Mkl+aotWbFY29BNZIes53RaA4Pw9rfg6Lyu4xOLegxOehBOZppD7BrwN ErJ0GWatpiljzNXFOPWunPTosaDw/7xKbEKRSfyg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2395508AbfIVTLJ (ORCPT ); Sun, 22 Sep 2019 15:11:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:33298 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2438792AbfIVS6f (ORCPT ); Sun, 22 Sep 2019 14:58:35 -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 D33B821928; Sun, 22 Sep 2019 18:58:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178714; bh=BmCxRh3AFZo6roUst32OqGMBUYL85uQbOxwAP4cI02Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l60MwoFVrSzw3xsVGdG31G3hn0zih2Gt5vnro8XCdLmPOqdFF9ioN+KGQtLMdttUc 66H0b6DiGf3zelD+igN8ZD/ee3N+dBLBfoUHOf/KARsXCPmt6pKvrTt+QyRK8HMlr3 tfZWNyw38iWhoD7JE7rM7N0ZObx1CIOOBasZDoIU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wenwen Wang , Sean Young , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 48/89] media: dvb-core: fix a memory leak bug Date: Sun, 22 Sep 2019 14:56:36 -0400 Message-Id: <20190922185717.3412-48-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922185717.3412-1-sashal@kernel.org> References: <20190922185717.3412-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 fcd5ce4b3936242e6679875a4d3c3acfc8743e15 ] In dvb_create_media_entity(), 'dvbdev->entity' is allocated through kzalloc(). Then, 'dvbdev->pads' is allocated through kcalloc(). However, if kcalloc() fails, the allocated 'dvbdev->entity' is not deallocated, leading to a memory leak bug. To fix this issue, free 'dvbdev->entity' before returning -ENOMEM. Signed-off-by: Wenwen Wang Signed-off-by: Sean Young Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/dvb-core/dvbdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c index 41aad0f99d73c..ba3c68fb9676b 100644 --- a/drivers/media/dvb-core/dvbdev.c +++ b/drivers/media/dvb-core/dvbdev.c @@ -316,8 +316,10 @@ static int dvb_create_media_entity(struct dvb_device *dvbdev, if (npads) { dvbdev->pads = kcalloc(npads, sizeof(*dvbdev->pads), GFP_KERNEL); - if (!dvbdev->pads) + if (!dvbdev->pads) { + kfree(dvbdev->entity); return -ENOMEM; + } } switch (type) { -- 2.20.1