maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix s1ap stack overflow.

Browse Source 
(cherry picked from commit f6b51079021347c19d528200f04d7cdba1dde0e5)

# Conflicts:
#	openair3/S1AP/s1ap_eNB.c
This commit is contained in:
Haruki NAOI
2021-01-06 19:53:32 +09:00
committed by masayuki.harada
parent 4a14c4c706
commit cf41c788d6
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair3/S1AP/s1ap_eNB.c
+16 -12
View File
@@ -285,7 +285,7 @@ void s1ap_eNB_handle_sctp_association_resp(instance_t instance, sctp_new_associa
struct served_gummei_s* gummeiInfo; struct served_gummei_s* gummeiInfo;
struct mme_code_s* mmeCode; struct mme_code_s* mmeCode;
int8_t cnt = 0; int8_t cnt = 0;
unsigned enb_s1ap_id[20]; unsigned enb_s1ap_id[NUMBER_OF_UE_MAX];
DevAssert(sctp_new_association_resp != NULL); DevAssert(sctp_new_association_resp != NULL);
instance_p = s1ap_eNB_get_instance(instance); instance_p = s1ap_eNB_get_instance(instance);
DevAssert(instance_p != NULL); DevAssert(instance_p != NULL);
@@ -305,6 +305,7 @@ void s1ap_eNB_handle_sctp_association_resp(instance_t instance, sctp_new_associa
{ {
if( ue_p->mme_ref == s1ap_mme_data_p ) if( ue_p->mme_ref == s1ap_mme_data_p )
{ {
if(cnt < NUMBER_OF_UE_MAX){
enb_s1ap_id[cnt] = ue_p->eNB_ue_s1ap_id; enb_s1ap_id[cnt] = ue_p->eNB_ue_s1ap_id;
cnt++; cnt++;
@@ -324,6 +325,9 @@ void s1ap_eNB_handle_sctp_association_resp(instance_t instance, sctp_new_associa
{ {
S1AP_ERROR("Invalid message_p : eNB_ue_s1ap_id=%u\n", ue_p->eNB_ue_s1ap_id); S1AP_ERROR("Invalid message_p : eNB_ue_s1ap_id=%u\n", ue_p->eNB_ue_s1ap_id);
} }
}else{
S1AP_ERROR("s1ap_eNB_handle_sctp_association_resp: cnt %d > max\n", cnt);
}
} }
} }
for( ; cnt > 0 ; ) for( ; cnt > 0 ; )
@@ -419,18 +423,18 @@ void s1ap_eNB_handle_sctp_association_resp(instance_t instance, sctp_new_associa
// } // }
else else
{ {
/* Update parameters */ /* Update parameters */
s1ap_mme_data_p->assoc_id = sctp_new_association_resp->assoc_id; s1ap_mme_data_p->assoc_id = sctp_new_association_resp->assoc_id;
s1ap_mme_data_p->in_streams = sctp_new_association_resp->in_streams; s1ap_mme_data_p->in_streams = sctp_new_association_resp->in_streams;
s1ap_mme_data_p->out_streams = sctp_new_association_resp->out_streams; s1ap_mme_data_p->out_streams = sctp_new_association_resp->out_streams;
/* Prepare new S1 Setup Request */ /* Prepare new S1 Setup Request */
s1ap_mme_data_p->s1_setupreq_cnt = 0; s1ap_mme_data_p->s1_setupreq_cnt = 0;
s1ap_mme_data_p->sctp_req_cnt = 0; s1ap_mme_data_p->sctp_req_cnt = 0;
if (s1ap_eNB_generate_s1_setup_request(instance_p, s1ap_mme_data_p) == -1) { if (s1ap_eNB_generate_s1_setup_request(instance_p, s1ap_mme_data_p) == -1) {
S1AP_ERROR("s1ap eNB generate s1 setup request failed\n"); S1AP_ERROR("s1ap eNB generate s1 setup request failed\n");
return; return;
}
} }
}
static static
void s1ap_eNB_handle_sctp_data_ind(sctp_data_ind_t *sctp_data_ind) { void s1ap_eNB_handle_sctp_data_ind(sctp_data_ind_t *sctp_data_ind) {