Skip to contentSkip to conversation

ALSA: compress: add support for 32bit calls in a 64bit kernel

PATCH Superseded Ravindra Lokhande 2 participants 2 messages Dec 3, 2015

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ALSA: compress: add support for 32bit calls in a 64bit kernel

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

---
 sound/core/compress_offload.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
sound/core/compress_offload.c +12 -0
index b123c42..98f6b47 100644
@@ -847,6 +847,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, arg);
+}
+#endif
+
 static const struct file_operations snd_compr_file_ops = {
 		.owner =	THIS_MODULE,
 		.open =		snd_compr_open,
@@ -854,6 +863,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,
 };
Signature · 1 line
2.1.4
#1 lore raw
Quoted 16 lines · Ravindra Lokhande

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

---
 sound/core/compress_offload.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
sound/core/compress_offload.c +0 -0
index b123c42..98f6b47 100644
@@ -847,6 +847,15 @@ static long snd_compr_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
 	return retval;

sound/core/compress_offload.c static long snd_compr_ioctl(struct file *f, unsigned int cmd, unsigned long arg) · line 857

Quoted 10 lines
sound/core/compress_offload.c +8 -0
 }
 
+/* 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, arg);
+}
+#endif

This should work in most cases, but not perfectly. The arg passed here is basically a 32bit address, and it should be converted to a 64bit pointer via compat_ptr() macro. Except for a very few architectures, it's just a cast to 64bit, so it works in 99% cases.

A workaround would be like:

static long snd_compr_ioctl_compat(struct file *file, unsigned int cmd,
unsigned long arg)

{
	return snd_compr_ioctl(file, cmd, (long)compat_ptr(arg));
}

I looked through the current tree and found even a few places in sound/core/* doing similarly wrong. They need fixes...

thanks,

Takashi

Quoted 18 lines
sound/core/compress_offload.c +4 -0
+
 static const struct file_operations snd_compr_file_ops = {
 		.owner =	THIS_MODULE,
 		.open =		snd_compr_open,
@@ -854,6 +863,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,
 };
Signature · 1 line
2.1.4