From 02f7dbb42be7f75355436ec43bc82d0b2b4caad6 Mon Sep 17 00:00:00 2001
From: Jonathan Hui <jonhui@google.com>
Date: Thu, 10 Dec 2020 11:49:57 -0800
Subject: [PATCH] [meshcop-tlvs] fix ChannelMaskBaseTlv::IsValid() (#5929)

---
 src/core/meshcop/meshcop_tlvs.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/meshcop/meshcop_tlvs.cpp b/src/core/meshcop/meshcop_tlvs.cpp
index 61b803a6e..839fe1ce5 100644
--- a/src/core/meshcop/meshcop_tlvs.cpp
+++ b/src/core/meshcop/meshcop_tlvs.cpp
@@ -189,7 +189,7 @@ bool ChannelMaskBaseTlv::IsValid(void) const
 
     VerifyOrExit(entry != nullptr);
 
-    while (reinterpret_cast<const uint8_t *>(entry) < end)
+    while (reinterpret_cast<const uint8_t *>(entry) + sizeof(ChannelMaskEntryBase) <= end)
     {
         entry = entry->GetNext();
         VerifyOrExit(reinterpret_cast<const uint8_t *>(entry) <= end);