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=-16.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, 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 578AAC11F67 for ; Tue, 6 Jul 2021 11:29:04 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 237C661F0C for ; Tue, 6 Jul 2021 11:29:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 237C661F0C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A648B6E45D; Tue, 6 Jul 2021 11:29:03 +0000 (UTC) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3B0716E452 for ; Tue, 6 Jul 2021 11:29:00 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 6833761F64; Tue, 6 Jul 2021 11:28:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570940; bh=vrjFcGvdhjIHAj0ae1tUmwWO/MM/7oRP9kzxKYi0bNU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VAo9BMb5o58Wh5uMI224kL/O/ul/0wxfHRxFX90bkSGH6AtqGmnGJSBbYFDjmC+AR Kqcysl348G+pQ5eQwNYbk5l4xICOPBi8bF7Occqj+TmzpW8gcIKywBYuPheuRWTjin Skoh6abV/j8gQ76ZJWL4rB9LZoz9J2SSnOimyHNXpp0Xn0ZMabqGpiWh6zvn9Fr5P7 UGRMev48UwzCljyHHzaSp0Y42JFJFQ2itWrwp/Hb/RpD76gh1lUQXiuEUKtQ6J0QKm RV6brj7arUm17zoat4gUNoCizRdgx7r+6o2yxxrDoeeauemxE+GVcN9rqvDG1WA348 WKAEVq9SjV24Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 09/35] drm/virtio: Fix double free on probe failure Date: Tue, 6 Jul 2021 07:28:21 -0400 Message-Id: <20210706112848.2066036-9-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706112848.2066036-1-sashal@kernel.org> References: <20210706112848.2066036-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , Xie Yongji , Gerd Hoffmann , dri-devel@lists.freedesktop.org, virtualization@lists.linux-foundation.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Xie Yongji [ Upstream commit cec7f1774605a5ef47c134af62afe7c75c30b0ee ] The virtio_gpu_init() will free vgdev and vgdev->vbufs on failure. But such failure will be caught by virtio_gpu_probe() and then virtio_gpu_release() will be called to do some cleanup which will free vgdev and vgdev->vbufs again. So let's set dev->dev_private to NULL to avoid double free. Signed-off-by: Xie Yongji Link: http://patchwork.freedesktop.org/patch/msgid/20210517084913.403-2-xieyongji@bytedance.com Signed-off-by: Gerd Hoffmann Signed-off-by: Sasha Levin --- drivers/gpu/drm/virtio/virtgpu_kms.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/virtio/virtgpu_kms.c b/drivers/gpu/drm/virtio/virtgpu_kms.c index d8b2027730d0..cde38e14232c 100644 --- a/drivers/gpu/drm/virtio/virtgpu_kms.c +++ b/drivers/gpu/drm/virtio/virtgpu_kms.c @@ -234,6 +234,7 @@ int virtio_gpu_driver_load(struct drm_device *dev, unsigned long flags) err_vbufs: vgdev->vdev->config->del_vqs(vgdev->vdev); err_vqs: + dev->dev_private = NULL; kfree(vgdev); return ret; } -- 2.30.2