sysmocom
/
open5gs
forked from acouzens/open5gs
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

small stability fixes that were causing crashes in Bokondini (#323)

This commit is contained in:
Spencer Sevilla 2019-12-12 20:25:52 -08:00 committed by Sukchan Lee
parent b7360d37d4
commit b86658e173
3 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mme/nas-path.c
View File

@ -253,7 +253,7 @@ void nas_send_detach_accept(mme_ue_t *mme_ue)
if (mme_ue->nas_eps.detach.switch_off == 0) {
int rv;
emmbuf = emm_build_detach_accept(mme_ue);
ogs_expect(emmbuf);
ogs_expect_or_return(emmbuf);
rv = nas_send_to_downlink_nas_transport(mme_ue, emmbuf);
ogs_expect(rv == OGS_OK);

94
src/mme/nas-security.c
View File

@ -64,57 +64,57 @@ ogs_pkbuf_t *nas_security_encode(
if (mme_ue->selected_int_algorithm == 0)
integrity_protected = 0;
if (ciphered || integrity_protected) {
ogs_nas_security_header_t h;
ogs_pkbuf_t *new = NULL;
// if (ciphered || integrity_protected) {
ogs_nas_security_header_t h;
ogs_pkbuf_t *new = NULL;
memset(&h, 0, sizeof(h));
h.security_header_type = message->h.security_header_type;
h.protocol_discriminator = message->h.protocol_discriminator;
h.sequence_number = (mme_ue->dl_count & 0xff);
memset(&h, 0, sizeof(h));
h.security_header_type = message->h.security_header_type;
h.protocol_discriminator = message->h.protocol_discriminator;
h.sequence_number = (mme_ue->dl_count & 0xff);
new = ogs_nas_plain_encode(message);
if (!new) {
ogs_error("ogs_nas_plain_encode() failed");
return NULL;
}
if (ciphered) {
/* encrypt NAS message */
nas_encrypt(mme_ue->selected_enc_algorithm,
mme_ue->knas_enc, mme_ue->dl_count, NAS_SECURITY_BEARER,
NAS_SECURITY_DOWNLINK_DIRECTION, new);
}
/* encode sequence number */
ogs_assert(ogs_pkbuf_push(new, 1));
*(uint8_t *)(new->data) = h.sequence_number;
if (integrity_protected) {
uint8_t mac[NAS_SECURITY_MAC_SIZE];
/* calculate NAS MAC(message authentication code) */
nas_mac_calculate(mme_ue->selected_int_algorithm,
mme_ue->knas_int, mme_ue->dl_count, NAS_SECURITY_BEARER,
NAS_SECURITY_DOWNLINK_DIRECTION, new, mac);
memcpy(&h.message_authentication_code, mac, sizeof(mac));
}
/* increase dl_count */
mme_ue->dl_count = (mme_ue->dl_count + 1) & 0xffffff; /* Use 24bit */
/* encode all security header */
ogs_assert(ogs_pkbuf_push(new, 5));
memcpy(new->data, &h, sizeof(ogs_nas_security_header_t));
mme_ue->security_context_available = 1;
return new;
new = ogs_nas_plain_encode(message);
if (!new) {
ogs_error("ogs_nas_plain_encode() failed");
return NULL;
}
ogs_error("Invalid param : type[%d] ciphered[%d] integrity_protected[%d]",
message->h.security_header_type, ciphered, integrity_protected);
return NULL;
if (ciphered) {
/* encrypt NAS message */
nas_encrypt(mme_ue->selected_enc_algorithm,
mme_ue->knas_enc, mme_ue->dl_count, NAS_SECURITY_BEARER,
NAS_SECURITY_DOWNLINK_DIRECTION, new);
}
/* encode sequence number */
ogs_assert(ogs_pkbuf_push(new, 1));
*(uint8_t *)(new->data) = h.sequence_number;
if (integrity_protected) {
uint8_t mac[NAS_SECURITY_MAC_SIZE];
/* calculate NAS MAC(message authentication code) */
nas_mac_calculate(mme_ue->selected_int_algorithm,
mme_ue->knas_int, mme_ue->dl_count, NAS_SECURITY_BEARER,
NAS_SECURITY_DOWNLINK_DIRECTION, new, mac);
memcpy(&h.message_authentication_code, mac, sizeof(mac));
}
/* increase dl_count */
mme_ue->dl_count = (mme_ue->dl_count + 1) & 0xffffff; /* Use 24bit */
/* encode all security header */
ogs_assert(ogs_pkbuf_push(new, 5));
memcpy(new->data, &h, sizeof(ogs_nas_security_header_t));
mme_ue->security_context_available = 1;
return new;
// }
// ogs_error("Invalid param : type[%d] ciphered[%d] integrity_protected[%d]",
// message->h.security_header_type, ciphered, integrity_protected);
// return NULL;
}
int nas_security_decode(mme_ue_t *mme_ue,

2
src/mme/s1ap-handler.c
View File

@ -466,7 +466,7 @@ void s1ap_handle_initial_context_setup_response(
ogs_assert(ENB_UE_S1AP_ID);
enb_ue = enb_ue_find_by_enb_ue_s1ap_id(enb, *ENB_UE_S1AP_ID);
ogs_assert(enb_ue);
ogs_expect_or_return(enb_ue);
mme_ue = enb_ue->mme_ue;
ogs_assert(mme_ue);