2005-01-18 16:32:17

by Takashi Iwai

[permalink] [raw]

Subject: [PATCH 0/3] Conversion to compat_ioctl for ALSA drivers

---

Hi,

the following three patches convert the 32bit ioctl layer of ALSA to
the new compat_ioctl (and unlocked_ioctl for native ioctls).

The first patch covers the basic entries and control API.
The second patch is for PCM API.
The last one is for other APIs including OSS-emulation modules.

After these patches are applied, remove the whole subtree in
sound/core/ioctl32. The files in this directory are no longer
necessary.


Takashi

2005-01-30 18:04:16

by Brian Gerst

[permalink] [raw]

Subject: Re: [PATCH 0/3] Conversion to compat_ioctl for ALSA drivers

---

--- linux/sound/core/pcm_native.c.bak 2005-01-30 11:15:24.000000000 -0500
+++ linux/sound/core/pcm_native.c 2005-01-30 11:17:31.000000000 -0500
@@ -602,17 +602,13 @@
return 0;
}

-static int snd_pcm_channel_info(snd_pcm_substream_t * substream, snd_pcm_channel_info_t __user * _info)
+static int snd_pcm_channel_info(snd_pcm_substream_t * substream, snd_pcm_channel_info_t * info)
{
- snd_pcm_channel_info_t info;
snd_pcm_runtime_t *runtime;
- int res;
unsigned int channel;

snd_assert(substream != NULL, return -ENXIO);
- if (copy_from_user(&info, _info, sizeof(info)))
- return -EFAULT;
- channel = info.channel;
+ channel = info->channel;
runtime = substream->runtime;
snd_pcm_stream_lock_irq(substream);
if (runtime->status->state == SNDRV_PCM_STATE_OPEN) {
@@ -622,9 +618,19 @@
snd_pcm_stream_unlock_irq(substream);
if (channel >= runtime->channels)
return -EINVAL;
- memset(&info, 0, sizeof(info));
- info.channel = channel;
- res = substream->ops->ioctl(substream, SNDRV_PCM_IOCTL1_CHANNEL_INFO, &info);
+ memset(info, 0, sizeof(*info));
+ info->channel = channel;
+ return substream->ops->ioctl(substream, SNDRV_PCM_IOCTL1_CHANNEL_INFO, info);
+}
+
+static int snd_pcm_channel_info_user(snd_pcm_substream_t * substream, snd_pcm_channel_info_t __user * _info)
+{
+ snd_pcm_channel_info_t info;
+ int res;
+
+ if (copy_from_user(&info, _info, sizeof(info)))
+ return -EFAULT;
+ res = snd_pcm_channel_info(substream, &info);
if (res < 0)
return res;
if (copy_to_user(_info, &info, sizeof(info)))
@@ -2440,7 +2446,7 @@
case SNDRV_PCM_IOCTL_STATUS:
return snd_pcm_status_user(substream, arg);
case SNDRV_PCM_IOCTL_CHANNEL_INFO:
- return snd_pcm_channel_info(substream, arg);
+ return snd_pcm_channel_info_user(substream, arg);
case SNDRV_PCM_IOCTL_PREPARE:
return snd_pcm_prepare(substream);
case SNDRV_PCM_IOCTL_RESET:

---

Attachments:

alsa-pcm-compat (1.83 kB)

2005-01-31 13:39:19

by Takashi Iwai

[permalink] [raw]

Subject: Re: [PATCH 0/3] Conversion to compat_ioctl for ALSA drivers

---

At Sun, 30 Jan 2005 13:02:15 -0500,
Brian Gerst wrote:
>
> Takashi Iwai wrote:
> > Hi,
> >
> > the following three patches convert the 32bit ioctl layer of ALSA to
> > the new compat_ioctl (and unlocked_ioctl for native ioctls).
> >
> > The first patch covers the basic entries and control API.
> > The second patch is for PCM API.
> > The last one is for other APIs including OSS-emulation modules.
> >
> > After these patches are applied, remove the whole subtree in
> > sound/core/ioctl32. The files in this directory are no longer
> > necessary.
>
> Fix 32-bit calls to snd_pcm_channel_info().
>
> Signed-off-by: Brian Gerst <[email protected]>

Thanks, applied to the ALSA tree.


Takashi