Re: [PATCH v3] ASoC: SOF: ipc3-topology: Correct get_control_data for non bytes payload

Sergey Senozhatsky
2022-04-27T13:10:32Z

On (22/04/27 22:08), Sergey Senozhatsky wrote:
>
> I also have a 5.4 backport but it's entirely untested.

5.4

---

diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c
index fa299e078156..a70b7e71c235 100644
--- a/sound/soc/sof/topology.c
+++ b/sound/soc/sof/topology.c
@@ -45,7 +45,8 @@
struct sof_widget_data {
int ctrl_type;
int ipc_cmd;
- struct sof_abi_hdr *pdata;
+ void *pdata;
+ size_t pdata_size;
struct snd_sof_control *control;
};

@@ -1761,6 +1762,7 @@ static int sof_get_control_data(struct snd_sof_dev *sdev,
size_t *size)
{
const struct snd_kcontrol_new *kc;
+ struct sof_ipc_ctrl_data *cdata;
struct soc_mixer_control *sm;
struct soc_bytes_ext *sbe;
struct soc_enum *se;
@@ -1797,15 +1799,25 @@ static int sof_get_control_data(struct snd_sof_dev *sdev,
return -EINVAL;
}

- wdata[i].pdata = wdata[i].control->control_data->data;
- if (!wdata[i].pdata)
- return -EINVAL;
+ cdata = wdata[i].control->control_data;
+ if (widget->dobj.widget.kcontrol_type[i] == SND_SOC_TPLG_TYPE_BYTES) {
+ if (cdata->data->magic != SOF_ABI_MAGIC)
+ return -EINVAL;

- /* make sure data is valid - data can be updated at runtime */
- if (wdata[i].pdata->magic != SOF_ABI_MAGIC)
- return -EINVAL;
+ wdata[i].pdata = cdata->data->data;
+ wdata[i].pdata_size = cdata->data->size;
+ } else {
+ /* points to the control data union */
+ wdata[i].pdata = cdata->chanv;
+ /*
+ * wdata[i].control->size is calculated with struct_size
+ * and includes the size of struct sof_ipc_ctrl_data
+ */
+ wdata[i].pdata_size = wdata[i].control->size -
+ sizeof(struct sof_ipc_ctrl_data);
+ }

- *size += wdata[i].pdata->size;
+ *size += wdata[i].pdata_size;

/* get data type */
switch (wdata[i].control->cmd) {
@@ -1909,10 +1921,12 @@ static int sof_process_load(struct snd_soc_component *scomp, int index,
*/
if (ipc_data_size) {
for (i = 0; i < widget->num_kcontrols; i++) {
- memcpy(&process->data + offset,