Tools: Testbench/Tplg_parser: Add check for bytes data size

This patch adds check for bytes data control size into
sof-testbench4 for topology embedded control data. Also the
missing error handling is added to the topology parser.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>

Author: singalsu

tools/testbench/include/testbench/utils.h

@@ -22,7 +22,7 @@
 #define TB_MAX_CMD_CHARS		256
 #define TB_MAX_CTL_NAME_CHARS		128
 #define TB_MAX_VOLUME_SIZE		120
-#define TB_MAX_DATA_SIZE		512
+#define TB_MAX_BYTES_DATA_SIZE		512
 
 /* number of widgets types supported in testbench */
 #define TB_NUM_WIDGETS_SUPPORTED	16
@@ -43,7 +43,7 @@ struct tb_ctl {
 	unsigned int type;
 	unsigned int volume_table[TB_MAX_VOLUME_SIZE];
 	unsigned int index;
-	char data[TB_MAX_DATA_SIZE];
+	char data[TB_MAX_BYTES_DATA_SIZE];
 	char name[TB_MAX_CTL_NAME_CHARS];
 	union {
 		struct snd_soc_tplg_mixer_control mixer_ctl;

tools/testbench/topology_ipc4.c

@@ -1353,6 +1353,11 @@ static int tb_kcontrol_cb_new(struct snd_soc_tplg_ctl_hdr *tplg_ctl,
 		ctl->bytes_ctl = *tplg_bytes;
 		ctl->index = index;
 		ctl->type = tplg_ctl->type;
+		if (tplg_bytes->priv.size > TB_MAX_BYTES_DATA_SIZE) {
+			fprintf(stderr, "Error: Too large bytes data size %d\n",
+				tplg_bytes->priv.size);
+			return -EINVAL;
+		}
 		memcpy(ctl->data, tplg_bytes->priv.data, tplg_bytes->priv.size);
 		ctl->comp_info = comp_info;
 		strncpy(ctl->name, tplg_ctl->name, TB_MAX_CTL_NAME_CHARS);

tools/tplg_parser/control.c

@@ -141,8 +141,13 @@ int tplg_create_controls(struct tplg_context *ctx, int num_kcontrols,
 			return -EINVAL;
 		}
 
-		if (ctx->ctl_cb && object)
-			ctx->ctl_cb(ctl_hdr, object, ctx->ctl_arg, index);
+		if (ctx->ctl_cb && object) {
+			ret = ctx->ctl_cb(ctl_hdr, object, ctx->ctl_arg, index);
+			if (ret) {
+				fprintf(stderr, "error: failed control callback\n");
+				goto err;
+			}
+		}
 	}
 
 	if (rctl && ctl_hdr) {