Skip to content

Commit c5003f0

Browse files
ujfalusibroonie
authored andcommitted
ASoC: SOF: ipc-msg-injector: Cap the rmaining to count in IPC4 mode
If user space provides smaller buffer than the IPC4 reply then it is possible that we corrupt user space memory since the IPC4 dfs_read function is not using the count directly in copy_to_user() due to the nature of an IPC4 message. Cap the remaining counter to make sure that we are not writing too much to the user space provided buffer. Add a check also to make sure that the buffer is at least the size of the IPC4 header. Fixes: 066c676: "ASoC: SOF: ipc-msg-injector: Add support for IPC4 messages" Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Link: https://lore.kernel.org/r/20220516092442.17027-1-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent dba2d5a commit c5003f0

1 file changed

Lines changed: 11 additions & 4 deletions

File tree

sound/soc/sof/sof-client-ipc-msg-injector.c

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,17 @@ static ssize_t sof_msg_inject_ipc4_dfs_read(struct file *file,
7676
struct sof_client_dev *cdev = file->private_data;
7777
struct sof_msg_inject_priv *priv = cdev->data;
7878
struct sof_ipc4_msg *ipc4_msg = priv->rx_buffer;
79+
size_t header_size = sizeof(ipc4_msg->header_u64);
7980
size_t remaining;
8081

8182
if (!ipc4_msg->header_u64 || !count || *ppos)
8283
return 0;
8384

84-
remaining = sizeof(ipc4_msg->header_u64);
85+
/* we need space for the header at minimum (u64) */
86+
if (count < header_size)
87+
return -ENOSPC;
88+
89+
remaining = header_size;
8590

8691
/* Only get large config have payload */
8792
if (SOF_IPC4_MSG_IS_MODULE_MSG(ipc4_msg->primary) &&
@@ -90,13 +95,15 @@ static ssize_t sof_msg_inject_ipc4_dfs_read(struct file *file,
9095

9196
if (count > remaining)
9297
count = remaining;
98+
else if (count < remaining)
99+
remaining = count;
93100

94101
/* copy the header first */
95-
if (copy_to_user(buffer, &ipc4_msg->header_u64, sizeof(ipc4_msg->header_u64)))
102+
if (copy_to_user(buffer, &ipc4_msg->header_u64, header_size))
96103
return -EFAULT;
97104

98-
*ppos += sizeof(ipc4_msg->header_u64);
99-
remaining -= sizeof(ipc4_msg->header_u64);
105+
*ppos += header_size;
106+
remaining -= header_size;
100107

101108
if (!remaining)
102109
return count;

0 commit comments

Comments
 (0)