aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-20 07:30:47 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-20 07:30:47 -0400
commit6f828c55e26769666e0ae56b037f948dc26fe0d4 (patch)
tree0febffe47a36cfacfa965f8d26acffb0caf6d2b5
parent6ad805b82dc5fc0ffd2de1d1f0de47214a050278 (diff)
parentf99bc332c713b7672bad5236060b02f0c41c7242 (diff)
Merge tag 'misc-habanalabs-fixes-2019-06-20' of git://people.freedesktop.org/~gabbayo/linux into char-misc-linus
Oded writes: This tag contains the following fix: - Casting warning of a 64-bit integer in 32-bit architecture. Use the macro that was defined for this purpose. * tag 'misc-habanalabs-fixes-2019-06-20' of git://people.freedesktop.org/~gabbayo/linux: habanalabs: use u64_to_user_ptr() for reading user pointers
-rw-r--r--drivers/misc/habanalabs/habanalabs_ioctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/habanalabs/habanalabs_ioctl.c b/drivers/misc/habanalabs/habanalabs_ioctl.c
index eeefb22023e9..b7a0eecf6b6c 100644
--- a/drivers/misc/habanalabs/habanalabs_ioctl.c
+++ b/drivers/misc/habanalabs/habanalabs_ioctl.c
@@ -140,7 +140,7 @@ static int debug_coresight(struct hl_device *hdev, struct hl_debug_args *args)
140 params->op = args->op; 140 params->op = args->op;
141 141
142 if (args->input_ptr && args->input_size) { 142 if (args->input_ptr && args->input_size) {
143 input = memdup_user((const void __user *) args->input_ptr, 143 input = memdup_user(u64_to_user_ptr(args->input_ptr),
144 args->input_size); 144 args->input_size);
145 if (IS_ERR(input)) { 145 if (IS_ERR(input)) {
146 rc = PTR_ERR(input); 146 rc = PTR_ERR(input);