luci-base: prevent save/traceback race for _state

systemcrash · systemcrash · commit daca0e85a8d4 · 2026-03-04T01:13:05.000+01:00
A _state race is possible during save when a refresh is in
progress. Attempt to avoid it by not nulling state prior
to refresh.

Signed-off-by: Paul Donald &lt;newtwen+github@gmail.com&gt;
diff --git a/modules/luci-base/htdocs/luci-static/resources/network.js b/modules/luci-base/htdocs/luci-static/resources/network.js
@@ -354,7 +354,6 @@ function initNetworkState(refresh) {
 	if (_state == null || refresh) {
 		const hasWifi = L.hasSystemFeature('wifi');
 
-		if (refresh) _state = null;
 		if (refresh || !_init) {
 			_init = Promise.all([
 			L.resolveDefault(callNetworkInterfaceDump(), []),
@@ -538,6 +537,9 @@ function initNetworkState(refresh) {
 
 	}
 
+	if (refresh)
+		return _init;
+
 	return (_state != null ? Promise.resolve(_state) : _init);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,6 @@ function initNetworkState(refresh) {`
`354`	`354`	`if (_state == null \|\| refresh) {`
`355`	`355`	`const hasWifi = L.hasSystemFeature('wifi');`
`356`	`356`
`357`		`- if (refresh) _state = null;`
`358`	`357`	`if (refresh \|\| !_init) {`
`359`	`358`	`_init = Promise.all([`
`360`	`359`	`L.resolveDefault(callNetworkInterfaceDump(), []),`
`@@ -538,6 +537,9 @@ function initNetworkState(refresh) {`
`538`	`537`
`539`	`538`	`}`
`540`	`539`
	`540`	`+ if (refresh)`
	`541`	`+ return _init;`
	`542`	`+`
`541`	`543`	`return (_state != null ? Promise.resolve(_state) : _init);`
`542`	`544`	`}`
`543`	`545`