Merge "dsp: q6usm: Check size of payload before access"
diff --git a/dsp/q6usm.c b/dsp/q6usm.c
index 01e5f84..fc76dc3 100644
--- a/dsp/q6usm.c
+++ b/dsp/q6usm.c
@@ -568,6 +568,11 @@
}
if (data->opcode == APR_BASIC_RSP_RESULT) {
+ if (data->payload_size < (2 * sizeof(uint32_t))) {
+ pr_err("%s: payload has invalid size[%d]\n", __func__,
+ data->payload_size);
+ return -EINVAL;
+ }
/* status field check */
if (payload[1]) {
pr_err("%s: wrong response[%d] on cmd [%d]\n",
@@ -631,6 +636,14 @@
opcode = Q6USM_EVENT_READ_DONE;
spin_lock_irqsave(&port->dsp_lock, dsp_flags);
+ if (data->payload_size <
+ (sizeof(uint32_t)*(READDONE_IDX_STATUS + 1))) {
+ pr_err("%s: Invalid payload size for READDONE[%d]\n",
+ __func__, data->payload_size);
+ spin_unlock_irqrestore(&port->dsp_lock,
+ dsp_flags);
+ return -EINVAL;
+ }
if (payload[READDONE_IDX_STATUS]) {
pr_err("%s: wrong READDONE[%d]; token[%d]\n",
__func__,
@@ -677,6 +690,12 @@
struct us_port_data *port = &usc->port[IN];
opcode = Q6USM_EVENT_WRITE_DONE;
+ if (data->payload_size <
+ (sizeof(uint32_t)*(WRITEDONE_IDX_STATUS + 1))) {
+ pr_err("%s: Invalid payload size for WRITEDONE[%d]\n",
+ __func__, data->payload_size);
+ return -EINVAL;
+ }
if (payload[WRITEDONE_IDX_STATUS]) {
pr_err("%s: wrong WRITEDONE_IDX_STATUS[%d]\n",
__func__,