diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2016-09-13 19:37:53 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-09-13 15:45:29 +0200 |
| commit | 69b05825e1f883d15d3d051d0eab3171e247ecaa (patch) | |
| tree | a0069de9a06b5fe2cde31bc1697cc324c7993ea0 /sound/core | |
| parent | 071f1344f47946dfcb511bf0fbc998dd9a83be29 (diff) | |
| download | linux-69b05825e1f883d15d3d051d0eab3171e247ecaa.tar.gz linux-69b05825e1f883d15d3d051d0eab3171e247ecaa.tar.bz2 linux-69b05825e1f883d15d3d051d0eab3171e247ecaa.zip | |
ALSA: seq: fix to copy from/to user space
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>
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/seq/seq_clientmgr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c index 811b95b6f6fd..4c935202ce23 100644 --- a/sound/core/seq/seq_clientmgr.c +++ b/sound/core/seq/seq_clientmgr.c @@ -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. */ 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)) 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. */ if (handler->cmd == SNDRV_SEQ_IOCTL_SET_QUEUE_CLIENT || 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)) return -EFAULT; } |