Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b22d5e4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 28c04d8c c643a15d

drivers/soc/qcom/qdsp6v2/apr.c

+4 −3
Original line number Diff line number Diff line
@@ -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

drivers/soc/qcom/qdsp6v2/apr_vm.c

+2 −1
Original line number Diff line number Diff line
@@ -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);