From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 24 Nov 2025 17:19:06 +0000 (-0500)
Subject: tweak checks for type size
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7d2b4d5685d1053e166cb8993cdab6bb5ff5f3d;p=thirdparty%2Ffreeradius-server.git

tweak checks for type size
---

diff --git a/src/lib/util/dict_util.c b/src/lib/util/dict_util.c
index 8dc1534f5e6..58b17157628 100644
--- a/src/lib/util/dict_util.c
+++ b/src/lib/util/dict_util.c
@@ -2337,13 +2337,13 @@ ssize_t fr_dict_attr_by_oid_legacy(fr_dict_t const *dict, fr_dict_attr_t const *
 	}
 
 	/*
-	 *	If it's not a vendor type, it must be between 0..8*type_size
-	 *
-	 *	@fixme: find the TLV parent, and check it's size
+	 *	TLVs must have a defined size.
 	 */
-	if (((*parent)->type != FR_TYPE_VENDOR) && ((*parent)->type != FR_TYPE_VSA) && !(*parent)->flags.is_root &&
-	    (num > ((uint64_t) 1 << (8 * (*parent)->flags.type_size)))) {
-		fr_strerror_printf("TLV attributes must be %" PRIu64 " bits or less", ((uint64_t)1 << (8 * (*parent)->flags.type_size)));
+	if (((*parent)->type == FR_TYPE_TLV) &&
+	    (!(*parent)->flags.internal && !(*parent)->flags.name_only && !(*parent)->flags.is_root &&
+	     (num > ((uint64_t) 1 << (8 * (*parent)->flags.type_size))))) {
+		fr_strerror_printf("TLV attributes of parent %s must be %" PRIu64 " bits or less",
+				   (*parent)->name, ((uint64_t)1 << (8 * (*parent)->flags.type_size)));
 		return 0;
 	}