diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2009-12-18 03:27:24 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-18 06:53:17 -0500 |
commit | 3e85fd614c7b6bb7f33bb04a0dcb5a3bfca4c0fe (patch) | |
tree | f3557d913f1f3e8ee29ebef960bc9b4a7222fa53 | |
parent | 2fbe74b90bafebce615466b4c20f96b0465df1ae (diff) |
sound: sgio2audio/pdaudiocf/usb-audio: initialize PCM buffer
When allocating the PCM buffer, use vmalloc_user() instead of vmalloc().
Otherwise, it would be possible for applications to play the previous
contents of the kernel memory to the speakers, or to read it directly if
the buffer is exported to userspace.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/mips/sgio2audio.c | 2 | ||||
-rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | 2 | ||||
-rw-r--r-- | sound/usb/usbaudio.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/mips/sgio2audio.c b/sound/mips/sgio2audio.c index 8691f4cf6191..f1d9d16b5486 100644 --- a/sound/mips/sgio2audio.c +++ b/sound/mips/sgio2audio.c | |||
@@ -609,7 +609,7 @@ static int snd_sgio2audio_pcm_hw_params(struct snd_pcm_substream *substream, | |||
609 | /* alloc virtual 'dma' area */ | 609 | /* alloc virtual 'dma' area */ |
610 | if (runtime->dma_area) | 610 | if (runtime->dma_area) |
611 | vfree(runtime->dma_area); | 611 | vfree(runtime->dma_area); |
612 | runtime->dma_area = vmalloc(size); | 612 | runtime->dma_area = vmalloc_user(size); |
613 | if (runtime->dma_area == NULL) | 613 | if (runtime->dma_area == NULL) |
614 | return -ENOMEM; | 614 | return -ENOMEM; |
615 | runtime->dma_bytes = size; | 615 | runtime->dma_bytes = size; |
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c b/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c index d057e6489643..5cfa608823f7 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | |||
@@ -51,7 +51,7 @@ static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs, size_t s | |||
51 | return 0; /* already enough large */ | 51 | return 0; /* already enough large */ |
52 | vfree(runtime->dma_area); | 52 | vfree(runtime->dma_area); |
53 | } | 53 | } |
54 | runtime->dma_area = vmalloc_32(size); | 54 | runtime->dma_area = vmalloc_32_user(size); |
55 | if (! runtime->dma_area) | 55 | if (! runtime->dma_area) |
56 | return -ENOMEM; | 56 | return -ENOMEM; |
57 | runtime->dma_bytes = size; | 57 | runtime->dma_bytes = size; |
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index b074a594c595..4963defee18a 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c | |||
@@ -752,7 +752,7 @@ static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs, size_t s | |||
752 | return 0; /* already large enough */ | 752 | return 0; /* already large enough */ |
753 | vfree(runtime->dma_area); | 753 | vfree(runtime->dma_area); |
754 | } | 754 | } |
755 | runtime->dma_area = vmalloc(size); | 755 | runtime->dma_area = vmalloc_user(size); |
756 | if (!runtime->dma_area) | 756 | if (!runtime->dma_area) |
757 | return -ENOMEM; | 757 | return -ENOMEM; |
758 | runtime->dma_bytes = size; | 758 | runtime->dma_bytes = size; |