Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EC8AD43B6D9; Thu, 30 Jul 2026 14:39:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785422393; cv=none; b=k71gzVExyrkz4Et2xSDwcttIXRMFZxWEg/bpI9AjuLPqKAf5n57XdXX26AFZZuKBpzj+d9UV+uoJXqhvmP563lewSesVXA3xge+aGvygm2hx62qUwOuzii5ZL6m/GEGS9HVUCfYXMaoifSyVDB36679aQ7bmHJcPGerhIb7KUlc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785422393; c=relaxed/simple; bh=d7ZylAyWS3iJBSdLEJ8t6TNiPm/ABVoaa9Ik8/mRX7M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oUL8jS/qXTsaUktLXpzje4OI9AGOoipjgNdv5qxIzfP8L8z9k6cYvYZa/AtvGQqDdLZvXmOYkGwbSQ+C8qOdSMC7bvZl2bUejffGHuh8SEMU0shRlGP51t+eyJ7MsZhxEVlMXXm8YaHswl1bAZh3G414Q/vHZQsy1N2Oa+ray5g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ORN89SX8; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ORN89SX8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 457771F000E9; Thu, 30 Jul 2026 14:39:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1785422391; bh=y1tDsSoWlk7vYRGBWyqcLA8xFOaEO4W2CHcS87K+4Fc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ORN89SX8sab7PhFvI5mwuD52XZUsht4yqW9D1f0sMebLtDTIWlJGfYQVkYTzGdDxY P1BL3nVVKrR4e+dckyGTZe6+M68hVa9N43qMxt2Hu52hpkDCnL91lGwQ41W1AYlGwN O7TAV32I06oT+7TZui3CyD8CKCNXCCs1xO9jpPVk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Bryam Vargas , Dmitry Osipenko Subject: [PATCH 7.1 423/744] drm/virtio: bound EDID block reads to the response buffer Date: Thu, 30 Jul 2026 16:11:36 +0200 Message-ID: <20260730141453.287352548@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260730141444.267951807@linuxfoundation.org> References: <20260730141444.267951807@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Bryam Vargas commit 4e1a53892ba7f8a3e1da6bfc53c83ae7c812dccd upstream. virtio_get_edid_block() validates the read offset only against the device-supplied resp->size field, never against the fixed-size resp->edid array. The EDID block index is driven by the device-supplied extension count, so a malicious virtio-gpu backend can advertise a large size together with a high block count and read far past the array into adjacent kernel memory, which is then surfaced in the parsed EDID (an out-of-bounds read / info leak). Also reject any read whose end exceeds the size of the edid array. Conforming EDID responses stay within the array and are unaffected. Fixes: b4b01b4995fb ("drm/virtio: add edid support") Cc: stable@vger.kernel.org Signed-off-by: Bryam Vargas Signed-off-by: Dmitry Osipenko Link: https://patch.msgid.link/20260620-b4-disp-22bba7bf-v1-1-b95924cee742@proton.me Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/virtio/virtgpu_vq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/virtio/virtgpu_vq.c +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c @@ -894,7 +894,8 @@ static int virtio_get_edid_block(void *d struct virtio_gpu_resp_edid *resp = data; size_t start = block * EDID_LENGTH; - if (start + len > le32_to_cpu(resp->size)) + if (start + len > le32_to_cpu(resp->size) || + start + len > sizeof(resp->edid)) return -EINVAL; memcpy(buf, resp->edid + start, len); return 0;