From 8c8971258e00ff2b2c06158e7053b767ae45656d Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Tue, 19 Dec 2023 08:50:56 +0100
Subject: [PATCH] NGAP: read correct PDU session NSSAI

The allowed NSSAIs is NOT the NSSAI to be used for a UE. Fix it to use
the correct one.
---
 openair2/RRC/NR/rrc_gNB_NGAP.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/openair2/RRC/NR/rrc_gNB_NGAP.c b/openair2/RRC/NR/rrc_gNB_NGAP.c
index b659ccc2f8..00497d6d1b 100644
--- a/openair2/RRC/NR/rrc_gNB_NGAP.c
+++ b/openair2/RRC/NR/rrc_gNB_NGAP.c
@@ -788,9 +788,7 @@ void rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ(MessageDef *msg_p, instance_t ins
     pdu_session_to_setup_t *pdu = bearer_req.pduSession + bearer_req.numPDUSessions;
     bearer_req.numPDUSessions++;
     pdu->sessionId = session->pdusession_id;
-    nssai_t *nssai = &msg->allowed_nssai[i];
-    pdu->nssai.sst = nssai->sst;
-    pdu->nssai.sd = nssai->sd;
+    pdu->nssai = msg->pdusession_setup_params[i].nssai;
     if (cuup_nssai.sst == 0)
       cuup_nssai = pdu->nssai; /* for CU-UP selection below */
     pdu->integrityProtectionIndication = rrc->security.do_drb_integrity ? E1AP_IntegrityProtectionIndication_required : E1AP_IntegrityProtectionIndication_not_needed;