FAILED: patch "[PATCH] drm/hyperv: validate resolution_count and fix WIN8 fallback" failed to apply to 5.15-stable tree
[email protected]
maintainerThe patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x 13d33b9ef67066c77c84273fac5a1d3fde3533d1
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026060454-destitute-bulb-134a@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 13d33b9ef67066c77c84273fac5a1d3fde3533d1 Mon Sep 17 00:00:00 2001
From: Berkant Koc <[email protected]>
Date: Tue, 19 May 2026 22:08:17 +0200
Subject: [PATCH] drm/hyperv: validate resolution_count and fix WIN8 fallback
A SYNTHVID_RESOLUTION_RESPONSE with resolution_count > 64 walks past the supported_resolution[SYNTHVID_MAX_RESOLUTION_COUNT] array in the parse loop. Bound resolution_count against the array size, folded into the existing zero-check.
When the WIN10 resolution probe fails, the caller in hyperv_connect_vsp() left hv->screen_*_max / preferred_* unpopulated, which sets mode_config.max_width / max_height to 0 and makes drm_internal_framebuffer_create() reject every userspace framebuffer with -EINVAL. The pre-WIN10 branch had the same gap for preferred_width / preferred_height. Use a single post-probe fallback guarded by screen_width_max == 0 so both paths converge on the WIN8 defaults.
drivers/gpu/drm/hyperv/hyperv_drm_proto.c +10 -3
@@ -391,8 +391,11 @@ static int hyperv_get_supported_resolution(struct hv_device *hdev)return -ETIMEDOUT ; } -if (msg->resolution_resp.resolution_count ==0 ) { -drm_err (dev,"No supported resolutions\n" ); +if (msg->resolution_resp.resolution_count ==0 || + msg->resolution_resp.resolution_count > +SYNTHVID_MAX_RESOLUTION_COUNT ) { +drm_err (dev,"Invalid resolution count: %d\n" , + msg->resolution_resp.resolution_count);return -ENODEV ; }
@@ -508,9 +511,13 @@ int hyperv_connect_vsp(struct hv_device *hdev) ret =hyperv_get_supported_resolution (hdev);if (ret)drm_err (dev,"Failed to get supported resolution from host, use default\n" ); - }else { + } + +if (!hv->screen_width_max) { hv->screen_width_max =SYNTHVID_WIDTH_WIN8 ; hv->screen_height_max =SYNTHVID_HEIGHT_WIN8 ; + hv->preferred_width =SYNTHVID_WIDTH_WIN8 ; + hv->preferred_height =SYNTHVID_HEIGHT_WIN8 ; } hv->mmio_megabytes = hdev->channel->offermsg.offer.mmio_megabytes;
Sasha Levin
maintainerPATCH 1/2 drm/hyperv: Remove support for Hyper-V 2008 and 2008R2/Win7
From: Michael Kelley <[email protected]>
[ Upstream commit ac6811a9b36f3ceb549d8b84bd8aeedf6026df02 ]
The DRM Hyper-V driver has special case code for running on the first released versions of Hyper-V: 2008 and 2008 R2/Windows 7. These versions are now out of support (except for extended security updates) and lack support for performance features that are needed for effective production usage of Linux guests.
The negotiation of the VMbus protocol versions required by these old Hyper-V versions has been removed from the VMbus driver. So now remove the handling of these VMbus protocol versions from the DRM Hyper-V driver.
Stable-dep-of: 13d33b9ef670 ("drm/hyperv: validate resolution_count and fix WIN8 fallback")
--- drivers/gpu/drm/hyperv/hyperv_drm_proto.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-)
drivers/gpu/drm/hyperv/hyperv_drm_proto.c +7 -16
@@ -18,16 +18,16 @@#define SYNTHVID_VERSION (major, minor) ((minor) << 16 | (major))#define SYNTHVID_VER_GET_MAJOR (ver) (ver & 0x0000ffff)#define SYNTHVID_VER_GET_MINOR (ver) ((ver & 0xffff0000) >> 16) + +/* Support for VERSION_WIN7 is removed. #define is retained for reference. */ #define SYNTHVID_VERSION_WIN7 SYNTHVID_VERSION(3, 0)#define SYNTHVID_VERSION_WIN8 SYNTHVID_VERSION(3, 2)#define SYNTHVID_VERSION_WIN10 SYNTHVID_VERSION(3, 5) -#define SYNTHVID_DEPTH_WIN7 16#define SYNTHVID_DEPTH_WIN8 32 -#define SYNTHVID_FB_SIZE_WIN7 (4 * 1024 * 1024) +#define SYNTHVID_WIDTH_WIN8 1600 +#define SYNTHVID_HEIGHT_WIN8 1200#define SYNTHVID_FB_SIZE_WIN8 (8 * 1024 * 1024) -#define SYNTHVID_WIDTH_MAX_WIN7 1600 -#define SYNTHVID_HEIGHT_MAX_WIN7 1200enum pipe_msg_type {PIPE_MSG_INVALID ,
@@ -496,12 +496,6 @@ int hyperv_connect_vsp(struct hv_device *hdev)case VERSION_WIN8 :case VERSION_WIN8_1 : ret =hyperv_negotiate_version (hdev,SYNTHVID_VERSION_WIN8 ); -if (!ret) -break ; - fallthrough; -case VERSION_WS2008 : -case VERSION_WIN7 : - ret =hyperv_negotiate_version (hdev,SYNTHVID_VERSION_WIN7 );break ;default : ret =hyperv_negotiate_version (hdev,SYNTHVID_VERSION_WIN10 );
@@ -513,18 +507,15 @@ int hyperv_connect_vsp(struct hv_device *hdev) goto error; } -if (hv->synthvid_version ==SYNTHVID_VERSION_WIN7 ) - hv->screen_depth =SYNTHVID_DEPTH_WIN7 ; -else - hv->screen_depth =SYNTHVID_DEPTH_WIN8 ; + hv->screen_depth =SYNTHVID_DEPTH_WIN8 ;if (hyperv_version_ge (hv->synthvid_version,SYNTHVID_VERSION_WIN10 )) { ret =hyperv_get_supported_resolution (hdev);if (ret)drm_err (dev,"Failed to get supported resolution from host, use default\n" ); }else { - hv->screen_width_max =SYNTHVID_WIDTH_MAX_WIN7 ; - hv->screen_height_max =SYNTHVID_HEIGHT_MAX_WIN7 ; + hv->screen_width_max =SYNTHVID_WIDTH_WIN8 ; + hv->screen_height_max =SYNTHVID_HEIGHT_WIN8 ; } hv->mmio_megabytes = hdev->channel->offermsg.offer.mmio_megabytes;
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 drm/hyperv: validate resolution_count and fix WIN8 fallback
From: Berkant Koc <[email protected]>
[ Upstream commit 13d33b9ef67066c77c84273fac5a1d3fde3533d1 ]
A SYNTHVID_RESOLUTION_RESPONSE with resolution_count > 64 walks past the supported_resolution[SYNTHVID_MAX_RESOLUTION_COUNT] array in the parse loop. Bound resolution_count against the array size, folded into the existing zero-check.
When the WIN10 resolution probe fails, the caller in hyperv_connect_vsp() left hv->screen_*_max / preferred_* unpopulated, which sets mode_config.max_width / max_height to 0 and makes drm_internal_framebuffer_create() reject every userspace framebuffer with -EINVAL. The pre-WIN10 branch had the same gap for preferred_width / preferred_height. Use a single post-probe fallback guarded by screen_width_max == 0 so both paths converge on the WIN8 defaults.
--- drivers/gpu/drm/hyperv/hyperv_drm_proto.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/gpu/drm/hyperv/hyperv_drm_proto.c +10 -3
@@ -396,8 +396,11 @@ static int hyperv_get_supported_resolution(struct hv_device *hdev)return -ETIMEDOUT ; } -if (msg->resolution_resp.resolution_count ==0 ) { -drm_err (dev,"No supported resolutions\n" ); +if (msg->resolution_resp.resolution_count ==0 || + msg->resolution_resp.resolution_count > +SYNTHVID_MAX_RESOLUTION_COUNT ) { +drm_err (dev,"Invalid resolution count: %d\n" , + msg->resolution_resp.resolution_count);return -ENODEV ; }
@@ -513,9 +516,13 @@ int hyperv_connect_vsp(struct hv_device *hdev) ret =hyperv_get_supported_resolution (hdev);if (ret)drm_err (dev,"Failed to get supported resolution from host, use default\n" ); - }else { + } + +if (!hv->screen_width_max) { hv->screen_width_max =SYNTHVID_WIDTH_WIN8 ; hv->screen_height_max =SYNTHVID_HEIGHT_WIN8 ; + hv->preferred_width =SYNTHVID_WIDTH_WIN8 ; + hv->preferred_height =SYNTHVID_HEIGHT_WIN8 ; } hv->mmio_megabytes = hdev->channel->offermsg.offer.mmio_megabytes;
Signature · 1 line
2.53.0