From 833ff548c538d158c13b6adeaa19294a6eb1cbfc Mon Sep 17 00:00:00 2001
From: francescomani <email@francescomani.it>
Date: Wed, 21 Jan 2026 03:20:16 +0100
Subject: [PATCH] checking consistency in CSI-ResourceConfigId for channel and
 interference measurements in received RRC configuration

This handles issue #1018
---
 openair2/RRC/NR_UE/verify_RRC.c | 87 +++++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)

diff --git a/openair2/RRC/NR_UE/verify_RRC.c b/openair2/RRC/NR_UE/verify_RRC.c
index 819023a638..7ed13dde40 100644
--- a/openair2/RRC/NR_UE/verify_RRC.c
+++ b/openair2/RRC/NR_UE/verify_RRC.c
@@ -21,8 +21,95 @@
  
  #include "rrc_proto.h"
  
+static bool check_resourcesForInterference(const NR_CSI_MeasConfig_t *meas, NR_CSI_ResourceConfigId_t res_id, bool is_CSIIM)
+{
+  NR_CSI_ResourceConfig_t *res = NULL;
+  if (meas->csi_ResourceConfigToAddModList) {
+    for (int i = 0; i < meas->csi_ResourceConfigToAddModList->list.count; i++) {
+      if (meas->csi_ResourceConfigToAddModList->list.array[i]->csi_ResourceConfigId == res_id)
+        res = meas->csi_ResourceConfigToAddModList->list.array[i];
+    }
+  }
+  if (!res) {
+    LOG_E(NR_RRC, "No CSI-Resource matching with resourcesForInterference set in report config\n");
+    return false;
+  } else {
+    if (is_CSIIM) {
+      if (res->csi_RS_ResourceSetList.present != NR_CSI_ResourceConfig__csi_RS_ResourceSetList_PR_csi_IM_ResourceSetList) {
+        LOG_E(NR_RRC, "resourcesForInterference doesn't point to CSI-IM resource\n");
+        return false;
+      }
+    } else {
+      if (res->csi_RS_ResourceSetList.present != NR_CSI_ResourceConfig__csi_RS_ResourceSetList_PR_nzp_CSI_RS_SSB
+          || !res->csi_RS_ResourceSetList.choice.nzp_CSI_RS_SSB->nzp_CSI_RS_ResourceSetList) {
+        LOG_E(NR_RRC, "NZP CSI-RS resourcesForInterference doesn't point to NZP CSI-RS resource\n");
+        return false;
+      }
+    }
+  }
+  return true;
+}
+
+static bool check_resourcesForChannelMeasurement(const NR_CSI_MeasConfig_t *meas,
+                                                 NR_CSI_ResourceConfigId_t res_id,
+                                                 struct NR_CSI_ReportConfig__reportQuantity quantity)
+{
+  NR_CSI_ResourceConfig_t *res = NULL;
+  if (meas->csi_ResourceConfigToAddModList) {
+    for (int i = 0; i < meas->csi_ResourceConfigToAddModList->list.count; i++) {
+      if (meas->csi_ResourceConfigToAddModList->list.array[i]->csi_ResourceConfigId == res_id)
+        res = meas->csi_ResourceConfigToAddModList->list.array[i];
+    }
+  }
+  if (!res) {
+    LOG_E(NR_RRC, "No CSI-Resource matching with resourcesForChannelMeasurement set in report config\n");
+    return false;
+  } else {
+    if (res->csi_RS_ResourceSetList.present != NR_CSI_ResourceConfig__csi_RS_ResourceSetList_PR_nzp_CSI_RS_SSB) {
+      LOG_E(NR_RRC, "resourcesForChannelMeasurement doesn't point to CSI-RS-SSB resource\n");
+      return false;
+    } else {
+      if (!res->csi_RS_ResourceSetList.choice.nzp_CSI_RS_SSB->nzp_CSI_RS_ResourceSetList
+          && (quantity.present != NR_CSI_ReportConfig__reportQuantity_PR_ssb_Index_RSRP
+          && quantity.present != NR_CSI_ReportConfig__reportQuantity_PR_NOTHING
+          && quantity.present != NR_CSI_ReportConfig__reportQuantity_PR_none)) {
+        LOG_E(NR_RRC, "resourcesForChannelMeasurement is for CRI measurement but doen't point to an CRI-RS resource\n");
+        return false;
+      }
+    }
+  }
+  return true;
+}
+
+static bool check_csi_report_consistency(const NR_CSI_MeasConfig_t *meas)
+{
+  if (!meas->csi_ReportConfigToAddModList)
+    return true;
+  for (int i = 0; i < meas->csi_ReportConfigToAddModList->list.count; i++) {
+    NR_CSI_ReportConfig_t *csirep = meas->csi_ReportConfigToAddModList->list.array[i];
+    if (!check_resourcesForChannelMeasurement(meas, csirep->resourcesForChannelMeasurement, csirep->reportQuantity))
+      return false;
+    if (csirep->csi_IM_ResourcesForInterference) {
+      if (!check_resourcesForInterference(meas, *csirep->csi_IM_ResourcesForInterference, true))
+        return false;
+    }
+    if (csirep->nzp_CSI_RS_ResourcesForInterference) {
+      if (!check_resourcesForInterference(meas, *csirep->nzp_CSI_RS_ResourcesForInterference, false))
+        return false;
+    }
+  }
+  return true;
+}
+
 bool check_cellgroup_config(const NR_CellGroupConfig_t *cgConfig)
 {
+  if (cgConfig->spCellConfig &&
+      cgConfig->spCellConfig->spCellConfigDedicated &&
+      cgConfig->spCellConfig->spCellConfigDedicated->csi_MeasConfig) {
+    if (!check_csi_report_consistency(cgConfig->spCellConfig->spCellConfigDedicated->csi_MeasConfig->choice.setup))
+      return false;
+  }
+
   if (cgConfig->ext1 && cgConfig->ext1->reportUplinkTxDirectCurrent) {
     LOG_E(NR_RRC, "Reporting of UplinkTxDirectCurrent not implemented\n");
     return false;