lkml.org 
[lkml]   [2021]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 14/37] ALSA: pcm: oss: Handle missing errors in snd_pcm_oss_change_params*()
    Date
    From: Takashi Iwai <tiwai@suse.de>

    commit 6665bb30a6b1a4a853d52557c05482ee50e71391 upstream.

    A couple of calls in snd_pcm_oss_change_params_locked() ignore the
    possible errors. Catch those errors and abort the operation for
    avoiding further problems.

    Cc: <stable@vger.kernel.org>
    Link: https://lore.kernel.org/r/20211201073606.11660-4-tiwai@suse.de
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    sound/core/oss/pcm_oss.c | 11 +++++++++--
    1 file changed, 9 insertions(+), 2 deletions(-)

    --- a/sound/core/oss/pcm_oss.c
    +++ b/sound/core/oss/pcm_oss.c
    @@ -909,8 +909,15 @@ static int snd_pcm_oss_change_params_loc
    err = -EINVAL;
    goto failure;
    }
    - choose_rate(substream, sparams, runtime->oss.rate);
    - snd_pcm_hw_param_near(substream, sparams, SNDRV_PCM_HW_PARAM_CHANNELS, runtime->oss.channels, NULL);
    +
    + err = choose_rate(substream, sparams, runtime->oss.rate);
    + if (err < 0)
    + goto failure;
    + err = snd_pcm_hw_param_near(substream, sparams,
    + SNDRV_PCM_HW_PARAM_CHANNELS,
    + runtime->oss.channels, NULL);
    + if (err < 0)
    + goto failure;

    format = snd_pcm_oss_format_from(runtime->oss.format);


    \
     
     \ /
      Last update: 2021-12-13 10:32    [W:4.238 / U:0.336 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site