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=-13.1 required=3.0 tests=BAYES_00,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=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 4949CC00A89 for ; Tue, 3 Nov 2020 01:27:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 030622224E for ; Tue, 3 Nov 2020 01:27:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604366862; bh=Y6uXY5C00WL5m4QLuoLJfu/7E8rvKuQY0cP45TjdG80=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BaT1GaQlax00PSc9S/lglqKueSxRsF2TVzdepe+Q/ZRG86PwY8jouhGxxQKciuxfS HceM9/AcHUFScgQnfptGh20S5Ivx/7pnUVbXqXlFHeRzzot+Z8jgV/dQFDo8uJZjgg 2ElVynbAwBY/52wvJ+sfLif7Q0hsiiub39pqUpys= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728012AbgKCB1l (ORCPT ); Mon, 2 Nov 2020 20:27:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:60648 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727448AbgKCBTB (ORCPT ); Mon, 2 Nov 2020 20:19:01 -0500 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 652D5223AB; Tue, 3 Nov 2020 01:19:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604366341; bh=Y6uXY5C00WL5m4QLuoLJfu/7E8rvKuQY0cP45TjdG80=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vOobNwBbjpBVggcLch/KihfoXZPSua3WNHMq8D1LpGp24Qt8n8hox6gEHEylBMrdN Dgrt1qowWX2nuv8mXZDC4X2CAu5SVy5q3gZ1c1v8F0lBKxzINzIfTBxEmZNUF/vd3n dV6kpY2F5Dc94tW3fAGS7LZ8P1j+8e4cv9LBKZKc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dan Carpenter , Maxime Ripard , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.9 15/35] drm/v3d: Fix double free in v3d_submit_cl_ioctl() Date: Mon, 2 Nov 2020 20:18:20 -0500 Message-Id: <20201103011840.182814-15-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201103011840.182814-1-sashal@kernel.org> References: <20201103011840.182814-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: stable@vger.kernel.org From: Dan Carpenter [ Upstream commit 897dbea6b716c0f2c5bcd4ba1eb4d809caba290c ] Originally this error path used to leak "bin" but then we accidentally applied two separate commits to fix it and ended up with a double free. Signed-off-by: Dan Carpenter Signed-off-by: Maxime Ripard Link: https://patchwork.freedesktop.org/patch/msgid/20201026094905.GA1634423@mwanda Signed-off-by: Sasha Levin --- drivers/gpu/drm/v3d/v3d_gem.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c index 915f8bfdb58ca..182c586525eb8 100644 --- a/drivers/gpu/drm/v3d/v3d_gem.c +++ b/drivers/gpu/drm/v3d/v3d_gem.c @@ -568,7 +568,6 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data, ret = v3d_job_init(v3d, file_priv, &bin->base, v3d_job_free, args->in_sync_bcl); if (ret) { - kfree(bin); v3d_job_put(&render->base); kfree(bin); return ret; -- 2.27.0