From 4cc1bb5433a8f51557b1601c584055c78cc1e780 Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Thu, 23 May 2024 16:51:58 +0200
Subject: [PATCH] nrUE NAS: hotfix for get_msg_type()

The version before this commit is wrong, taking wrong byte for msg_type
in some cases.

I don't have much time to implement a proper NAS PDU parser, so let's go
with hardcoded values.

Some later work will be done to have a cleaner solution. As of now, it's
too much work.
---
 openair3/NAS/NR_UE/nr_nas_msg_sim.c | 49 ++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/openair3/NAS/NR_UE/nr_nas_msg_sim.c b/openair3/NAS/NR_UE/nr_nas_msg_sim.c
index 42caa30075..99ea2aef85 100644
--- a/openair3/NAS/NR_UE/nr_nas_msg_sim.c
+++ b/openair3/NAS/NR_UE/nr_nas_msg_sim.c
@@ -894,30 +894,41 @@ static void generatePduSessionEstablishRequest(nr_ue_nas_t *nas, as_nas_info_t *
 }
 
 
-uint8_t get_msg_type(uint8_t *pdu_buffer, uint32_t length) {
-  uint8_t          msg_type = 0;
-  uint8_t          offset   = 0;
+static uint8_t get_msg_type(uint8_t *pdu_buffer, uint32_t length)
+{
+  if (pdu_buffer == NULL)
+    goto error;
 
-  if ((pdu_buffer != NULL) && (length > 0)) {
-    if (((nas_msg_header_t *)(pdu_buffer))->choice.security_protected_nas_msg_header_t.security_header_type > 0) {
-      offset += SECURITY_PROTECTED_5GS_NAS_MESSAGE_HEADER_LENGTH;
-      if (offset < length) {
-        msg_type = ((mm_msg_header_t *)(pdu_buffer + offset))->message_type;
+  /* get security header type */
+  if (length < 2)
+    goto error;
 
-        if (msg_type == FGS_DOWNLINK_NAS_TRANSPORT) {
-          dl_nas_transport_t tmp;
-          memcpy(&tmp, pdu_buffer + offset, sizeof(tmp));
-          msg_type = tmp.sm_nas_msg_header.message_type;
-        }
-      }
-    } else { // plain 5GS NAS message
-      msg_type = ((nas_msg_header_t *)(pdu_buffer))->choice.plain_nas_msg_header.message_type;
-    }
-  } else {
-    LOG_I(NAS, "[UE] Received invalid downlink message\n");
+  int security_header_type = pdu_buffer[1];
+
+  if (security_header_type == 0) {
+    /* plain NAS message */
+    if (length < 3)
+      goto error;
+    return pdu_buffer[2];
+  }
+
+  if (length < 10)
+    goto error;
+
+  int msg_type = pdu_buffer[9];
+
+  if (msg_type == FGS_DOWNLINK_NAS_TRANSPORT) {
+    if (length < 17)
+      goto error;
+
+    msg_type = pdu_buffer[16];
   }
 
   return msg_type;
+
+error:
+  LOG_E(NAS, "[UE] Received invalid downlink message\n");
+  return 0;
 }
 
 static void send_nas_uplink_data_req(instance_t instance, const as_nas_info_t *initial_nas_msg)