Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp304950pxx; Wed, 28 Oct 2020 05:29:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzv/yAJMMfd9awBgqBZhafOr+rHp60Br+T8n3ptmL/gk5HvBBeCM9zppA7apRwhIxmhyvCD X-Received: by 2002:aa7:d0d8:: with SMTP id u24mr7651478edo.349.1603888182547; Wed, 28 Oct 2020 05:29:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603888182; cv=none; d=google.com; s=arc-20160816; b=cAm6fVhyS3ceVREjirsiQ61S4/C83OmGvyHsB5x+wQAtPKkbRZt5PrTINjwq0M4AdB wKM95NKMqP7trJUdllt5i5FA/RwuWuuIz+g7DMTCU7JTeZn9uLoGMOxixB/L32achz3f 7jitiS7kt45ZQ9qQCD2bM0J/LJDNhyNJM9AJyoN7QPqE3FXCRxg8jLytKADe+TbDl4Yz DRhwAgxGh+PRR2ATsgfUNxKkk7gjqoEm4bk7n3l2tCDPROkFbVaaXW99CrHn5HEET/Qb zL181GKPi9p0DVGu0eJJOxsqcuITY4VeN3WB5itRaYtwulKDbM5eV8EZMALeveu3JpTy j6DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=cpyM1IODwI9pi8b4OWtMJG7qNHaVRfHUafh0NJfoZA8=; b=zAXiXZ95+kxAGWPbR+HUFBsHGapbSgnopG6cxxMr8+dfdBXgt4yOCe2Ldg8hIhNW1x c1dbW/ofvwu4303L2ptaOV3NK5GJQup/xJrtGvpnmLN8oeMTulkO4ccQOkDWJrXmzUFQ MCiIcNTluZ4Ef6yEJoBpwdap6xRioF4dFVVEXTOz+eB+HioOVFYzNsS/45No6XpnUX4z e8nj92Ti7sshe0dwexJR4qKRobV/uOvFtzLs1r2+xRc850bmiaC05MT9IwDbxtC446sR 9QuAbiNHYVJsez9bPRujEdZKwx6SsIHZRn+VyoMaT+Vn68uJhXDTUIag7ruf1MrhycrQ wT3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Sqkr2FzR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p90si2749641edd.284.2020.10.28.05.29.20; Wed, 28 Oct 2020 05:29:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Sqkr2FzR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1797025AbgJ0PVK (ORCPT + 99 others); Tue, 27 Oct 2020 11:21:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:52442 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1796081AbgJ0PPh (ORCPT ); Tue, 27 Oct 2020 11:15:37 -0400 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 10CA120728; Tue, 27 Oct 2020 15:15:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603811735; bh=EX9xoOfFH5cE8BiaPZ2FGcfqnOALEpnFo0SSIXDYyQo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Sqkr2FzRaPIro+qCed3Trxolwr2/IlXWHF/CpEhXb561f/LYhKfNPclIZCadgTiIE BqZAB3D49takled3ZEASD5xzlWmoYmpNP2ro0oaaSttadlahabHLHWhe2ZREJ134Ba hArtl0RzLCbccE5j6rvl767Xsswlgr32J+UWWU9Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Doug Horn , Gerd Hoffmann , Sasha Levin Subject: [PATCH 5.8 599/633] Fix use after free in get_capset_info callback. Date: Tue, 27 Oct 2020 14:55:42 +0100 Message-Id: <20201027135550.904584113@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135522.655719020@linuxfoundation.org> References: <20201027135522.655719020@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: Doug Horn [ Upstream commit e219688fc5c3d0d9136f8d29d7e0498388f01440 ] If a response to virtio_gpu_cmd_get_capset_info takes longer than five seconds to return, the callback will access freed kernel memory in vg->capsets. Signed-off-by: Doug Horn Link: http://patchwork.freedesktop.org/patch/msgid/20200902210847.2689-2-gurchetansingh@chromium.org Signed-off-by: Gerd Hoffmann Signed-off-by: Sasha Levin --- drivers/gpu/drm/virtio/virtgpu_kms.c | 2 ++ drivers/gpu/drm/virtio/virtgpu_vq.c | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_kms.c b/drivers/gpu/drm/virtio/virtgpu_kms.c index 0a5c8cf409fb8..dc8cb8dfce58e 100644 --- a/drivers/gpu/drm/virtio/virtgpu_kms.c +++ b/drivers/gpu/drm/virtio/virtgpu_kms.c @@ -80,8 +80,10 @@ static void virtio_gpu_get_capsets(struct virtio_gpu_device *vgdev, vgdev->capsets[i].id > 0, 5 * HZ); if (ret == 0) { DRM_ERROR("timed out waiting for cap set %d\n", i); + spin_lock(&vgdev->display_info_lock); kfree(vgdev->capsets); vgdev->capsets = NULL; + spin_unlock(&vgdev->display_info_lock); return; } DRM_INFO("cap set %d: id %d, max-version %d, max-size %d\n", diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c index 9e663a5d99526..2517450bf46ba 100644 --- a/drivers/gpu/drm/virtio/virtgpu_vq.c +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c @@ -684,9 +684,13 @@ static void virtio_gpu_cmd_get_capset_info_cb(struct virtio_gpu_device *vgdev, int i = le32_to_cpu(cmd->capset_index); spin_lock(&vgdev->display_info_lock); - vgdev->capsets[i].id = le32_to_cpu(resp->capset_id); - vgdev->capsets[i].max_version = le32_to_cpu(resp->capset_max_version); - vgdev->capsets[i].max_size = le32_to_cpu(resp->capset_max_size); + if (vgdev->capsets) { + vgdev->capsets[i].id = le32_to_cpu(resp->capset_id); + vgdev->capsets[i].max_version = le32_to_cpu(resp->capset_max_version); + vgdev->capsets[i].max_size = le32_to_cpu(resp->capset_max_size); + } else { + DRM_ERROR("invalid capset memory."); + } spin_unlock(&vgdev->display_info_lock); wake_up(&vgdev->resp_wq); } -- 2.25.1