lkml.org 
[lkml]   [2013]   [Nov]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 47/54] ALSA: us122l: Fix pcm_usb_stream mmapping regression
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Takashi Iwai <tiwai@suse.de>

    commit ac536a848a1643e4b87e8fbd376a63091afc2ccc upstream.

    The pcm_usb_stream plugin requires the mremap explicitly for the read
    buffer, as it expands itself once after reading the required size.
    But the commit [314e51b9: mm: kill vma flag VM_RESERVED and
    mm->reserved_vm counter] converted blindly to a combination of
    VM_DONTEXPAND | VM_DONTDUMP like other normal drivers, and this
    resulted in the failure of mremap().

    For fixing this regression, we need to remove VM_DONTEXPAND for the
    read-buffer mmap.

    Reported-and-tested-by: James Miller <jamesstewartmiller@gmail.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/usb/usx2y/us122l.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/sound/usb/usx2y/us122l.c
    +++ b/sound/usb/usx2y/us122l.c
    @@ -262,7 +262,9 @@ static int usb_stream_hwdep_mmap(struct
    }

    area->vm_ops = &usb_stream_hwdep_vm_ops;
    - area->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
    + area->vm_flags |= VM_DONTDUMP;
    + if (!read)
    + area->vm_flags |= VM_DONTEXPAND;
    area->vm_private_data = us122l;
    atomic_inc(&us122l->mmap_count);
    out:



    \
     
     \ /
      Last update: 2013-11-02 00:01    [W:4.033 / U:0.832 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site