lkml.org 
[lkml]   [2022]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 352/475] ASoC: soc-compress: Change the check for codec_dai
    Date
    From: Jiasheng Jiang <jiasheng@iscas.ac.cn>

    commit ccb4214f7f2a8b75acf493f31128e464ee1a3536 upstream.

    It should be better to reverse the check on codec_dai
    and returned early in order to be easier to understand.

    Fixes: de2c6f98817f ("ASoC: soc-compress: prevent the potentially use of null pointer")
    Reported-by: kernel test robot <lkp@intel.com>
    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
    Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
    Link: https://lore.kernel.org/r/20220310030041.1556323-1-jiasheng@iscas.ac.cn
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    sound/soc/soc-compress.c | 19 +++++++++++--------
    1 file changed, 11 insertions(+), 8 deletions(-)

    --- a/sound/soc/soc-compress.c
    +++ b/sound/soc/soc-compress.c
    @@ -871,16 +871,19 @@ int snd_soc_new_compress(struct snd_soc_
    return -EINVAL;
    }

    - /* check client and interface hw capabilities */
    - if (codec_dai) {
    - if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK) &&
    - snd_soc_dai_stream_valid(cpu_dai, SNDRV_PCM_STREAM_PLAYBACK))
    - playback = 1;
    - if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE) &&
    - snd_soc_dai_stream_valid(cpu_dai, SNDRV_PCM_STREAM_CAPTURE))
    - capture = 1;
    + if (!codec_dai) {
    + dev_err(rtd->card->dev, "Missing codec\n");
    + return -EINVAL;
    }

    + /* check client and interface hw capabilities */
    + if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK) &&
    + snd_soc_dai_stream_valid(cpu_dai, SNDRV_PCM_STREAM_PLAYBACK))
    + playback = 1;
    + if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE) &&
    + snd_soc_dai_stream_valid(cpu_dai, SNDRV_PCM_STREAM_CAPTURE))
    + capture = 1;
    +
    /*
    * Compress devices are unidirectional so only one of the directions
    * should be set, check for that (xor)

    \
     
     \ /
      Last update: 2022-04-14 17:08    [W:4.038 / U:0.388 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site