fixup! ASoC: SOF: fix range checks

The mix of integer and size_t generates different results in 32- and
64 bit mode, cast to size_t and use %zu format.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Author: plbossart

sound/soc/sof/control.c

@@ -232,8 +232,8 @@ int snd_sof_bytes_get(struct snd_kcontrol *kcontrol,
 	/* be->max has been verified to be >= sizeof(struct sof_abi_hdr) */
 	if (data->size > be->max - sizeof(*data)) {
 		dev_err_ratelimited(scomp->dev,
-				    "error: %u bytes of control data is invalid, max is %lu\n",
-				    data->size, be->max - sizeof(*data));
+				    "error: %u bytes of control data is invalid, max is %zu\n",
+				    data->size, (size_t)be->max - sizeof(*data));
 		return -EINVAL;
 	}
 
@@ -266,8 +266,8 @@ int snd_sof_bytes_put(struct snd_kcontrol *kcontrol,
 	/* be->max has been verified to be >= sizeof(struct sof_abi_hdr) */
 	if (data->size > be->max - sizeof(*data)) {
 		dev_err_ratelimited(scomp->dev,
-				    "error: data size too big %u bytes max is %lu\n",
-				    data->size, be->max - sizeof(*data));
+				    "error: data size too big %u bytes max is %zu\n",
+				    data->size, (size_t)be->max - sizeof(*data));
 		return -EINVAL;
 	}
 
@@ -441,8 +441,9 @@ int snd_sof_bytes_ext_get(struct snd_kcontrol *kcontrol,
 
 	/* check data size doesn't exceed max coming from topology */
 	if (cdata->data->size > be->max - sizeof(const struct sof_abi_hdr)) {
-		dev_err_ratelimited(scomp->dev, "error: user data size %d exceeds max size %lu.\n",
-				    cdata->data->size, be->max - sizeof(const struct sof_abi_hdr));
+		dev_err_ratelimited(scomp->dev, "error: user data size %d exceeds max size %zu.\n",
+				    cdata->data->size,
+				    (size_t)be->max - sizeof(const struct sof_abi_hdr));
 		return -EINVAL;
 	}
 

sound/soc/sof/topology.c

@@ -1162,8 +1162,8 @@ static int sof_control_load_bytes(struct snd_soc_component *scomp,
 
 	/* init the get/put bytes data */
 	if (priv_size > max_size - sizeof(struct sof_ipc_ctrl_data)) {
-		dev_err(scomp->dev, "err: bytes data size %lu exceeds max %lu.\n",
-			priv_size, max_size - sizeof(struct sof_ipc_ctrl_data));
+		dev_err(scomp->dev, "err: bytes data size %zu exceeds max %zu.\n",
+			priv_size, (size_t)max_size - sizeof(struct sof_ipc_ctrl_data));
 		ret = -EINVAL;
 		goto out;
 	}