Fix rlm_python3 dead-lock in GIL. ref FreeRADIUS#5111

... Limiting to have more than one instance
jpereira · Jul 28, 2023 · 144088d · 144088d
1 parent 342a995
commit 144088d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -17,6 +17,7 @@ FreeRADIUS 3.2.4 Fri 26 May 2023 12:00:00 EDT urgency=low
 	  canonical attribute
 	* Make FreeRADIUS-Server-EMA* attributes work again for home server
 	  exponential moving average statistics.
+	* Fix rlm_python3 dead-lock in GIL limiting to have more than one instance. Fixes #5111
 
 FreeRADIUS 3.2.3 Fri 26 May 2023 12:00:00 EDT urgency=low
 	Configuration changes

diff --git a/src/modules/rlm_python3/rlm_python3.c b/src/modules/rlm_python3/rlm_python3.c
@@ -1135,6 +1135,8 @@ static int python_interpreter_init(rlm_python_t *inst, CONF_SECTION *conf)
 		Py_InitializeEx(0);			/* Don't override signal handlers - noop on subs calls */
 		PyEval_InitThreads(); 			/* This also grabs a lock (which we then need to release) */
 		main_interpreter = PyThreadState_Get();	/* Store reference to the main interpreter */
+		PyEval_SaveThread();                    /* Unlock GIL */
+
 	}
 	rad_assert(PyEval_ThreadsInitialized());
 
@@ -1204,8 +1206,6 @@ static int python_interpreter_init(rlm_python_t *inst, CONF_SECTION *conf)
 		Py_IncRef(inst->pythonconf_dict);
 	}
 
-	PyEval_SaveThread();
-
 	return 0;
 }