FAILED: patch "[PATCH] drm: Fix GETCONNECTOR regression" failed to apply to 4.11-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 4.11-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]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
e94ac3510b6a0f696f2c442c4fc4051c8101ef12Mon Sep 17 00:00:00 2001
From: Daniel Vetter <[email protected]>
Date: Tue, 20 Jun 2017 22:28:37 +0200
Subject: [PATCH] drm: Fix GETCONNECTOR regression
In
commit 91eefc05f0ac71902906b2058360e61bd25137fe
Author: Daniel Vetter <[email protected]> Date: Wed Dec 14 00:08:10 2016 +0100
drm: Tighten locking in drm_mode_getconnector
I reordered the logic a bit in that IOCTL, but that broke userspace since it'll get the new mode list, but not the new property values. Fix that again.
v2: Fix up the error path handling when copy_to_user for the modes failes (Dhinakaran).
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100576
drivers/gpu/drm/drm_connector.c +20 -18
@@ -1229,21 +1229,6 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,if (!connector)return -ENOENT ; -drm_modeset_lock (&dev->mode_config.connection_mutex,NULL ); - encoder =drm_connector_get_encoder (connector); -if (encoder) - out_resp->encoder_id = encoder->base.id; -else - out_resp->encoder_id =0 ; - - ret =drm_mode_object_get_properties (&connector->base, file_priv->atomic, - (uint32_t __user *)(unsigned long )(out_resp->props_ptr), - (uint64_t __user *)(unsigned long )(out_resp->prop_values_ptr), - &out_resp->count_props); -drm_modeset_unlock (&dev->mode_config.connection_mutex); -if (ret) - goto out_unref; -for (i =0 ; i <DRM_CONNECTOR_MAX_ENCODER ; i++)if (connector->encoder_ids[i] !=0 ) encoders_count++;
@@ -1256,7 +1241,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,if (put_user (connector->encoder_ids[i], encoder_ptr + copied)) { ret = -EFAULT ; - goto out_unref; + goto out; } copied++; }
@@ -1300,15 +1285,32 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,if (copy_to_user (mode_ptr + copied, &u_mode,sizeof (u_mode))) { ret = -EFAULT ; +mutex_unlock (&dev->mode_config.mutex); + goto out; } copied++; } } out_resp->count_modes = mode_count; -out:mutex_unlock (&dev->mode_config.mutex); -out_unref: + +drm_modeset_lock (&dev->mode_config.connection_mutex,NULL ); + encoder =drm_connector_get_encoder (connector); +if (encoder) + out_resp->encoder_id = encoder->base.id; +else + out_resp->encoder_id =0 ; + +/* Only grab properties after probing, to make sure EDID and other +* properties reflect the latest status. */ + ret =drm_mode_object_get_properties (&connector->base, file_priv->atomic, + (uint32_t __user *)(unsigned long )(out_resp->props_ptr), + (uint64_t __user *)(unsigned long )(out_resp->prop_values_ptr), + &out_resp->count_props); +drm_modeset_unlock (&dev->mode_config.connection_mutex); + +out:drm_connector_put (connector);return ret;
Quoted 5 lines · On Mon, Jun 26, 2017 at 12:23 AM, <[email protected]> wrote:
The patch below does not apply to the 4.11-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]>.
This is what I have been using on the 4.11-stable tree and it works for me.
H.J.
From 7c093c31efb0be1f76c68109713a5604f7303fa2 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <[email protected]>
Date: Tue, 20 Jun 2017 22:28:37 +0200
Subject: [PATCH] drm: Fix GETCONNECTOR regression
Cherry picked from upstream commit e94ac3510b6a0f696f2c442c4fc4051c8101ef12
In
commit 91eefc05f0ac71902906b2058360e61bd25137fe
Author: Daniel Vetter <[email protected]> Date: Wed Dec 14 00:08:10 2016 +0100
drm: Tighten locking in drm_mode_getconnector
I reordered the logic a bit in that IOCTL, but that broke userspace since it'll get the new mode list, but not the new property values. Fix that again.
v2: Fix up the error path handling when copy_to_user for the modes failes (Dhinakaran).
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100576
--- drivers/gpu/drm/drm_connector.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-)
drivers/gpu/drm/drm_connector.c +20 -18
@@ -1169,21 +1169,6 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,if (!connector)return -ENOENT ; -drm_modeset_lock (&dev->mode_config.connection_mutex,NULL ); - encoder =drm_connector_get_encoder (connector); -if (encoder) - out_resp->encoder_id = encoder->base.id; -else - out_resp->encoder_id =0 ; - - ret =drm_mode_object_get_properties (&connector->base, file_priv->atomic, - (uint32_t __user *)(unsigned long )(out_resp->props_ptr), - (uint64_t __user *)(unsigned long )(out_resp->prop_values_ptr), - &out_resp->count_props); -drm_modeset_unlock (&dev->mode_config.connection_mutex); -if (ret) - goto out_unref; -for (i =0 ; i <DRM_CONNECTOR_MAX_ENCODER ; i++)if (connector->encoder_ids[i] !=0 ) encoders_count++;
@@ -1196,7 +1181,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,if (put_user (connector->encoder_ids[i], encoder_ptr + copied)) { ret = -EFAULT ; - goto out_unref; + goto out; } copied++; }
@@ -1240,15 +1225,32 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,if (copy_to_user (mode_ptr + copied, &u_mode,sizeof (u_mode))) { ret = -EFAULT ; +mutex_unlock (&dev->mode_config.mutex); + goto out; } copied++; } } out_resp->count_modes = mode_count; -out:mutex_unlock (&dev->mode_config.mutex); -out_unref: + +drm_modeset_lock (&dev->mode_config.connection_mutex,NULL ); + encoder =drm_connector_get_encoder (connector); +if (encoder) + out_resp->encoder_id = encoder->base.id; +else + out_resp->encoder_id =0 ; + +/* Only grab properties after probing, to make sure EDID and other +* properties reflect the latest status. */ + ret =drm_mode_object_get_properties (&connector->base, file_priv->atomic, + (uint32_t __user *)(unsigned long )(out_resp->props_ptr), + (uint64_t __user *)(unsigned long )(out_resp->prop_values_ptr), + &out_resp->count_props); +drm_modeset_unlock (&dev->mode_config.connection_mutex); + +out:drm_connector_unreference (connector);return ret;
Signature · 1 line
2.9.4
Greg Kroah-Hartman
maintainerQuoted 8 lines · H.J. Lu
Quoted 5 lines · On Mon, Jun 26, 2017 at 12:23 AM, <[email protected]> wrote:
The patch below does not apply to the 4.11-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]>.This is what I have been using on the 4.11-stable tree and it works for me.
That seems to work here, thanks, now queued up.
greg k-h