lkml.org 
[lkml]   [2010]   [Oct]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[044/103] OSS: soundcard: locking bug in sound_ioctl()
    2.6.35-stable review patch.  If anyone has any objections, please let us know.

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

    From: Dan Carpenter <error27@gmail.com>

    commit d4cfa4d12f46e2520f4c1d1a92e891ce068b7464 upstream.

    We shouldn't return directly here because we're still holding the
    &soundcard_mutex.

    This bug goes all the way back to the start of git. It's strange that
    no one has complained about it as a runtime bug.

    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Acked-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    sound/oss/soundcard.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/sound/oss/soundcard.c
    +++ b/sound/oss/soundcard.c
    @@ -389,11 +389,11 @@ static long sound_ioctl(struct file *fil
    case SND_DEV_DSP:
    case SND_DEV_DSP16:
    case SND_DEV_AUDIO:
    - return audio_ioctl(dev, file, cmd, p);
    + ret = audio_ioctl(dev, file, cmd, p);
    break;

    case SND_DEV_MIDIN:
    - return MIDIbuf_ioctl(dev, file, cmd, p);
    + ret = MIDIbuf_ioctl(dev, file, cmd, p);
    break;

    }



    \
     
     \ /
      Last update: 2010-10-22 20:59    [W:0.025 / U:3.924 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site