diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-04-19 09:05:36 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-04-19 09:05:36 +0200 |
| commit | bbd197c556511a4608456e94b55d697701b450c5 (patch) | |
| tree | 9a7b48d9b615f7da228bb2c3ef0274b10ee1f9a8 | |
| parent | 0ecf023eb8698b40be9b4876732556466f470905 (diff) | |
| download | alsa-driver-build-unstable-bbd197c556511a4608456e94b55d697701b450c5.tar.gz | |
Regenerated acore/pcm_native.patch for fixing fuzz
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | acore/pcm_native.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/acore/pcm_native.patch b/acore/pcm_native.patch index cbcf9ae01..5e1468a3a 100644 --- a/acore/pcm_native.patch +++ b/acore/pcm_native.patch @@ -1,5 +1,5 @@ ---- ../alsa-kernel/core/pcm_native.c 2011-02-14 17:15:57.000000000 +0100 -+++ pcm_native.c 2011-03-04 17:20:54.000000000 +0100 +--- ../alsa-kernel/core/pcm_native.c 2011-04-19 08:29:42.000000000 +0200 ++++ pcm_native.c 2011-04-19 09:05:18.000000000 +0200 @@ -1,3 +1,5 @@ +#define __NO_VERSION__ +#include "adriver.h" @@ -55,7 +55,7 @@ +#endif return 0; _error: - /* hardware might be unuseable from this time, + /* hardware might be unusable from this time, @@ -512,7 +536,17 @@ if (substream->ops->hw_free) result = substream->ops->hw_free(substream); @@ -507,7 +507,7 @@ return 0; } -@@ -3238,7 +3518,7 @@ +@@ -3229,7 +3509,7 @@ runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED) return -EINVAL; size = area->vm_end - area->vm_start; @@ -516,7 +516,7 @@ dma_bytes = PAGE_ALIGN(runtime->dma_bytes); if ((size_t)size > dma_bytes) return -EINVAL; -@@ -3246,7 +3526,11 @@ +@@ -3237,7 +3517,11 @@ return -EINVAL; area->vm_ops = &snd_pcm_vm_ops_data; @@ -528,7 +528,7 @@ if (substream->ops->mmap) err = substream->ops->mmap(substream, area); else -@@ -3269,7 +3553,7 @@ +@@ -3260,7 +3544,7 @@ if (PCM_RUNTIME_CHECK(substream)) return -ENXIO; @@ -537,7 +537,7 @@ switch (offset) { case SNDRV_PCM_MMAP_OFFSET_STATUS: if (pcm_file->no_compat_mmap) -@@ -3302,12 +3586,34 @@ +@@ -3293,12 +3577,34 @@ /* * ioctl32 compat */ @@ -573,7 +573,7 @@ /* * To be removed helpers to keep binary compatibility */ -@@ -3446,31 +3752,55 @@ +@@ -3437,31 +3743,55 @@ const struct file_operations snd_pcm_f_ops[2] = { { |