From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.19 083/167] drm: add __user attribute to ptr_to_compat() Date: Tue, 3 Sep 2019 12:23:55 -0400 Message-ID: <20190903162519.7136-83-sashal@kernel.org> References: <20190903162519.7136-1-sashal@kernel.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 38A2589728 for ; Tue, 3 Sep 2019 16:27:49 +0000 (UTC) In-Reply-To: <20190903162519.7136-1-sashal@kernel.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, stable@vger.kernel.org Cc: Sasha Levin , Ben Dooks , Sean Paul , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogQmVuIERvb2tzIDxiZW4uZG9va3NAY29kZXRoaW5rLmNvLnVrPgoKWyBVcHN0cmVhbSBj b21taXQgZTU1MmYwODUxMDcwZmU0OTc1ZDYxMGE5OTkxMGJlNGU5YmY1ZDdiZCBdCgpUaGUgcHRy X3RvX2NvbXBhdCgpIGNhbGwgdGFrZXMgYSAidm9pZCBfX3VzZXIgKiIsIHNvIGNhc3QKdGhlIGNv bXBhdCBkcm0gY2FsbHMgdGhhdCB1c2UgaXQgdG8gYXZvaWQgdGhlIGZvbGxvd2luZwp3YXJuaW5n cyBmcm9tIHNwYXJzZToKCmRyaXZlcnMvZ3B1L2RybS9kcm1faW9jMzIuYzoxODg6Mzk6IHdhcm5p bmc6IGluY29ycmVjdCB0eXBlIGluIGFyZ3VtZW50IDEgKGRpZmZlcmVudCBhZGRyZXNzIHNwYWNl cykKZHJpdmVycy9ncHUvZHJtL2RybV9pb2MzMi5jOjE4ODozOTogICAgZXhwZWN0ZWQgdm9pZCBb bm9kZXJlZl0gPGFzbjoxPip1cHRyCmRyaXZlcnMvZ3B1L2RybS9kcm1faW9jMzIuYzoxODg6Mzk6 ICAgIGdvdCB2b2lkICpbYWRkcmVzc2FibGVdIFthc3NpZ25lZF0gaGFuZGxlCmRyaXZlcnMvZ3B1 L2RybS9kcm1faW9jMzIuYzo1Mjk6NDE6IHdhcm5pbmc6IGluY29ycmVjdCB0eXBlIGluIGFyZ3Vt ZW50IDEgKGRpZmZlcmVudCBhZGRyZXNzIHNwYWNlcykKZHJpdmVycy9ncHUvZHJtL2RybV9pb2Mz Mi5jOjUyOTo0MTogICAgZXhwZWN0ZWQgdm9pZCBbbm9kZXJlZl0gPGFzbjoxPip1cHRyCmRyaXZl cnMvZ3B1L2RybS9kcm1faW9jMzIuYzo1Mjk6NDE6ICAgIGdvdCB2b2lkICpbYWRkcmVzc2FibGVd IFthc3NpZ25lZF0gaGFuZGxlCgpDYzogc3RhYmxlQHZnZXIua2VybmVsLm9yZwpTaWduZWQtb2Zm LWJ5OiBCZW4gRG9va3MgPGJlbi5kb29rc0Bjb2RldGhpbmsuY28udWs+ClNpZ25lZC1vZmYtYnk6 IFNlYW4gUGF1bCA8c2VhbnBhdWxAY2hyb21pdW0ub3JnPgpMaW5rOiBodHRwczovL3BhdGNod29y ay5mcmVlZGVza3RvcC5vcmcvcGF0Y2gvbXNnaWQvMjAxOTAzMDExMjAwNDYuMjY5NjEtMS1iZW4u ZG9va3NAY29kZXRoaW5rLmNvLnVrClNpZ25lZC1vZmYtYnk6IFNhc2hhIExldmluIDxzYXNoYWxA a2VybmVsLm9yZz4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2lvYzMyLmMgfCA2ICsrKy0tLQog MSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2lvYzMyLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2lv YzMyLmMKaW5kZXggMTM4NjgwYjM3YzcwOS4uZjg2NzIyMzhkNDQ0YiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2RybV9pb2MzMi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1faW9jMzIu YwpAQCAtMTg1LDcgKzE4NSw3IEBAIHN0YXRpYyBpbnQgY29tcGF0X2RybV9nZXRtYXAoc3RydWN0 IGZpbGUgKmZpbGUsIHVuc2lnbmVkIGludCBjbWQsCiAJbTMyLnNpemUgPSBtYXAuc2l6ZTsKIAlt MzIudHlwZSA9IG1hcC50eXBlOwogCW0zMi5mbGFncyA9IG1hcC5mbGFnczsKLQltMzIuaGFuZGxl ID0gcHRyX3RvX2NvbXBhdChtYXAuaGFuZGxlKTsKKwltMzIuaGFuZGxlID0gcHRyX3RvX2NvbXBh dCgodm9pZCBfX3VzZXIgKiltYXAuaGFuZGxlKTsKIAltMzIubXRyciA9IG1hcC5tdHJyOwogCWlm IChjb3B5X3RvX3VzZXIoYXJncCwgJm0zMiwgc2l6ZW9mKG0zMikpKQogCQlyZXR1cm4gLUVGQVVM VDsKQEAgLTIxNiw3ICsyMTYsNyBAQCBzdGF0aWMgaW50IGNvbXBhdF9kcm1fYWRkbWFwKHN0cnVj dCBmaWxlICpmaWxlLCB1bnNpZ25lZCBpbnQgY21kLAogCiAJbTMyLm9mZnNldCA9IG1hcC5vZmZz ZXQ7CiAJbTMyLm10cnIgPSBtYXAubXRycjsKLQltMzIuaGFuZGxlID0gcHRyX3RvX2NvbXBhdCht YXAuaGFuZGxlKTsKKwltMzIuaGFuZGxlID0gcHRyX3RvX2NvbXBhdCgodm9pZCBfX3VzZXIgKilt YXAuaGFuZGxlKTsKIAlpZiAobWFwLmhhbmRsZSAhPSBjb21wYXRfcHRyKG0zMi5oYW5kbGUpKQog CQlwcl9lcnJfcmF0ZWxpbWl0ZWQoImNvbXBhdF9kcm1fYWRkbWFwIHRydW5jYXRlZCBoYW5kbGUg JXAgZm9yIHR5cGUgJWQgb2Zmc2V0ICV4XG4iLAogCQkJCSAgIG1hcC5oYW5kbGUsIG0zMi50eXBl LCBtMzIub2Zmc2V0KTsKQEAgLTUyOSw3ICs1MjksNyBAQCBzdGF0aWMgaW50IGNvbXBhdF9kcm1f Z2V0c2FyZWFjdHgoc3RydWN0IGZpbGUgKmZpbGUsIHVuc2lnbmVkIGludCBjbWQsCiAJaWYgKGVy cikKIAkJcmV0dXJuIGVycjsKIAotCXJlcTMyLmhhbmRsZSA9IHB0cl90b19jb21wYXQocmVxLmhh bmRsZSk7CisJcmVxMzIuaGFuZGxlID0gcHRyX3RvX2NvbXBhdCgodm9pZCBfX3VzZXIgKilyZXEu aGFuZGxlKTsKIAlpZiAoY29weV90b191c2VyKGFyZ3AsICZyZXEzMiwgc2l6ZW9mKHJlcTMyKSkp CiAJCXJldHVybiAtRUZBVUxUOwogCi0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVs QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2RyaS1kZXZlbA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7BB8C3A5A2 for ; Tue, 3 Sep 2019 16:27:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B23E2215EA for ; Tue, 3 Sep 2019 16:27:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567528077; bh=krAUKclN5zuG1oCarZQF52J+e248ke7MQqKEOMq6egk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Ojm7jl/SBBXduZh2NsGk56ykOWyrej0J72mpJ3ywvRUu1R9BR4KqoG55YdSFV4gi0 2SHl9Ed+t8Mnh/bD2RuWw+IHNdKev17qcfeo6frUANH5n1O3Wrdbm/D9O3BHViQask cGW2bysyTYtDbYQJ29j1wvKgO2lAqjvMqC+dfw9U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730539AbfICQ15 (ORCPT ); Tue, 3 Sep 2019 12:27:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:49358 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730957AbfICQ1u (ORCPT ); Tue, 3 Sep 2019 12:27:50 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 701D3238C6; Tue, 3 Sep 2019 16:27:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567528069; bh=krAUKclN5zuG1oCarZQF52J+e248ke7MQqKEOMq6egk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uS7PmZ9YH8yfjYHHeRe+aV4VqFPg6QQxiyde4g/BbA6OQdZ9DvvN6RYooZUsa54DW 9C9r6o+dPk5AKQPQWkNmv3WKIaW5KZ/WD1Df8DOBX6FVSOvhi3TMDbkOB6XsH++ve3 LFFk7xJAbmp92sqmE2sATw+plEpSWPJdO5z+tVO8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ben Dooks , Sean Paul , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 083/167] drm: add __user attribute to ptr_to_compat() Date: Tue, 3 Sep 2019 12:23:55 -0400 Message-Id: <20190903162519.7136-83-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190903162519.7136-1-sashal@kernel.org> References: <20190903162519.7136-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ben Dooks [ Upstream commit e552f0851070fe4975d610a99910be4e9bf5d7bd ] The ptr_to_compat() call takes a "void __user *", so cast the compat drm calls that use it to avoid the following warnings from sparse: drivers/gpu/drm/drm_ioc32.c:188:39: warning: incorrect type in argument 1 (different address spaces) drivers/gpu/drm/drm_ioc32.c:188:39: expected void [noderef] *uptr drivers/gpu/drm/drm_ioc32.c:188:39: got void *[addressable] [assigned] handle drivers/gpu/drm/drm_ioc32.c:529:41: warning: incorrect type in argument 1 (different address spaces) drivers/gpu/drm/drm_ioc32.c:529:41: expected void [noderef] *uptr drivers/gpu/drm/drm_ioc32.c:529:41: got void *[addressable] [assigned] handle Cc: stable@vger.kernel.org Signed-off-by: Ben Dooks Signed-off-by: Sean Paul Link: https://patchwork.freedesktop.org/patch/msgid/20190301120046.26961-1-ben.dooks@codethink.co.uk Signed-off-by: Sasha Levin --- drivers/gpu/drm/drm_ioc32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c index 138680b37c709..f8672238d444b 100644 --- a/drivers/gpu/drm/drm_ioc32.c +++ b/drivers/gpu/drm/drm_ioc32.c @@ -185,7 +185,7 @@ static int compat_drm_getmap(struct file *file, unsigned int cmd, m32.size = map.size; m32.type = map.type; m32.flags = map.flags; - m32.handle = ptr_to_compat(map.handle); + m32.handle = ptr_to_compat((void __user *)map.handle); m32.mtrr = map.mtrr; if (copy_to_user(argp, &m32, sizeof(m32))) return -EFAULT; @@ -216,7 +216,7 @@ static int compat_drm_addmap(struct file *file, unsigned int cmd, m32.offset = map.offset; m32.mtrr = map.mtrr; - m32.handle = ptr_to_compat(map.handle); + m32.handle = ptr_to_compat((void __user *)map.handle); if (map.handle != compat_ptr(m32.handle)) pr_err_ratelimited("compat_drm_addmap truncated handle %p for type %d offset %x\n", map.handle, m32.type, m32.offset); @@ -529,7 +529,7 @@ static int compat_drm_getsareactx(struct file *file, unsigned int cmd, if (err) return err; - req32.handle = ptr_to_compat(req.handle); + req32.handle = ptr_to_compat((void __user *)req.handle); if (copy_to_user(argp, &req32, sizeof(req32))) return -EFAULT; -- 2.20.1