From da0985e74897fc331290e15c6920e000ec80d663 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Desbiens?= Date: Mon, 14 Jul 2025 16:33:19 -0400 Subject: [PATCH] Merged fix for advisory GHSA-w8rw-fqgj-9r49 provided by Bill Lamie. --- .../inc/txm_module_manager_dispatch.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/common_modules/module_manager/inc/txm_module_manager_dispatch.h b/common_modules/module_manager/inc/txm_module_manager_dispatch.h index 4f30ad26..0ac2210d 100644 --- a/common_modules/module_manager/inc/txm_module_manager_dispatch.h +++ b/common_modules/module_manager/inc/txm_module_manager_dispatch.h @@ -1,5 +1,6 @@ /*************************************************************************** - * Copyright (c) 2024 Microsoft Corporation + * Copyright (c) 2024 Microsoft Corporation + * Copyright (c) 2025 Eclipse ThreadX Contributors * * This program and the accompanying materials are made available under the * terms of the MIT License which is available at @@ -2389,6 +2390,11 @@ static ALIGN_TYPE _txm_module_manager_tx_thread_preemption_change_dispatch(TXM_M ALIGN_TYPE return_value; + if (param_1 < module_instance -> txm_module_instance_maximum_priority) + { + return(TX_THRESH_ERROR); + } + if (module_instance -> txm_module_instance_property_flags & TXM_MODULE_MEMORY_PROTECTION) { if (!TXM_MODULE_MANAGER_PARAM_CHECK_OBJECT_FOR_USE(module_instance, param_0, sizeof(TX_THREAD))) @@ -2418,6 +2424,11 @@ static ALIGN_TYPE _txm_module_manager_tx_thread_priority_change_dispatch(TXM_MOD ALIGN_TYPE return_value; + if (param_1 < module_instance -> txm_module_instance_maximum_priority) + { + return(TX_PRIORITY_ERROR); + } + if (module_instance -> txm_module_instance_property_flags & TXM_MODULE_MEMORY_PROTECTION) { if (!TXM_MODULE_MANAGER_PARAM_CHECK_OBJECT_FOR_USE(module_instance, param_0, sizeof(TX_THREAD)))