]> git.hungrycats.org Git - linux/commit
ASoC: SOF: ipc3-control: Fix TOCTOU in bytes_put and bytes_get
authorPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Tue, 9 Jun 2026 08:34:57 +0000 (11:34 +0300)
committerMark Brown <broonie@kernel.org>
Tue, 9 Jun 2026 17:41:13 +0000 (18:41 +0100)
commit1f97760417b5faa60e9642fd0ed61eb17d0b1b39
tree904c653469cc1fa005e49e0b7d6a904000e174d3
parent390aa4c9339bb0ec0bc8d554e830faf93ca9d49e
ASoC: SOF: ipc3-control: Fix TOCTOU in bytes_put and bytes_get

In sof_ipc3_bytes_put(), the size used for the memcpy is derived from
the old data->size already in the buffer, not the incoming new data's
size field. If the new data has a different size, the copy length is
wrong: it may truncate valid data or copy stale bytes.

Similarly, sof_ipc3_bytes_get() checks data->size against max_size
without accounting for the sizeof(struct sof_ipc_ctrl_data) offset
of the flex array within the allocation.

Fix bytes_put to validate and use the incoming data's sof_abi_hdr.size
from ucontrol before copying. Fix bytes_get to subtract sizeof(*cdata)
from the bounds check to match the actual available space.

Fixes: 544ac8858f24 ("ASoC: SOF: Add bytes_get/put control IPC ops for IPC3")
Cc: stable@vger.kernel.org
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Liam Girdwood <liam.r.girdwood@intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20260609083458.31193-6-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sof/ipc3-control.c