anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

soc: qcom: hab: Refine sanity check in hab_msg_recv

Browse Source 
Refined the sanity check branch to decrease the complexity.

Change-Id: Ifb99709c62261e75231469f165765d6602f38a82
Signed-off-by: lixiang <quic_lixian@quicinc.com>
This commit is contained in:
lixiang
2023-12-26 17:10:02 +08:00
committed by Xiang Li
parent 59d966a50d
commit f153490646
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/soc/qcom/hab/hab_msg.c
View File

@@ -614,7 +614,8 @@ static void hab_recv_unimport_msg(struct physical_channel *pchan, int vchan_exis
static int hab_try_get_vchan(struct physical_channel *pchan,
struct hab_header *header,
struct virtual_channel **vchan_out)
struct virtual_channel **vchan_out,
int *need_ret)
{
struct virtual_channel *vchan = NULL;
size_t sizebytes = HAB_HEADER_GET_SIZE(*header);
@@ -644,6 +645,7 @@ static int hab_try_get_vchan(struct physical_channel *pchan,
*/
vchan = hab_vchan_get(pchan, header);
if (!vchan) {
*need_ret = 1;
pr_debug("vchan not found type %d vcid %x sz %zx sesn %d\n",
payload_type, vchan_id, sizebytes, session_id);
@@ -661,6 +663,7 @@ static int hab_try_get_vchan(struct physical_channel *pchan,
}
return -EINVAL;
} else if (vchan->otherend_closed) {
*need_ret = 1;
hab_vchan_put(vchan);
pr_info("vchan remote closed type %d, vchan id %x, sizebytes %zx, session %d\n",
payload_type, vchan_id,
@@ -675,6 +678,7 @@ static int hab_try_get_vchan(struct physical_channel *pchan,
}
} else {
if (sizebytes != sizeof(struct hab_open_send_data)) {
*need_ret = 1;
pr_err("%s Invalid open req type %d vcid %x bytes %zx session %d\n",
pchan->name, payload_type, vchan_id,
sizebytes, session_id);
@@ -712,9 +716,10 @@ int hab_msg_recv(struct physical_channel *pchan,
int found = 0;
struct hab_import_data imp_data = {0};
int irqs_disabled = irqs_disabled();
int need_ret = 0;
ret = hab_try_get_vchan(pchan, header, &vchan);
if (ret != 0 || ((vchan == NULL) && (payload_type == HAB_PAYLOAD_TYPE_UNIMPORT)))
ret = hab_try_get_vchan(pchan, header, &vchan, &need_ret);
if (need_ret)
return ret;
switch (payload_type) {