From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [PATCH 4.14 23/95] drm: Match sysfs name in link removal to link creation Date: Mon, 21 May 2018 23:11:13 +0200 Message-ID: <20180521210452.986271536@linuxfoundation.org> References: <20180521210447.219380974@linuxfoundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 427326E011 for ; Mon, 21 May 2018 21:18:39 +0000 (UTC) In-Reply-To: <20180521210447.219380974@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: Haneen Mohammed , Greg Kroah-Hartman , Emil Velikov , stable@vger.kernel.org, David Airlie , dri-devel@lists.freedesktop.org, Alex Deucher , Daniel Vetter List-Id: dri-devel@lists.freedesktop.org NC4xNC1zdGFibGUgcmV2aWV3IHBhdGNoLiAgSWYgYW55b25lIGhhcyBhbnkgb2JqZWN0aW9ucywg cGxlYXNlIGxldCBtZSBrbm93LgoKLS0tLS0tLS0tLS0tLS0tLS0tCgpGcm9tOiBIYW5lZW4gTW9o YW1tZWQgPGhhbW9oYW1tZWQuc2FAZ21haWwuY29tPgoKY29tbWl0IDdmNmRmNDQwYjg2MjNjNDQx YzQyZDA3MGJmNTkyZTJkMmMxZmE5YmIgdXBzdHJlYW0uCgpUaGlzIHBhdGNoIG1hdGNoZXMgdGhl IHN5c2ZzIG5hbWUgdXNlZCBpbiB0aGUgdW5saW5raW5nIHdpdGggdGhlCmxpbmtpbmcgZnVuY3Rp b24uIE90aGVyd2lzZSwgcmVtb3ZlX2NvbXBhdF9jb250cm9sX2xpbmsoKSBmYWlscyB0byByZW1v dmUKc3lzZnMgY3JlYXRlZCBieSBjcmVhdGVfY29tcGF0X2NvbnRyb2xfbGluaygpIGluIGRybV9k ZXZfcmVnaXN0ZXIoKS4KCkZpeGVzOiA2NDQ5YjA4OGRkNTEgKCJkcm06IEFkZCBmYWtlIGNvbnRy b2xEKiBzeW1saW5rcyBmb3IgYmFja3dhcmRzCmNvbXBhdCIpCkNjOiBEYXZlIEFpcmxpZSA8YWly bGllZEBnbWFpbC5jb20+CkNjOiBBbGV4IERldWNoZXIgPGFsZXhhbmRlci5kZXVjaGVyQGFtZC5j b20+CkNjOiBFbWlsIFZlbGlrb3YgPGVtaWwubC52ZWxpa292QGdtYWlsLmNvbT4KQ2M6IERhdmlk IEhlcnJtYW5uIDxkaC5oZXJybWFubkBnbWFpbC5jb20+CkNjOiBHcmVnIEtyb2FoLUhhcnRtYW4g PGdyZWdraEBsaW51eGZvdW5kYXRpb24ub3JnPgpDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZl dHRlckBpbnRlbC5jb20+CkNjOiBHdXN0YXZvIFBhZG92YW4gPGd1c3Rhdm9AcGFkb3Zhbi5vcmc+ CkNjOiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29t PgpDYzogU2VhbiBQYXVsIDxzZWFucGF1bEBjaHJvbWl1bS5vcmc+CkNjOiBEYXZpZCBBaXJsaWUg PGFpcmxpZWRAbGludXguaWU+CkNjOiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCkNj OiA8c3RhYmxlQHZnZXIua2VybmVsLm9yZz4gIyB2NC4xMCsKU2lnbmVkLW9mZi1ieTogSGFuZWVu IE1vaGFtbWVkIDxoYW1vaGFtbWVkLnNhQGdtYWlsLmNvbT4KW3NlYW5wYXVsIGFkZGVkIEZpeGVz IGFuZCBDYyB0YWdzXQpTaWduZWQtb2ZmLWJ5OiBTZWFuIFBhdWwgPHNlYW5wYXVsQGNocm9taXVt Lm9yZz4KTGluazogaHR0cHM6Ly9wYXRjaHdvcmsuZnJlZWRlc2t0b3Aub3JnL3BhdGNoL21zZ2lk LzIwMTgwNTExMDQxNTQyLkdBNDI1M0BoYW5lZW4tdmIKU2lnbmVkLW9mZi1ieTogR3JlZyBLcm9h aC1IYXJ0bWFuIDxncmVna2hAbGludXhmb3VuZGF0aW9uLm9yZz4KCi0tLQogZHJpdmVycy9ncHUv ZHJtL2RybV9kcnYuYyB8ICAgIDIgKy0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwg MSBkZWxldGlvbigtKQoKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9kcnYuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vZHJtX2Rydi5jCkBAIC03NDksNyArNzQ5LDcgQEAgc3RhdGljIHZvaWQgcmVt b3ZlX2NvbXBhdF9jb250cm9sX2xpbmsocwogCWlmICghbWlub3IpCiAJCXJldHVybjsKIAotCW5h bWUgPSBrYXNwcmludGYoR0ZQX0tFUk5FTCwgImNvbnRyb2xEJWQiLCBtaW5vci0+aW5kZXgpOwor CW5hbWUgPSBrYXNwcmludGYoR0ZQX0tFUk5FTCwgImNvbnRyb2xEJWQiLCBtaW5vci0+aW5kZXgg KyA2NCk7CiAJaWYgKCFuYW1lKQogCQlyZXR1cm47CiAKCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZl bEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AB8JxZqJOAsavvFTg5Gws0Hy02Ng01TfWWU2M/nIT+knDBApTrjKZIPB+XGiNejhCJyk/JRXmJQT ARC-Seal: i=1; a=rsa-sha256; t=1526937519; cv=none; d=google.com; s=arc-20160816; b=t1S6/tpYZBjJCQSRFfV/JsHgvXjRbD4rgifcR218+bgj3aDHac3jvaOJaBMG66z9Nq aom0Lz++XbxvZE4HB8ca9k0Ii+FllWYKqmIXovOKSyQHgYyKlZitzKbIYImvrj93Jebw WrtLoPYl45yCq9+Cw9mzjvcDeA43WGgSApto1rnUVJlUNDcbtNjvLU/y6/NGMO+oUF3Y 9so3RGYkcclUzgwVvgGuh/n/36zGpIXjdVa7gvgTn8dE3EqPECBdTsdt8m3CulvRGjI/ TSsEmpc0bXKd5RVU8zj1qU6dB1TuWoPY+DOknsSEOZQAbRUd73+QUy36N9VOnzwTng7E qnLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=N3NZVY3VL6zzzwJ17733YqBLR0u86u41nY7fqfue+wc=; b=YJJhY4OMrDSDvDgR6CFoJBSrWyns+9JRPts9uVlCRxSOpasIxYDx+AD6BCGWX+m87t igHkgYzFrB+wDQB/kurWws3E5zPb+ZQscMz/NpBFt0d6SYj7PNCpA0d69Y1mZngZswpI /lUviQbiOQqUXpkbcoGUu5iWpuiVwvQS5DjQS2yL1w6X/hnmt0CJW3q9iN18/z2QZlgk PEOJNeUwTQqkqYOCVD6k2adCFM8D/2L53kkLrD3JD89bphaYMKWCG+dGJhAt0vMaz6f3 O0eIHRQx2WSa2Z+6xwouKZoDIIsZR0Ml+M8oVGYqLEU/X0H6zjz6O3crnBykTERDWKn2 TxMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=wGrVdAQq; spf=pass (google.com: domain of srs0=nia/=ii=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=nia/=II=linuxfoundation.org=gregkh@kernel.org Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=wGrVdAQq; spf=pass (google.com: domain of srs0=nia/=ii=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=nia/=II=linuxfoundation.org=gregkh@kernel.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dave Airlie , Alex Deucher , Emil Velikov , David Herrmann , Daniel Vetter , Gustavo Padovan , Maarten Lankhorst , Sean Paul , David Airlie , dri-devel@lists.freedesktop.org, Haneen Mohammed Subject: [PATCH 4.14 23/95] drm: Match sysfs name in link removal to link creation Date: Mon, 21 May 2018 23:11:13 +0200 Message-Id: <20180521210452.986271536@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180521210447.219380974@linuxfoundation.org> References: <20180521210447.219380974@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1601110036205273170?= X-GMAIL-MSGID: =?utf-8?q?1601110036205273170?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Haneen Mohammed commit 7f6df440b8623c441c42d070bf592e2d2c1fa9bb upstream. This patch matches the sysfs name used in the unlinking with the linking function. Otherwise, remove_compat_control_link() fails to remove sysfs created by create_compat_control_link() in drm_dev_register(). Fixes: 6449b088dd51 ("drm: Add fake controlD* symlinks for backwards compat") Cc: Dave Airlie Cc: Alex Deucher Cc: Emil Velikov Cc: David Herrmann Cc: Greg Kroah-Hartman Cc: Daniel Vetter Cc: Gustavo Padovan Cc: Maarten Lankhorst Cc: Sean Paul Cc: David Airlie Cc: dri-devel@lists.freedesktop.org Cc: # v4.10+ Signed-off-by: Haneen Mohammed [seanpaul added Fixes and Cc tags] Signed-off-by: Sean Paul Link: https://patchwork.freedesktop.org/patch/msgid/20180511041542.GA4253@haneen-vb Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/drm_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -749,7 +749,7 @@ static void remove_compat_control_link(s if (!minor) return; - name = kasprintf(GFP_KERNEL, "controlD%d", minor->index); + name = kasprintf(GFP_KERNEL, "controlD%d", minor->index + 64); if (!name) return;