diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-12-19 22:27:47 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-12-19 22:27:47 -0800 |
| commit | 2b22d5e4e3e45d7eae7a4213c2d6f6e25089527e (patch) | |
| tree | f4a4006972a20ab09575ae275620eff343d2b5cb | |
| parent | 28c04d8c14f12f87b4fb14cf0187387a62fbb8d4 (diff) | |
| parent | c643a15d73b3fb6329b002662e72dfa96acfdb8a (diff) | |
Merge "ASoC: apr: Add validity check to APR port"
| -rw-r--r-- | drivers/soc/qcom/qdsp6v2/apr.c | 7 | ||||
| -rw-r--r-- | drivers/soc/qcom/qdsp6v2/apr_vm.c | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/soc/qcom/qdsp6v2/apr.c b/drivers/soc/qcom/qdsp6v2/apr.c index 3791169ec0ac..b1afd02b49bf 100644 --- a/drivers/soc/qcom/qdsp6v2/apr.c +++ b/drivers/soc/qcom/qdsp6v2/apr.c @@ -679,9 +679,10 @@ void apr_cb_func(void *buf, int len, void *priv) } temp_port = ((data.dest_port >> 8) * 8) + (data.dest_port & 0xFF); - pr_debug("port = %d t_port = %d\n", data.src_port, temp_port); - if (c_svc->port_cnt && c_svc->port_fn[temp_port]) - c_svc->port_fn[temp_port](&data, c_svc->port_priv[temp_port]); + if (((temp_port >= 0) && (temp_port < APR_MAX_PORTS)) + && (c_svc->port_cnt && c_svc->port_fn[temp_port])) + c_svc->port_fn[temp_port](&data, + c_svc->port_priv[temp_port]); else if (c_svc->fn) c_svc->fn(&data, c_svc->priv); else diff --git a/drivers/soc/qcom/qdsp6v2/apr_vm.c b/drivers/soc/qcom/qdsp6v2/apr_vm.c index d0ea7b22717a..56592ac91e1b 100644 --- a/drivers/soc/qcom/qdsp6v2/apr_vm.c +++ b/drivers/soc/qcom/qdsp6v2/apr_vm.c @@ -514,7 +514,8 @@ static int apr_vm_cb_process_evt(char *buf, int len) temp_port = ((data.dest_port >> 8) * 8) + (data.dest_port & 0xFF); pr_debug("port = %d t_port = %d\n", data.src_port, temp_port); - if (c_svc->port_cnt && c_svc->port_fn[temp_port]) + if (((temp_port >= 0) && (temp_port < APR_MAX_PORTS)) + && (c_svc->port_cnt && c_svc->port_fn[temp_port])) c_svc->port_fn[temp_port](&data, c_svc->port_priv[temp_port]); else if (c_svc->fn) c_svc->fn(&data, c_svc->priv); |