Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7b6c5fe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 3c28c9cc 39c01bf9

drivers/gpu/drm/amd/amdkfd/kfd_chardev.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -558,8 +558,7 @@ static int kfd_ioctl_dbg_address_watch(struct file *filep, 
		return -EINVAL;

		return -EINVAL;





	/* this is the actual buffer to work with */

	/* this is the actual buffer to work with */



	args_buff = memdup_user(cmd_from_user,

	args_buff = memdup_user(args_buff,

				args->buf_size_in_bytes - sizeof(*args));

				args->buf_size_in_bytes - sizeof(*args));

	if (IS_ERR(args_buff))

	if (IS_ERR(args_buff))

		return PTR_ERR(args_buff);

		return PTR_ERR(args_buff);