All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Amadeusz Sławiński" <amadeuszx.slawinski@linux.intel.com>
To: Liam Girdwood <lgirdwood@gmail.com>,
	Mark Brown <broonie@kernel.org>, Takashi Iwai <tiwai@suse.com>
Cc: alsa-devel@alsa-project.org,
	"Amadeusz Sławiński" <amadeuszx.slawinski@linux.intel.com>,
	"Ranjani Sridharan" <ranjani.sridharan@linux.intel.com>
Subject: [PATCH v2 3/6] ASoC: topology: Check return value of soc_tplg_*_create
Date: Fri, 27 Mar 2020 16:47:26 -0400	[thread overview]
Message-ID: <20200327204729.397-4-amadeuszx.slawinski@linux.intel.com> (raw)
In-Reply-To: <20200327204729.397-1-amadeuszx.slawinski@linux.intel.com>

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>
---

 v2:
  Added this patch

 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 c3811dd66b68..860bced933d6 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.17.1


  parent reply	other threads:[~2020-03-27 18:41 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-27 20:47 [PATCH v2 0/6] ASoC: topology: Propagate error appropriately Amadeusz Sławiński
2020-03-27 20:47 ` [PATCH v2 1/6] ASoC: topology: Add missing memory checks Amadeusz Sławiński
2020-04-09 12:02   ` Applied "ASoC: topology: Add missing memory checks" to the asoc tree Mark Brown
2020-03-27 20:47 ` [PATCH v2 2/6] ASoC: topology: Check return value of soc_tplg_create_tlv Amadeusz Sławiński
2020-04-09 12:02   ` Applied "ASoC: topology: Check return value of soc_tplg_create_tlv" to the asoc tree Mark Brown
2020-03-27 20:47 ` Amadeusz Sławiński [this message]
2020-03-27 18:56   ` [PATCH v2 3/6] ASoC: topology: Check return value of soc_tplg_*_create Pierre-Louis Bossart
2020-03-30  8:12     ` Amadeusz Sławiński
2020-03-30 15:51       ` Pierre-Louis Bossart
2020-03-30 16:10         ` Amadeusz Sławiński
2020-03-30 16:36           ` Pierre-Louis Bossart
2020-04-09 12:02   ` Applied "ASoC: topology: Check return value of soc_tplg_*_create" to the asoc tree Mark Brown
2020-03-27 20:47 ` [PATCH v2 4/6] ASoC: topology: Check soc_tplg_add_route return value Amadeusz Sławiński
2020-04-09 12:02   ` Applied "ASoC: topology: Check soc_tplg_add_route return value" to the asoc tree Mark Brown
2020-03-27 20:47 ` [PATCH v2 5/6] ASoC: topology: Check return value of pcm_new_ver Amadeusz Sławiński
2020-04-09 12:02   ` Applied "ASoC: topology: Check return value of pcm_new_ver" to the asoc tree Mark Brown
2020-03-27 20:47 ` [PATCH v2 6/6] ASoC: topology: Check return value of soc_tplg_dai_config Amadeusz Sławiński
2020-04-09 12:02   ` Applied "ASoC: topology: Check return value of soc_tplg_dai_config" to the asoc tree Mark Brown
2020-03-30 16:38 ` [PATCH v2 0/6] ASoC: topology: Propagate error appropriately Pierre-Louis Bossart
2020-04-08  8:51   ` Amadeusz Sławiński
2020-04-08 14:20     ` Pierre-Louis Bossart
2020-04-08 14:46       ` Amadeusz Sławiński
2020-04-08 16:52         ` Ranjani Sridharan
2020-03-30 16:41 ` Sridharan, Ranjani

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200327204729.397-4-amadeuszx.slawinski@linux.intel.com \
    --to=amadeuszx.slawinski@linux.intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=ranjani.sridharan@linux.intel.com \
    --cc=tiwai@suse.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.