- Fix defense in depth for service callback with empty packet.

diff --git a/daemon/worker.c b/daemon/worker.c
index 83ee0815ecdfa5a01b352e785e92f18c61adf60a..026abfcbc770a1b2b7503f75ace522107ca93e62 100644 (file)
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -255,7 +255,8 @@ worker_handle_service_reply(struct comm_point* c, void* arg, int error,
                return 0;
        }
        /* sanity check. */
-       if(!LDNS_QR_WIRE(sldns_buffer_begin(c->buffer))
+       if(sldns_buffer_limit(c->buffer) < LDNS_HEADER_SIZE
+               || !LDNS_QR_WIRE(sldns_buffer_begin(c->buffer))
                || LDNS_OPCODE_WIRE(sldns_buffer_begin(c->buffer)) !=
                        LDNS_PACKET_QUERY
                || LDNS_QDCOUNT(sldns_buffer_begin(c->buffer)) > 1) {

diff --git a/doc/Changelog b/doc/Changelog
index 1d0e2add1193d1d5e252c5ddf145916047dbd749..444d8bc789cf4759f9d167abe1e868ce36bddfb7 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 27 March 2026: Wouter
        - Fix to allow the control-interface config to use ip@port notation.
        - Fix test code to allow empty hex answer packets from testbound.
+       - Fix defense in depth for service callback with empty packet.
 
 24 March 2026: Wouter
        - Fix to check for invalid http content length and chunk size,