AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ALSA: seq: fix to copy from/to user space

Browse Source 
When checking value of request for copy operation, current implementation
compares shifted value to macros, while these macros are already shifted.
As a result, it never performs to copy from/to user space.

This commit fixes the bug.

Fixes: 8ce8eb601c71('ALSA: seq: add an alternative way to handle ioctl requests'
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Sakamoto 2016-09-13 19:37:53 +09:00 committed by Takashi Iwai
parent 071f1344f4
commit 69b05825e1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/core/seq/seq_clientmgr.c
View File

@ -2122,7 +2122,7 @@ static long snd_seq_ioctl(struct file *file, unsigned int cmd,
* within 13 bits. We can safely pick up the size from the command. * within 13 bits. We can safely pick up the size from the command.
*/ */
size = _IOC_SIZE(handler->cmd); size = _IOC_SIZE(handler->cmd);
if (_IOC_DIR(handler->cmd) & IOC_IN) { if (handler->cmd & IOC_IN) {
if (copy_from_user(&buf, (const void __user *)arg, size)) if (copy_from_user(&buf, (const void __user *)arg, size))
return -EFAULT; return -EFAULT;
} }
@ -2132,7 +2132,7 @@ static long snd_seq_ioctl(struct file *file, unsigned int cmd,
/* Some commands includes a bug in 'dir' field. */ /* Some commands includes a bug in 'dir' field. */
if (handler->cmd == SNDRV_SEQ_IOCTL_SET_QUEUE_CLIENT || if (handler->cmd == SNDRV_SEQ_IOCTL_SET_QUEUE_CLIENT ||
handler->cmd == SNDRV_SEQ_IOCTL_SET_CLIENT_POOL || handler->cmd == SNDRV_SEQ_IOCTL_SET_CLIENT_POOL ||
(_IOC_DIR(handler->cmd) & IOC_OUT)) (handler->cmd & IOC_OUT))
if (copy_to_user((void __user *)arg, &buf, size)) if (copy_to_user((void __user *)arg, &buf, size))
return -EFAULT; return -EFAULT;
} }