ubuntu/+source/dnsmasq:ubuntu/jammy-security

Last commit made on 2024-02-26
Get this branch:
git clone -b ubuntu/jammy-security https://git.launchpad.net/ubuntu/+source/dnsmasq
Members of git-ubuntu import can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
ubuntu/jammy-security
Repository:
lp:ubuntu/+source/dnsmasq

Recent commits

d93230e... by Marc Deslauriers

2.90-0ubuntu0.22.04.1 (patches unapplied)

Imported using git-ubuntu import.

5e82236... by Andreas Hasenack

changelog: merge #2045570 and #2042587 into a single entry

b26cd7f... by Andreas Hasenack

changelog

e20f340... by Simon Kelley

Fix wrong client address for dhcp-script when DHCPv4 relay in use.

Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/dnsmasq/+bug/2042587
Origin: upstream, https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;h=1c8855ed10d3923a9a4fd8a89f1c95439d4c8827

7fcb433... by Andreas Hasenack

changelog

e447dae... by Simon Kelley

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.

Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/dnsmasq/+bug/2045570
Origin: upstream, https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=d290630d31f4517ab26392d00753d1397f9a4114

e23dc75... by Miriam España Acebal

changelog 2.86-1.1ubuntu0.4

8875ef8... by Miriam España Acebal

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

2.86-1.1ubuntu0.3 (patches unapplied)

Imported using git-ubuntu import.

c0f8d3f... by Lena Voytek

2.86-1.1ubuntu0.2 (patches unapplied)

Imported using git-ubuntu import.