From 5dce90b6d03dc7480446a0365224b6e82f9ca6f5 Mon Sep 17 00:00:00 2001
From: Bryan Biedenkapp <gatekeep@gmail.com>
Date: Fri, 13 Dec 2024 13:00:00 -0500
Subject: [PATCH] perform src and dst ACL checking for group aff query
 responses;

---
 src/host/p25/packet/ControlSignaling.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/host/p25/packet/ControlSignaling.cpp b/src/host/p25/packet/ControlSignaling.cpp
index 77123367..8f3c45ab 100644
--- a/src/host/p25/packet/ControlSignaling.cpp
+++ b/src/host/p25/packet/ControlSignaling.cpp
@@ -548,6 +548,12 @@ bool ControlSignaling::process(uint8_t* data, uint32_t len, std::unique_ptr<lc::
                 // make sure control data is supported
                 IS_SUPPORT_CONTROL_CHECK(tsbk->toString(true), TSBKO::ISP_GRP_AFF_Q_RSP, srcId);
 
+                // validate the source RID
+                VALID_SRCID(tsbk->toString(true), TSBKO::IOSP_ACK_RSP, srcId);
+
+                // validate the target RID
+                VALID_DSTID(tsbk->toString(true), TSBKO::IOSP_ACK_RSP, srcId, dstId);
+
                 if (m_p25->m_ackTSBKRequests) {
                     writeRF_TSDU_ACK_FNE(srcId, TSBKO::ISP_GRP_AFF_Q_RSP, true, true);
                 }