diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-20 13:30:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-20 13:30:47 +0200 |
| commit | 6f828c55e26769666e0ae56b037f948dc26fe0d4 (patch) | |
| tree | 0febffe47a36cfacfa965f8d26acffb0caf6d2b5 | |
| parent | doc: fix documentation about UIO_MEM_LOGICAL using (diff) | |
| parent | habanalabs: use u64_to_user_ptr() for reading user pointers (diff) | |
| download | linux-dev-6f828c55e26769666e0ae56b037f948dc26fe0d4.tar.xz linux-dev-6f828c55e26769666e0ae56b037f948dc26fe0d4.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | drivers/misc/habanalabs/habanalabs_ioctl.c | 2 |
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) params->op = args->op; if (args->input_ptr && args->input_size) { - input = memdup_user((const void __user *) args->input_ptr, + input = memdup_user(u64_to_user_ptr(args->input_ptr), args->input_size); if (IS_ERR(input)) { rc = PTR_ERR(input); |