Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3084143ybj; Mon, 23 Sep 2019 14:32:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqyF6EMYPQuNaHkh3VpMHXnDpVQAj5lqRW1RzZ/T11fnZHUQnENQCHNoivBGNH3KgAJK5NS8 X-Received: by 2002:a05:6402:2d8:: with SMTP id b24mr2310934edx.222.1569274349901; Mon, 23 Sep 2019 14:32:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569274349; cv=none; d=google.com; s=arc-20160816; b=ayX4qi+iMXMHQ5ecmyGPbb4u+eQme2NSXQTpfTKCnCZX7FG0BJRAneh6MmYmvCayXp CeFhE5k9D4IHMe2nw7Zom0EcvKiCYptwUzi98qjZR4gITcIHvC+XhHVExgT3vTTQ+8Ch nU7eOlRWFXV5TIQ6rNIwXC3mFgU8IxSrnvMUKa215eqTIvTkKYC/5MbuqCOdLvFZGzFL II6YSwlaEeYf2DbEEQxRns7Tl533kFsmpikNkI9Nk+vA1INdFwgM986hWCUSPhmGgk1Z A2Fwq914o/ztU1K+AIfQaPHxwA4Cc6i0ReUvgLSp+namwu5zPbGeR9kB29zsIV2gHYRd nPFw== 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=t26tUHf+9Gv9T20JzJu1NaM6qhun1G5nrCC9JRn6a1I=; b=mbBGC0UzQc8Xp+RgZqPUQPnPjvyqdzL3IYoIaKKcbKVyPNh1ZrT7vICdObAno8yx9F MB6Wu7jFvJfX7yLRGPEsSaVN0nF8T4Up/o+hufg+JSXKqsHnPXlz03ImxcAoMMThVPt1 GMMGv0f+r6LyeP/ssn96zMbgmXpNMm+GgmBysFT0HFvVrty1BMJajQTN35ObAmmjRWcC QQE88dQrTcRBhvjRqu3f0jxuVEEuttbsum7QnSGqDVFl7lcGbeO5QyUVVTr2c4JCHfqZ aCkDNh3Y3awvFNxfJ8CbVBcYAF8MdDtgLynFjUscfoPeCcxeUsrSrQQak1b4mV6F855E TNzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=oJ+GE9Ga; 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 b11si57153eja.38.2019.09.23.14.32.06; Mon, 23 Sep 2019 14:32:29 -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=oJ+GE9Ga; 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 S2390086AbfIVSqg (ORCPT + 99 others); Sun, 22 Sep 2019 14:46:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:42596 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390001AbfIVSqa (ORCPT ); Sun, 22 Sep 2019 14:46:30 -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 0D9FE208C2; Sun, 22 Sep 2019 18:46:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569177990; bh=vXDkuYne+Hy4F82vAvYwB/USPCaWPvacv5O9Bg8gQqY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oJ+GE9GaKbFMWBMd5Kc/A808x6XJHeePJTEAVvnpXBaglVsomDZbqOCx/++CF6vKB NMYEfeKqKytqBk9YHtHDyeYIS8VmFpW41JqenR5nNivEFmscQ6Lx2kyN8eVIRXVLva ehiTT7e8fmwPc1Y3C1DQ2v5HOqwiTszLmOEBrsHY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Colin Ian King , Kieran Bingham , Laurent Pinchart , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 082/203] media: vsp1: fix memory leak of dl on error return path Date: Sun, 22 Sep 2019 14:41:48 -0400 Message-Id: <20190922184350.30563-82-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: Colin Ian King [ Upstream commit 70c55c1ad1a76e804ee5330e134674f5d2741cb7 ] Currently when the call vsp1_dl_body_get fails and returns null the error return path leaks the allocation of dl. Fix this by kfree'ing dl before returning. Addresses-Coverity: ("Resource leak") Fixes: 5d7936b8e27d ("media: vsp1: Convert display lists to use new body pool") Signed-off-by: Colin Ian King Reviewed-by: Kieran Bingham Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/vsp1/vsp1_dl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/vsp1/vsp1_dl.c b/drivers/media/platform/vsp1/vsp1_dl.c index 104b6f5145364..d7b43037e500a 100644 --- a/drivers/media/platform/vsp1/vsp1_dl.c +++ b/drivers/media/platform/vsp1/vsp1_dl.c @@ -557,8 +557,10 @@ static struct vsp1_dl_list *vsp1_dl_list_alloc(struct vsp1_dl_manager *dlm) /* Get a default body for our list. */ dl->body0 = vsp1_dl_body_get(dlm->pool); - if (!dl->body0) + if (!dl->body0) { + kfree(dl); return NULL; + } header_offset = dl->body0->max_entries * sizeof(*dl->body0->entries); -- 2.20.1