Merge "ASoC: apr: Add validity check to APR port"

This commit is contained in:
Linux Build Service Account 2017-12-19 22:27:47 -08:00 committed by Gerrit - the friendly Code Review server
commit 2b22d5e4e3
2 changed files with 6 additions and 4 deletions

View file

@ -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

View file

@ -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);