domenico/openwrt-R7800-nss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dnsmasq: mark global ubus context as closed after fork

Browse Source 
If the dnsmasq process forks to handle TCP connections, it closes the ubus
context. But instead of changing the daemon wide pointer to NULL, only the
local variable was adjusted - and this portion of the code was even dropped
(dead store) by some optimizing compilers.

It makes more sense to change the daemon->ubus pointer because various
functions are already checking it for NULL. It is also the behavior which
ubus_destroy() implements.

Fixes: d8b33dad0b ("dnsmasq: add support for monitoring and modifying dns lookup results via ubus")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
This commit is contained in:
Sven Eckelmann
2023-11-18 16:29:09 +01:00
committed by Hauke Mehrtens
parent 4e09722a68
commit 711dcb7763
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/network/services/dnsmasq/patches/200-ubus_dns.patch
View File

@@ -210,7 +210,7 @@
+ return; + return;
+ +
+ ubus_free(ubus); + ubus_free(ubus);
+ ubus = NULL; + daemon->ubus = NULL;
+} +}
+ +
static int ubus_handle_metrics(struct ubus_context *ctx, struct ubus_object *obj, static int ubus_handle_metrics(struct ubus_context *ctx, struct ubus_object *obj,