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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 3925CC56202 for ; Mon, 9 Nov 2020 13:24:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D7F7720663 for ; Mon, 9 Nov 2020 13:24:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604928244; bh=Y6uXY5C00WL5m4QLuoLJfu/7E8rvKuQY0cP45TjdG80=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lP9Fgh5Fbrn2QdB0O3/IkYTtK5OLiQlifON4xpb14XW5kiCh7qu/h8aIpFNGi2gkK ErjH0erNmaYZ6nixFTLvA0qqglB2ikyMSAMsbv5Wz5sIN2XIwpXXRJXcyUBSS6xw0Z aXPTxFKRXJGL3OdnoM8CkUZciL1SWRrcCnJBMuM8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387527AbgKINYD (ORCPT ); Mon, 9 Nov 2020 08:24:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:46986 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732846AbgKINTe (ORCPT ); Mon, 9 Nov 2020 08:19:34 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F129B2083B; Mon, 9 Nov 2020 13:19:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604927973; bh=Y6uXY5C00WL5m4QLuoLJfu/7E8rvKuQY0cP45TjdG80=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HbfEvkazZ0ITKWZYbo8FzPft6de1kTZ/RSwt1ooaQhTmzQ2TxhohvHsexuL0EWhG/ SADMAdzHXFq4FAGb7aeElhRZgab6/Lf3/JwIFHKd0OLSh010m3y4R9ij7OqJUfA3J6 tRF6M5rqvthq60Eg0yYiMkjiqChfAo0AmhBj1R90= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Maxime Ripard , Sasha Levin Subject: [PATCH 5.9 084/133] drm/v3d: Fix double free in v3d_submit_cl_ioctl() Date: Mon, 9 Nov 2020 13:55:46 +0100 Message-Id: <20201109125034.760072033@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201109125030.706496283@linuxfoundation.org> References: <20201109125030.706496283@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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