Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp1085469ybn; Tue, 24 Sep 2019 14:31:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqxXYAwripUSMFzoHD/Rd87DDPxNdhhHn0fiFRB+5cx+zy521cGSAoo/wn7LiJUFaxO/WGpm X-Received: by 2002:a05:600c:2412:: with SMTP id 18mr2651549wmp.128.1569360672499; Tue, 24 Sep 2019 14:31:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569360672; cv=none; d=google.com; s=arc-20160816; b=tdVrQ1ClUoPvIPVg6UOogG9nhRzwd7tmoJ1QxoRCqvdLBhnchBuG7RoIKov3AoR26H R4KPREEoZy9e2/CTV/a7FIwT0oGtcPcz8AwlVrqjAR13KrV3N5vLPL0YzFc5WERNkYVf Ti01WjINYL2PI5q83MGaE+VxOdBx6p3grau+SqyPpOYEArQga9+NrSrFhIxHLvWzJYTG L2bSwBSDMNZn0F8AlKR62y5zl006bj7UW8mezIxbUTTKDMub8V9vsSI6dW2U2O7MS48E FpbMfyi/gxbX6hh52gxVawMe9sxVSz/UW8xhytOT70sYXuDmtZgCpmgIyWgCZBytZxjL 8DRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=5K0uCsIDjRAPhaxBeR52eOTCAtVYeJgxT2iMDS9O8Ko=; b=GUkrbMQ+x0n2DVRXqxTzfc6LW5otXntKq/JNw5RFQeH3Xal7u10eLgwxI+elbeAFME 73uht2DGx5IXQT+Cc9nufH+1AZhOJdoTsdKKghp8oceg7dHAFZdxeB2MXNQVeXByhw/w RTMVGp3J7e9/ACiEdCTmHbRMehL8fVYmGHiYcN5iiSgiW0S4NaAaeATcqR2Yd+oZb1lB IxNFW3FUY5ksQzQ1+lqA1THRd6wiR7vQ8rYg35F4YU6QGW90XgRQ6K9j/inTJhdWziN9 qGIFQPXUiK9YyreZme8OU/PJABJfmLDvkafioV0tpnYyy7lxVvNT9E89U3qzdkbQ1CYM 7EMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2cWp6v5j; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h19si1896390edv.393.2019.09.24.14.30.49; Tue, 24 Sep 2019 14:31:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2cWp6v5j; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2438932AbfIVTel (ORCPT + 99 others); Sun, 22 Sep 2019 15:34:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:43460 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390532AbfIVSrH (ORCPT ); Sun, 22 Sep 2019 14:47:07 -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 A7BCA214D9; Sun, 22 Sep 2019 18:47:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178026; bh=wDcK0SuxOI7PvWtcKRyhb1YAeAPrSWo4zVxce4QENGk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2cWp6v5j9ExvsXaM3d5Z946jjF9rXak+LzDKF+i5t7WgDU6O5E9P4YFizX0X/VO1Y Ku72fbxu1jERIOQw2ji+gzhZIcMdIeFVR9OsnSy73ntF8Quqsx664lApq1v36203IP nzQ+2OH4OlMuDl6EcA89uongku5vKjuKsVa8mwFE= 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 5.3 110/203] media: dvb-core: fix a memory leak bug Date: Sun, 22 Sep 2019 14:42:16 -0400 Message-Id: <20190922184350.30563-110-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 a3393cd4e584f..7557fbf9d3068 100644 --- a/drivers/media/dvb-core/dvbdev.c +++ b/drivers/media/dvb-core/dvbdev.c @@ -339,8 +339,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