lkml.org 
[lkml]   [2020]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.6 09/79] ASoC: topology: Check return value of soc_tplg_*_create
    Date
    From: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>

    [ Upstream commit 2ae548f30d7f6973388fc3769bb3c2f6fd13652b ]

    Functions soc_tplg_denum_create, soc_tplg_dmixer_create,
    soc_tplg_dbytes_create can fail, so their return values should be
    checked and error should be propagated.

    Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
    Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
    Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    Link: https://lore.kernel.org/r/20200327204729.397-4-amadeuszx.slawinski@linux.intel.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/soc-topology.c | 18 ++++++++++++------
    1 file changed, 12 insertions(+), 6 deletions(-)

    diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
    index 5d974a36cdc92..c86c3ea533f68 100644
    --- a/sound/soc/soc-topology.c
    +++ b/sound/soc/soc-topology.c
    @@ -1124,6 +1124,7 @@ static int soc_tplg_kcontrol_elems_load(struct soc_tplg *tplg,
    struct snd_soc_tplg_hdr *hdr)
    {
    struct snd_soc_tplg_ctl_hdr *control_hdr;
    + int ret;
    int i;

    if (tplg->pass != SOC_TPLG_PASS_MIXER) {
    @@ -1152,25 +1153,30 @@ static int soc_tplg_kcontrol_elems_load(struct soc_tplg *tplg,
    case SND_SOC_TPLG_CTL_RANGE:
    case SND_SOC_TPLG_DAPM_CTL_VOLSW:
    case SND_SOC_TPLG_DAPM_CTL_PIN:
    - soc_tplg_dmixer_create(tplg, 1,
    - le32_to_cpu(hdr->payload_size));
    + ret = soc_tplg_dmixer_create(tplg, 1,
    + le32_to_cpu(hdr->payload_size));
    break;
    case SND_SOC_TPLG_CTL_ENUM:
    case SND_SOC_TPLG_CTL_ENUM_VALUE:
    case SND_SOC_TPLG_DAPM_CTL_ENUM_DOUBLE:
    case SND_SOC_TPLG_DAPM_CTL_ENUM_VIRT:
    case SND_SOC_TPLG_DAPM_CTL_ENUM_VALUE:
    - soc_tplg_denum_create(tplg, 1,
    - le32_to_cpu(hdr->payload_size));
    + ret = soc_tplg_denum_create(tplg, 1,
    + le32_to_cpu(hdr->payload_size));
    break;
    case SND_SOC_TPLG_CTL_BYTES:
    - soc_tplg_dbytes_create(tplg, 1,
    - le32_to_cpu(hdr->payload_size));
    + ret = soc_tplg_dbytes_create(tplg, 1,
    + le32_to_cpu(hdr->payload_size));
    break;
    default:
    soc_bind_err(tplg, control_hdr, i);
    return -EINVAL;
    }
    + if (ret < 0) {
    + dev_err(tplg->dev, "ASoC: invalid control\n");
    + return ret;
    + }
    +
    }

    return 0;
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-04-30 16:13    [W:4.883 / U:0.660 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site