From e162927cd1617028a3e2e775a24a89fccb7f67fd Mon Sep 17 00:00:00 2001 From: Ravindra Lokhande Date: Mon, 7 Dec 2015 12:08:31 +0530 Subject: [PATCH] ALSA: compress: add support for 32bit calls in a 64bit kernel commit c10368897e104c008c610915a218f0fe5fa4ec96 upstream. Compress offload does not support ioctl calls from a 32bit userspace in a 64 bit kernel. This patch adds support for ioctls from a 32bit userspace in a 64bit kernel Signed-off-by: Ravindra Lokhande Acked-by: Vinod Koul Signed-off-by: Takashi Iwai Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman --- sound/core/compress_offload.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index 2272aee12871..3c88a3384064 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -859,6 +860,15 @@ static long snd_compr_ioctl(struct file *f, unsigned int cmd, unsigned long arg) return retval; } +/* support of 32bit userspace on 64bit platforms */ +#ifdef CONFIG_COMPAT +static long snd_compr_ioctl_compat(struct file *file, unsigned int cmd, + unsigned long arg) +{ + return snd_compr_ioctl(file, cmd, (unsigned long)compat_ptr(arg)); +} +#endif + static const struct file_operations snd_compr_file_ops = { .owner = THIS_MODULE, .open = snd_compr_open, @@ -866,6 +876,9 @@ static const struct file_operations snd_compr_file_ops = { .write = snd_compr_write, .read = snd_compr_read, .unlocked_ioctl = snd_compr_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = snd_compr_ioctl_compat, +#endif .mmap = snd_compr_mmap, .poll = snd_compr_poll, };