From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [PATCH 4.11 52/58] drm: Fix GETCONNECTOR regression Date: Tue, 27 Jun 2017 16:12:55 +0200 Message-ID: <20170627141115.584711114@linuxfoundation.org> References: <20170627141113.402913097@linuxfoundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 517FB6E3B8 for ; Tue, 27 Jun 2017 14:16:18 +0000 (UTC) In-Reply-To: <20170627141113.402913097@linuxfoundation.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org Cc: "H.J. Lu" , Greg Kroah-Hartman , dri-devel@lists.freedesktop.org, stable@vger.kernel.org, Daniel Vetter , "Pandiyan, Dhinakaran" List-Id: dri-devel@lists.freedesktop.org NC4xMS1zdGFibGUgcmV2aWV3IHBhdGNoLiAgSWYgYW55b25lIGhhcyBhbnkgb2JqZWN0aW9ucywg cGxlYXNlIGxldCBtZSBrbm93LgoKLS0tLS0tLS0tLS0tLS0tLS0tCgpGcm9tOiBEYW5pZWwgVmV0 dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgoKY29tbWl0IGU5NGFjMzUxMGI2YTBmNjk2ZjJj NDQyYzRmYzQwNTFjODEwMWVmMTIgdXBzdHJlYW0uCgpJbgoKY29tbWl0IDkxZWVmYzA1ZjBhYzcx OTAyOTA2YjIwNTgzNjBlNjFiZDI1MTM3ZmUKQXV0aG9yOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwu dmV0dGVyQGZmd2xsLmNoPgpEYXRlOiAgIFdlZCBEZWMgMTQgMDA6MDg6MTAgMjAxNiArMDEwMAoK ICAgIGRybTogVGlnaHRlbiBsb2NraW5nIGluIGRybV9tb2RlX2dldGNvbm5lY3RvcgoKSSByZW9y ZGVyZWQgdGhlIGxvZ2ljIGEgYml0IGluIHRoYXQgSU9DVEwsIGJ1dCB0aGF0IGJyb2tlIHVzZXJz cGFjZQpzaW5jZSBpdCdsbCBnZXQgdGhlIG5ldyBtb2RlIGxpc3QsIGJ1dCBub3QgdGhlIG5ldyBw cm9wZXJ0eSB2YWx1ZXMuCkZpeCB0aGF0IGFnYWluLgoKdjI6IEZpeCB1cCB0aGUgZXJyb3IgcGF0 aCBoYW5kbGluZyB3aGVuIGNvcHlfdG9fdXNlciBmb3IgdGhlIG1vZGVzCmZhaWxlcyAoRGhpbmFr YXJhbikuCgpGaXhlczogOTFlZWZjMDVmMGFjICgiZHJtOiBUaWdodGVuIGxvY2tpbmcgaW4gZHJt X21vZGVfZ2V0Y29ubmVjdG9yIikKQ2M6IFNlYW4gUGF1bCA8c2VhbnBhdWxAY2hyb21pdW0ub3Jn PgpDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBpbnRlbC5jb20+CkNjOiBKYW5pIE5p a3VsYSA8amFuaS5uaWt1bGFAbGludXguaW50ZWwuY29tPgpDYzogRGF2aWQgQWlybGllIDxhaXJs aWVkQGxpbnV4LmllPgpDYzogZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpSZXBvcnRl ZC1ieTogIkguSi4gTHUiIDxoamwudG9vbHNAZ21haWwuY29tPgpUZXN0ZWQtYnk6ICJILkouIEx1 IiA8aGpsLnRvb2xzQGdtYWlsLmNvbT4KQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3Rv cC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDU3NgpDYzogIkguSi4gTHUiIDxoamwudG9vbHNAZ21h aWwuY29tPgpDYzogIlBhbmRpeWFuLCBEaGluYWthcmFuIiA8ZGhpbmFrYXJhbi5wYW5kaXlhbkBp bnRlbC5jb20+ClJldmlld2VkLWJ5OiBTZWFuIFBhdWwgPHNlYW5wYXVsQGNocm9taXVtLm9yZz4K UmV2aWV3ZWQtYnk6IERoaW5ha2FyYW4gUGFuZGl5YW4gPGRoaW5ha2FyYW4ucGFuZGl5YW5AaW50 ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGludGVs LmNvbT4KTGluazogaHR0cDovL3BhdGNod29yay5mcmVlZGVza3RvcC5vcmcvcGF0Y2gvbXNnaWQv MjAxNzA2MjAyMDI4MzcuMTcwMS0xLWRhbmllbC52ZXR0ZXJAZmZ3bGwuY2gKU2lnbmVkLW9mZi1i eTogR3JlZyBLcm9haC1IYXJ0bWFuIDxncmVna2hAbGludXhmb3VuZGF0aW9uLm9yZz4KCi0tLQog ZHJpdmVycy9ncHUvZHJtL2RybV9jb25uZWN0b3IuYyB8ICAgMzggKysrKysrKysrKysrKysrKysr KystLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyMCBpbnNlcnRpb25zKCspLCAx OCBkZWxldGlvbnMoLSkKCi0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fY29ubmVjdG9yLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2RybV9jb25uZWN0b3IuYwpAQCAtMTE2OSwyMSArMTE2OSw2IEBA IGludCBkcm1fbW9kZV9nZXRjb25uZWN0b3Ioc3RydWN0IGRybV9kZXYKIAlpZiAoIWNvbm5lY3Rv cikKIAkJcmV0dXJuIC1FTk9FTlQ7CiAKLQlkcm1fbW9kZXNldF9sb2NrKCZkZXYtPm1vZGVfY29u ZmlnLmNvbm5lY3Rpb25fbXV0ZXgsIE5VTEwpOwotCWVuY29kZXIgPSBkcm1fY29ubmVjdG9yX2dl dF9lbmNvZGVyKGNvbm5lY3Rvcik7Ci0JaWYgKGVuY29kZXIpCi0JCW91dF9yZXNwLT5lbmNvZGVy X2lkID0gZW5jb2Rlci0+YmFzZS5pZDsKLQllbHNlCi0JCW91dF9yZXNwLT5lbmNvZGVyX2lkID0g MDsKLQotCXJldCA9IGRybV9tb2RlX29iamVjdF9nZXRfcHJvcGVydGllcygmY29ubmVjdG9yLT5i YXNlLCBmaWxlX3ByaXYtPmF0b21pYywKLQkJCSh1aW50MzJfdCBfX3VzZXIgKikodW5zaWduZWQg bG9uZykob3V0X3Jlc3AtPnByb3BzX3B0ciksCi0JCQkodWludDY0X3QgX191c2VyICopKHVuc2ln bmVkIGxvbmcpKG91dF9yZXNwLT5wcm9wX3ZhbHVlc19wdHIpLAotCQkJJm91dF9yZXNwLT5jb3Vu dF9wcm9wcyk7Ci0JZHJtX21vZGVzZXRfdW5sb2NrKCZkZXYtPm1vZGVfY29uZmlnLmNvbm5lY3Rp b25fbXV0ZXgpOwotCWlmIChyZXQpCi0JCWdvdG8gb3V0X3VucmVmOwotCiAJZm9yIChpID0gMDsg aSA8IERSTV9DT05ORUNUT1JfTUFYX0VOQ09ERVI7IGkrKykKIAkJaWYgKGNvbm5lY3Rvci0+ZW5j b2Rlcl9pZHNbaV0gIT0gMCkKIAkJCWVuY29kZXJzX2NvdW50Kys7CkBAIC0xMTk2LDcgKzExODEs NyBAQCBpbnQgZHJtX21vZGVfZ2V0Y29ubmVjdG9yKHN0cnVjdCBkcm1fZGV2CiAJCQkJaWYgKHB1 dF91c2VyKGNvbm5lY3Rvci0+ZW5jb2Rlcl9pZHNbaV0sCiAJCQkJCSAgICAgZW5jb2Rlcl9wdHIg KyBjb3BpZWQpKSB7CiAJCQkJCXJldCA9IC1FRkFVTFQ7Ci0JCQkJCWdvdG8gb3V0X3VucmVmOwor CQkJCQlnb3RvIG91dDsKIAkJCQl9CiAJCQkJY29waWVkKys7CiAJCQl9CkBAIC0xMjQwLDE1ICsx MjI1LDMyIEBAIGludCBkcm1fbW9kZV9nZXRjb25uZWN0b3Ioc3RydWN0IGRybV9kZXYKIAkJCWlm IChjb3B5X3RvX3VzZXIobW9kZV9wdHIgKyBjb3BpZWQsCiAJCQkJCSAmdV9tb2RlLCBzaXplb2Yo dV9tb2RlKSkpIHsKIAkJCQlyZXQgPSAtRUZBVUxUOworCQkJCW11dGV4X3VubG9jaygmZGV2LT5t b2RlX2NvbmZpZy5tdXRleCk7CisKIAkJCQlnb3RvIG91dDsKIAkJCX0KIAkJCWNvcGllZCsrOwog CQl9CiAJfQogCW91dF9yZXNwLT5jb3VudF9tb2RlcyA9IG1vZGVfY291bnQ7Ci1vdXQ6CiAJbXV0 ZXhfdW5sb2NrKCZkZXYtPm1vZGVfY29uZmlnLm11dGV4KTsKLW91dF91bnJlZjoKKworCWRybV9t b2Rlc2V0X2xvY2soJmRldi0+bW9kZV9jb25maWcuY29ubmVjdGlvbl9tdXRleCwgTlVMTCk7CisJ ZW5jb2RlciA9IGRybV9jb25uZWN0b3JfZ2V0X2VuY29kZXIoY29ubmVjdG9yKTsKKwlpZiAoZW5j b2RlcikKKwkJb3V0X3Jlc3AtPmVuY29kZXJfaWQgPSBlbmNvZGVyLT5iYXNlLmlkOworCWVsc2UK KwkJb3V0X3Jlc3AtPmVuY29kZXJfaWQgPSAwOworCisJLyogT25seSBncmFiIHByb3BlcnRpZXMg YWZ0ZXIgcHJvYmluZywgdG8gbWFrZSBzdXJlIEVESUQgYW5kIG90aGVyCisJICogcHJvcGVydGll cyByZWZsZWN0IHRoZSBsYXRlc3Qgc3RhdHVzLiAqLworCXJldCA9IGRybV9tb2RlX29iamVjdF9n ZXRfcHJvcGVydGllcygmY29ubmVjdG9yLT5iYXNlLCBmaWxlX3ByaXYtPmF0b21pYywKKwkJCSh1 aW50MzJfdCBfX3VzZXIgKikodW5zaWduZWQgbG9uZykob3V0X3Jlc3AtPnByb3BzX3B0ciksCisJ CQkodWludDY0X3QgX191c2VyICopKHVuc2lnbmVkIGxvbmcpKG91dF9yZXNwLT5wcm9wX3ZhbHVl c19wdHIpLAorCQkJJm91dF9yZXNwLT5jb3VudF9wcm9wcyk7CisJZHJtX21vZGVzZXRfdW5sb2Nr KCZkZXYtPm1vZGVfY29uZmlnLmNvbm5lY3Rpb25fbXV0ZXgpOworCitvdXQ6CiAJZHJtX2Nvbm5l Y3Rvcl91bnJlZmVyZW5jZShjb25uZWN0b3IpOwogCiAJcmV0dXJuIHJldDsKCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBs aXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753159AbdF0OUq (ORCPT ); Tue, 27 Jun 2017 10:20:46 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:56718 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752370AbdF0OQX (ORCPT ); Tue, 27 Jun 2017 10:16:23 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sean Paul , Daniel Vetter , Jani Nikula , David Airlie , dri-devel@lists.freedesktop.org, "H.J. Lu" , "Pandiyan, Dhinakaran" Subject: [PATCH 4.11 52/58] drm: Fix GETCONNECTOR regression Date: Tue, 27 Jun 2017 16:12:55 +0200 Message-Id: <20170627141115.584711114@linuxfoundation.org> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170627141113.402913097@linuxfoundation.org> References: <20170627141113.402913097@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Daniel Vetter commit e94ac3510b6a0f696f2c442c4fc4051c8101ef12 upstream. In commit 91eefc05f0ac71902906b2058360e61bd25137fe Author: Daniel Vetter 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). Fixes: 91eefc05f0ac ("drm: Tighten locking in drm_mode_getconnector") Cc: Sean Paul Cc: Daniel Vetter Cc: Jani Nikula Cc: David Airlie Cc: dri-devel@lists.freedesktop.org Reported-by: "H.J. Lu" Tested-by: "H.J. Lu" Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100576 Cc: "H.J. Lu" Cc: "Pandiyan, Dhinakaran" Reviewed-by: Sean Paul Reviewed-by: Dhinakaran Pandiyan Signed-off-by: Daniel Vetter Link: http://patchwork.freedesktop.org/patch/msgid/20170620202837.1701-1-daniel.vetter@ffwll.ch Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/drm_connector.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -1169,21 +1169,6 @@ int drm_mode_getconnector(struct drm_dev 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_dev 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_dev 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;