diff options
| author | Linus Torvalds | 2016-01-15 12:41:32 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2016-01-15 12:41:32 -0800 |
| commit | c7b6c5fe67d1519759de2014a2c44f50fb1426f3 (patch) | |
| tree | 6ae3d8ab677a7e784653de9aa726715265eafd30 /drivers/gpu | |
| parent | 3c28c9ccafd8bfb30ede7f36bf099b071b977209 (diff) | |
| parent | 39c01bf933106296e43e46cdbd9edce13ae5a5b7 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs regression fix from Al Viro:
"Fix for braino introduced in vfs.git#work.misc"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
amdkfd: Copy from the proper user command pointer
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c index d321222fd92e..d2b49c026cf6 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c @@ -558,8 +558,7 @@ static int kfd_ioctl_dbg_address_watch(struct file *filep, return -EINVAL; /* this is the actual buffer to work with */ - - args_buff = memdup_user(args_buff, + args_buff = memdup_user(cmd_from_user, args->buf_size_in_bytes - sizeof(*args)); if (IS_ERR(args_buff)) return PTR_ERR(args_buff); |