jammy-dnsmasq-crash-2045570 : lp:~ahasenack/ubuntu/+source/dnsmasq : Git : Code : dnsmasq package : Ubuntu

Get this branch:: git clone -b jammy-dnsmasq-crash-2045570 https://git.launchpad.net/~ahasenack/ubuntu/+source/dnsmasq

Only Andreas Hasenack can upload to this branch. If you are Andreas Hasenack please log in for upload directions.

Branch merges

Merged into ubuntu/+source/dnsmasq:ubuntu/jammy-devel at revision 4097355f9ed45f06a89b0b2407627d2ac50afd06

git-ubuntu bot: Approve on 2024-01-03

Athos Ribeiro (community): Approve on 2024-01-03

Canonical Server Reporter: Pending requested 2024-01-03

Branch information

Name:: jammy-dnsmasq-crash-2045570

Repository:: lp:~ahasenack/ubuntu/+source/dnsmasq

Recent commits

4097355... by Andreas Hasenack on 2024-01-03

changelog

7bf8806... by Simon Kelley on 2021-10-06

Fix crash after re-reading an empty resolv.conf file.

If dnsmasq re-reads a resolv file, and it's empty, it will
retry after a delay. In the meantime, the old servers from the
resolv file have been deleted, but the servers_array doesn't
get updated, leading to dangling pointers and crashes.

Thanks to Brad Jorsch for finding and analysing this bug.

This problem was introduced in 2.86.

e23dc75... by Miriam España Acebal on 2023-07-25

changelog 2.86-1.1ubuntu0.4

8875ef8... by Miriam España Acebal on 2023-04-21

Fix confusion is server=/domain/# combined with server|address=/domain/....

The 2.86 domain matching rewrite failed to take into account the possibilty that

server=/example.com/#

could be combined with, for example

address=/example.com/1.2.3.4

resulting in the struct server datastructure for the former getting passed
to forward_query(), rapidly followed by a SEGV.

This fix makes server=/example.com/# a fully fledged member of the
priority list, which is now IPv6 addr, IPv4 addr, all zero return,
resolvconf servers, upstream servers, no-data return

Thanks to <email address hidden> for finding and characterising the bug.

715e3ca... by Ian Constantin on 2023-04-18