Upstream report for the dnsmasq proxy-DHCP busy loop (report, reproducer, patch)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
7a007ef048
commit
16f76955ac
4 files changed
+194
No files matched your search
@@ -0,0 +1,16 @@
|
||||
--- a/src/rfc2131.c
|
||||
+++ b/src/rfc2131.c
|
||||
@@ -977,7 +977,12 @@
|
||||
int redirect4011 = 0;
|
||||
struct dhcp_opt *option;
|
||||
|
||||
- /* OK only dhcp-option-pxe options. */
|
||||
+ /* OK only dhcp-option-pxe options.
|
||||
+ option_filter() appends netid to the end of the context's tag list.
|
||||
+ tmp->netid is static and still links to the previous request's
|
||||
+ (stack) tags here; start it afresh, as the non-proxy path does,
|
||||
+ or the list can become circular and the tag walks never end. */
|
||||
+ tmp->netid.next = NULL;
|
||||
tagif_netid = option_filter(netid, tmp->netid.net ? &tmp->netid : NULL, daemon->dhcp_opts, 2);
|
||||
boot = find_boot(tagif_netid);
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
# dnsmasq: busy loop in proxy DHCP with a tagged range
|
||||
|
||||
Found 2026-10-29 while testing Rollcall's proxy DHCP mode (gdb on a stuck lab
|
||||
rack controller). Affects dnsmasq 2.91 (Debian 13) and 2.93 (latest release).
|
||||
Rollcall works around it by leaving the tag off proxy ranges
|
||||
(`cmd/rollcall/network.go`, `dnsmasqConfig`).
|
||||
|
||||
| File | |
|
||||
|---|---|
|
||||
| `report.txt` | the report to send upstream (plain text, patch inline) |
|
||||
| `repro.sh` | reproducer: `sudo ./repro.sh /path/to/dnsmasq` (two netns + veth, two PXE DISCOVERs) |
|
||||
| `0001-proxy-dhcp-reset-context-tags.patch` | one-line fix against 2.93, applies with `patch -p1` or `git apply` |
|
||||
|
||||
Results on a Debian 13 VM:
|
||||
|
||||
| dnsmasq | Configuration | CPU after two PXE requests |
|
||||
|---|---|---|
|
||||
| 2.91 (Debian) | tagged proxy range, `log-dhcp` | 100% |
|
||||
| 2.93 | same | 100% |
|
||||
| 2.93 + patch | same | 0% |
|
||||
| 2.93 | no `log-dhcp`, `dhcp-option` for an absent tag | 69% |
|
||||
| 2.93 + patch | same | 0% |
|
||||
|
||||
Status: not reported yet.
|
||||
@@ -0,0 +1,97 @@
|
||||
Subject: [PATCH] proxy DHCP: busy loop when a proxy dhcp-range has a tag
|
||||
|
||||
Hello Simon,
|
||||
|
||||
dnsmasq can be put into a busy loop by two PXE DHCPDISCOVERs from any client
|
||||
on a network with a tagged proxy range. dnsmasq then stops answering DHCP,
|
||||
TFTP and DNS until it is restarted. Reproduced on 2.91 (Debian 13,
|
||||
2.91-1+deb13u2) and on 2.93 built from the release tarball; a one-line patch
|
||||
is below.
|
||||
|
||||
Configuration (the relevant part):
|
||||
|
||||
dhcp-range=set:prov,192.0.2.0,proxy,255.255.255.0
|
||||
pxe-service=tag:prov,x86PC,"boot",pxelinux
|
||||
log-dhcp
|
||||
|
||||
After the second PXE request dnsmasq sits at 100% CPU, makes no system
|
||||
calls, and its sockets fill up. gdb on the stuck process:
|
||||
|
||||
#0 __strcmp_sse42 ()
|
||||
#1 log_tags (netid=..., xid=...) at dhcp-common.c:276
|
||||
#2 dhcp_reply (...) at rfc2131.c:1028 (proxy branch)
|
||||
#3 dhcp_packet (...) at dhcp.c:340
|
||||
#4 main (...) at dnsmasq.c:1299
|
||||
|
||||
The tag list that log_tags() walks is circular. Walking it in gdb on two
|
||||
occasions:
|
||||
|
||||
prov -> eth1 -> eth1 -> eth1 -> ... (iface tag points at itself)
|
||||
prov -> known -> bios -> eth1 -> known -> ... (with dhcp-host and dhcp-match)
|
||||
|
||||
Cause, as far as I can see: in the proxy branch of dhcp_reply(),
|
||||
|
||||
tagif_netid = option_filter(netid, tmp->netid.net ? &tmp->netid : NULL, ...);
|
||||
|
||||
option_filter() walks the context tags to their end and appends the request's
|
||||
tags:
|
||||
|
||||
for (last_tag = context_tags; last_tag->next; last_tag = last_tag->next);
|
||||
last_tag->next = tags;
|
||||
|
||||
tmp->netid is part of the (static) dhcp_context, so after the first request
|
||||
tmp->netid.next still points at the previous request's iface_id, a stack
|
||||
variable of dhcp_reply(). The next request has its iface_id at the same
|
||||
address with next == NULL, so the walk stops on it and sets
|
||||
iface_id.next = &iface_id. The non-proxy path does not have this problem
|
||||
because it assigns context->netid.next before use.
|
||||
|
||||
It is not only log_tags(): without log-dhcp, any walk that looks for a tag
|
||||
that is not in the list never ends. With
|
||||
|
||||
dhcp-option=tag:nosuch,option:ntp-server,192.0.2.9
|
||||
|
||||
added (and log-dhcp removed) 2.93 loops the same way.
|
||||
|
||||
The attached repro.sh shows it in a few seconds (Linux, root): it creates two
|
||||
network namespaces joined by a veth pair, runs the given dnsmasq binary with
|
||||
the configuration above in one and sends two PXE DISCOVERs from the other:
|
||||
|
||||
stock 2.93: dnsmasq CPU over 5 s: 100% RESULT: BUSY LOOP
|
||||
2.93 + patch: dnsmasq CPU over 5 s: 0% RESULT: ok
|
||||
stock 2.93, no log-dhcp, dhcp-option for an absent tag: 69% BUSY LOOP
|
||||
2.93 + patch, same: 0% ok
|
||||
|
||||
We found it on a PXE provisioning system whose rack controllers run dnsmasq
|
||||
in proxy mode next to a site's own DHCP server; the clients were ordinary
|
||||
iPXE ROMs. Our generated configurations now leave the tag off proxy ranges.
|
||||
|
||||
The patch resets the context tag before option_filter() appends to it, which
|
||||
is what the non-proxy path effectively does:
|
||||
|
||||
--- a/src/rfc2131.c
|
||||
+++ b/src/rfc2131.c
|
||||
@@ -977,7 +977,12 @@
|
||||
int redirect4011 = 0;
|
||||
struct dhcp_opt *option;
|
||||
|
||||
- /* OK only dhcp-option-pxe options. */
|
||||
+ /* OK only dhcp-option-pxe options.
|
||||
+ option_filter() appends netid to the end of the context's tag list.
|
||||
+ tmp->netid is static and still links to the previous request's
|
||||
+ (stack) tags here; start it afresh, as the non-proxy path does,
|
||||
+ or the list can become circular and the tag walks never end. */
|
||||
+ tmp->netid.next = NULL;
|
||||
tagif_netid = option_filter(netid, tmp->netid.net ? &tmp->netid : NULL, daemon->dhcp_opts, 2);
|
||||
boot = find_boot(tagif_netid);
|
||||
|
||||
|
||||
option_filter() might be the better place for a general fix (the DHCPv6 path
|
||||
in rfc3315.c passes state->context_tags the same way), but I have only
|
||||
tested the proxy case.
|
||||
|
||||
Since a single client can stop dnsmasq on the whole segment, you may want to
|
||||
treat this as a denial-of-service issue; I have not posted it anywhere else.
|
||||
|
||||
Regards,
|
||||
<name>
|
||||
+57
@@ -0,0 +1,57 @@
|
||||
#!/bin/sh
|
||||
# dnsmasq proxy-DHCP busy loop reproducer. Run as root on Linux.
|
||||
# ./repro.sh [/path/to/dnsmasq]
|
||||
# Creates two network namespaces joined by a veth pair, runs dnsmasq with one
|
||||
# tagged proxy range in one, sends two PXE DHCPDISCOVERs from the other, then
|
||||
# reports dnsmasq's CPU use. A healthy dnsmasq stays near 0%.
|
||||
set -eu
|
||||
DNSMASQ=${1:-dnsmasq}
|
||||
D=$(mktemp -d)
|
||||
cleanup() { [ -f "$D/pid" ] && kill "$(cat "$D/pid")" 2>/dev/null || true; ip netns del dq-srv 2>/dev/null || true; ip netns del dq-cli 2>/dev/null || true; rm -rf "$D"; }
|
||||
trap cleanup EXIT
|
||||
cleanup 2>/dev/null || true; D=$(mktemp -d)
|
||||
ip netns add dq-srv; ip netns add dq-cli
|
||||
ip link add dq0 type veth peer name dq1
|
||||
ip link set dq0 netns dq-srv; ip link set dq1 netns dq-cli
|
||||
ip -n dq-srv addr add 192.0.2.1/24 dev dq0; ip -n dq-srv link set dq0 up; ip -n dq-srv link set lo up
|
||||
ip -n dq-cli link set dq1 up; ip -n dq-cli link set lo up
|
||||
mkdir -p "$D/tftp"
|
||||
cat > "$D/dnsmasq.conf" <<EOF
|
||||
port=0
|
||||
interface=dq0
|
||||
bind-interfaces
|
||||
log-dhcp
|
||||
enable-tftp
|
||||
tftp-root=$D/tftp
|
||||
dhcp-range=set:prov,192.0.2.0,proxy,255.255.255.0
|
||||
pxe-service=tag:prov,x86PC,"boot",pxelinux
|
||||
EOF
|
||||
ip netns exec dq-srv "$DNSMASQ" --conf-file="$D/dnsmasq.conf" --pid-file="$D/pid" --log-facility="$D/log" -u root
|
||||
sleep 1
|
||||
"$DNSMASQ" --version | head -1
|
||||
# two PXE DISCOVERs (vendor class PXEClient, client arch 0 = x86 BIOS), like a PXE/iPXE ROM sends
|
||||
ip netns exec dq-cli python3 - <<'P'
|
||||
import os, socket, struct, time
|
||||
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
|
||||
s.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
|
||||
s.setsockopt(socket.SOL_SOCKET, 25, b"dq1") # SO_BINDTODEVICE
|
||||
s.bind(("0.0.0.0", 68))
|
||||
mac = bytes.fromhex("020000000001")
|
||||
for n in range(2):
|
||||
xid = os.urandom(4)
|
||||
p = bytearray(240)
|
||||
p[0:4] = bytes([1, 1, 6, 0]); p[4:8] = xid
|
||||
struct.pack_into(">H", p, 10, 0x8000)
|
||||
p[28:34] = mac; p[236:240] = bytes([99, 130, 83, 99])
|
||||
vc = b"PXEClient:Arch:00000:UNDI:002001"
|
||||
p += bytes([53, 1, 1, 60, len(vc)]) + vc + bytes([93, 2, 0, 0, 94, 3, 1, 2, 1, 97, 17, 0]) + os.urandom(16) + bytes([255])
|
||||
s.sendto(bytes(p), ("255.255.255.255", 67))
|
||||
time.sleep(1)
|
||||
P
|
||||
sleep 2
|
||||
P=$(cat "$D/pid")
|
||||
a=$(awk '{print $14+$15}' /proc/$P/stat); sleep 5; b=$(awk '{print $14+$15}' /proc/$P/stat)
|
||||
cpu=$(( (b - a) * 100 / (5 * $(getconf CLK_TCK)) ))
|
||||
echo "dnsmasq CPU over 5 s: ${cpu}%"
|
||||
grep -c "proxy" "$D/log" | sed 's/^/proxy replies logged: /'
|
||||
[ "$cpu" -lt 50 ] && echo "RESULT: ok" || echo "RESULT: BUSY LOOP"
|
||||
Reference in new issue
Block a user