Commit Graph

71 Commits

Author SHA1 Message Date
Kevin Darbyshire-Bryant
c69ccdd307 CC: dnsmasq: bump to v2.78
Fixes CVE-2017-14491, CVE-2017-14492, CVE-2017-14493, CVE-2017-14494, 2017-CVE-14495, 2017-CVE-14496

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
2017-10-05 14:47:30 +02:00
Kevin Darbyshire-Bryant
00bf56d61a dnsmasq: forward.c: fix CVE-2017-13704
Fix SIGSEGV in rfc1035.c answer_request() line 1228 where memset()
is called with header & limit pointing at the same address and thus
tries to clear memory from before the buffer begins.

answer_request() is called with an invalid edns packet size provided by
the client.  Ensure the udp_size provided by the client is bounded by
512 and configured maximum as per RFC 6891 6.2.3 "Values lower than 512
MUST be treated as equal to 512"

The client that exposed the problem provided a payload udp size of 0.

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
Acked-by: Hans Dedecker <dedeckeh@gmail.com>
2017-08-31 13:57:02 +02:00
Kevin Darbyshire-Bryant
13e575c53c dnsmasq: bump to 2.77
Bump to the 2.77 release after quite a few test & release candidates.

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
2017-08-31 13:50:12 +02:00
Hans Dedecker
7680fc92b4 dnsmasq: bump to 2.77rc5
Some small tweaks and improvements :

9828ab1 Fix compiler warning.
f77700a Fix compiler warning.
0fbd980 Fix compiler warning.
43cdf1c Remove automatic IDN support when building i18n.
ff19b1a Fix &/&& confusion.
2aaea18 Add .gitattributes to substitute VERSION on export.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
2017-08-31 13:49:18 +02:00
Kevin Darbyshire-Bryant
d04efc7ee0 dnsmasq: make NO_ID optional in full variant
Permit users of the full variant to disable the NO_ID *.bind pseudo
domain masking.

Defaulted 'on' in all variants.

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
2017-08-31 13:48:22 +02:00
Kevin Darbyshire-Bryant
13fe03017f dnsmasq: Don't expose *.bind data incl version
Don't expose dnsmasq version & other data to clients via the *.bind
pseudo domain.  This uses a new 'NO_ID' compile time option which has been
discussed and submitted upstream.

This is an alternate to replacing version with 'unknown' which affects
the version reported to syslog and 'dnsmasq --version'

Run time tested with & without NO_ID on Archer C7 v2

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
2017-08-31 12:43:46 +02:00
Kevin Darbyshire-Bryant
f3d818571c dnsmasq: bump to 2.77rc3
Fix [FS#766] Intermittent SIGSEGV crash of dnsmasq-full

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
2017-08-31 12:40:49 +02:00
Kevin Darbyshire-Bryant
0c9e97b844 dnsmasq: bump to 2.77test5
A number of small tweaks & improvements on the way to a final release.
Most notable:

Improve DHCPv4 address-in-use check.
Remove the recently introduced RFC-6842 (Client-ids in DHCP replies)
support as it turns out some clients are getting upset.

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
2017-08-31 12:37:35 +02:00
Kevin Darbyshire-Bryant
fccbf91bf9 dnsmasq: bump to dnsmasq v2.77test4
--bogus-priv now applies to IPv6 prefixes as specified in RFC6303 - this
is significantly friendlier to upstream servers.

CNAME fix in auth mode - A domain can only have a CNAME if it has no
other records

Drop 2 patches now included upstream.

Compile & run tested Archer C7 v2

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
2017-08-31 12:36:33 +02:00
Kevin Darbyshire-Bryant
07c79e4b7c dnsmasq: bump to dnsmasq v2.77test3
New test release (since test1) includes 2 LEDE patches that are
upstream and may be dropped, along with many spelling fixes.

Add forthcoming 2017 root zone trust anchor to trust-anchors.conf.

Backport 2 patches that just missed test3:

Reduce logspam of those domains handled locally 'local addresses only'
Implement RFC-6842 (Client-ids in DHCP replies)

Compile & run tested Archer C7 v2

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
2017-08-31 12:35:12 +02:00
Kevin Darbyshire-Bryant
a1b00385a2 dnsmasq: update to dnsmasq 2.77test1
Bump to dnsmasq 2.77test1 - this includes a number of fixes since 2.76
and allows dropping of 2 LEDE carried patches.

Notable fix in rrfilter code when talking to Nominum's DNS servers
especially with DNSSEC.

A patch to switch dnsmasq back to 'soft fail' for SERVFAIL responses
from dns servers is also included.  This mean dnsmasq tries all
configured servers before giving up.

A 'localise queries' enhancement has also been backported (it will
appear in test2/rc'n') this is especially important if using the
recently imported to LEDE 'use dnsmasq standalone' feature 9525743c

I have been following dnsmasq HEAD ever since 2.76 release.
Compile & Run tested: ar71xx, Archer C7 v2

Tested-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
2017-08-31 12:32:32 +02:00
Hauke Mehrtens
84da27181f dnsmasq: Bump to dnsmasq2.75
Fixes a 100% cpu usage issue if using dhcp-script.

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2017-08-31 11:09:48 +02:00
Steven Barth
b3b8dacb3c dnsmasq: Bump to dnsmasq2.74
Bump to dnsmasq2.74 & refresh patches to fix fuzz

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
2017-08-31 11:09:05 +02:00
Jo-Philipp Wich
a13fbbf184 CC: dnsmasq: add some missing files to the jail
found with strace, not sure we got all of them though

Signed-off-by: Etienne CHAMPETIER <champetier.etienne@gmail.com>

Backport of r46467

git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46511 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-07-27 11:49:48 +00:00
Steven Barth
ef69a6857b Update dnsmasq to v2.73.
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>

git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@45987 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-06-15 08:00:46 +00:00
Steven Barth
82dc99d746 dnsmasq: bump to 2.73rc9
Signed-off-by: Steven Barth <steven@midlink.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45924 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-06-08 04:48:16 +00:00
Steven Barth
38bb294480 dnsmasq: fix config file typo
s/loclal/local/

Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45923 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-06-08 04:48:08 +00:00
Steven Barth
96bad91986 dnsmasq: bump to dnsmasq2.73rc8 Important.
Bump dnsmasq to v2.73rc8

Important - fixes remotely exploitable buffer overflow introduced in all v2.73 test/release candidates.

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45693 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-05-17 08:06:45 +00:00
Steven Barth
bdd9571ef2 dnsmasq: bump to 2.73rc7
Signed-off-by: Steven Barth <steven@midlink.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45587 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-04-29 07:19:24 +00:00
Steven Barth
264aa9886d dnsmasq: bump to 2.73rc6
Signed-off-by: Steven Barth <steven@midlink.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45572 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-04-23 13:05:15 +00:00
Steven Barth
3c6cc6fa06 dnsmasq: fix dnssec timestamp logic, backport crashfix
Signed-off-by: Steven Barth <steven@midlink.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45410 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-04-13 07:49:29 +00:00
Steven Barth
6bc333e002 dnsmasq: bump to 2.73rc4
Fix crash caused by malformed DNS requests
Improved DNSSEC handling

Signed-off-by: Steven Barth <steven@midlink.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45354 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-04-10 10:19:17 +00:00
John Crispin
c4c00fbfab dnsmasq: Add option '--servers-file'
The option '--servers-file' is available since dnsmasq v2.69.

Signed-off-by: Lars Kruse <lists@sumpfralle.de>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45332 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-04-09 10:32:46 +00:00
John Crispin
0a7a9c6a41 dnsmasq: backport --tftp-no-fail to ignore missing tftp root
This patch backports the option --tftp-no-fail to dnsmasq and prevents the
service from aborting if the specified TFTP root directory is not available;
this might be the case if TFTP files are located on external media that might
occasionally not be present at startup.

Signed-off-by: Stefan Tomanek <stefan.tomanek+openwrt@wertarbyte.de>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45213 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-04-01 08:33:10 +00:00
John Crispin
b325e5b071 dnsmasq: we dont want to run in debug mode
a left over from the dnsmasq jail testing

Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45058 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-03-27 09:11:56 +00:00
John Crispin
324ca9971e dnsmasq: add jail support
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45011 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-03-26 10:58:30 +00:00
John Crispin
0c0a9bb5f6 dnsmasq: enable pxe-prompt, pxe-service config options
DNSMASQ has the ability to provide a menu to a pxeboot system, using
the --pxe-prompt and --pxe-service configuration options.  The current
init.d script converting the "dhcp" file to "dnsmasq.conf" does not
find these options, but they are supported.  This patch thus enables
the options.

Signed-off-by: Derek LaHousse <dlahouss@mtu.edu>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44747 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-03-13 08:39:08 +00:00
John Crispin
b81c2b5c9e dnsmasq: Make parameters optional in dhcpboot config
The --dhcp-boot option of dnsmasq does not require servername and serveraddress
arguments if the builtin tftp server is used.

Signed-off-by: Stefan Tomanek <stefan.tomanek+openwrt@wertarbyte.de>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44744 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-03-13 08:38:35 +00:00
John Crispin
8f6963d065 dnsmasq: add option --quiet-dhcp
The --quiet-dhcp setting increases privacy by omitting DHCP lease logs including MAC addresses.

Signed-off-by: Lars Kruse <devel@sumpfralle.de>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44006 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-01-17 14:38:55 +00:00
Jo-Philipp Wich
7e0c58ce3d dnsmasq: support and use local-service by default (#14951)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43982 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-01-16 19:04:19 +00:00
Felix Fietkau
afdb4caec6 dnsmasq: fix dependency problems of the dnsmasq-full variant.
This patch tries to

 - Let the DHCPv6 feature depend on CONFIG_IPV6.
 - Conditionally select libnettle, kmod-ipv6, kmod-ipt-ipset only if the
   corresponding features are enabled.
 - Install `trust-anchors.conf` only if DNSSEC is selected.
 - Add PKG_CONFIG_DEPENDS for the configurable options.
 - Add a patch to let the Makefile of dnsmasq be aware of changes in
   COPTS variable.

Big thanks goes to Frank Schäfer <fschaefer.oss@googlemail.com> for
providing necessary information on connections and dependency relations
between these CONFIGs and packages.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43851 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-01-05 13:03:48 +00:00
Steven Barth
3c3d837c25 dnsmasq: also add the actual patches...
Signed-off-by: Steven Barth <steven@midlink.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43759 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-12-22 09:52:19 +00:00
Steven Barth
51bc47a9d4 dnsmasq: backport some dnssec fixes
Signed-off-by: Steven Barth <steven@midlink.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43758 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-12-22 09:51:22 +00:00
Steven Barth
9bc9764c57 dnsmasq: allow de-selecting features from -full variant.
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43733 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-12-17 05:59:12 +00:00
John Crispin
85c10a8a6a license info - revert r43155
turns out that r43155 adds duplicate info.

Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43167 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-11-03 09:56:44 +00:00
John Crispin
b8df8ca970 Add more license tags with SPDX identifiers
Note, that licensing stuff is a nightmare: many packages does not clearly
state their licenses, and often multiple source files are simply copied
together - each with different licensing information in the file headers.

I tried hard to ensure, that the license information extracted into the OpenWRT's
makefiles fit the "spirit" of the packages, e.g. such small packages which
come without a dedicated source archive "inherites" the OpenWRT's own license
in my opinion.

However, I can not garantee that I always picked the correct information
and/or did not miss license information.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43155 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-11-03 08:01:08 +00:00
Steven Barth
2bf2015c24 Add a few SPDX tags
Signed-off-by: Steven Barth <steven@midlink.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43151 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-11-02 12:20:54 +00:00
Steven Barth
992d1bbd8b dnsmasq: bump to 2.72
Signed-off-by: Steven Barth <steven@midlink.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42668 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-09-26 08:57:36 +00:00
Steven Barth
7050d8130b dnsmasq: fix lockup when interfaces disappear
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42648 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-09-22 12:07:20 +00:00
John Crispin
93a958ff11 dnsmasq: Make the --dhcp-host logic easier to understand
Use an if/else statement to cover the two different syntaxes.  Add
comments explaining what the end results should look like.

This patch should not change the script's output.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42320 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-08-28 06:27:57 +00:00
John Crispin
2abc3f33e5 dnsmasq: Fix hosts file format when MAC address is not specified
An entry like this in /etc/config/dhcp:

    config 'host'
        option 'name' 'pc2'
        option 'ip' '192.168.100.56'
        option 'dns' '1'

results in a /tmp/hosts/dhcp entry that looks like this:

    192.168.100.56 .lan

Obviously it should say "pc2.lan".

This happens because $name is set to "" in order to support the MAC-less
syntax: "--dhcp-host=lap,192.168.0.199".  Fix this by reordering the
operations.  Also, refuse to add a DNS entry if the hostname or IP is
missing.

Fixes #17683

Reported-by: Kostas Papadopoulos <kpapad75@travelguide.gr>
Signed-off-by: Kevin Cernekee <cernekee@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42319 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-08-28 06:27:53 +00:00
John Crispin
299986df60 dnsmasq: Create rDNS records for LuCI "Hostnames"
LuCI creates "domain" UCI config sections, which the dnsmasq init file
then, currently, translates into "address" config lines. This is not
the correct usage of "address" (see r36943), and also causes rDNS
records to not be created. This patches dnsmasq.init to utilize the
additional hosts file introduced in r40799 for such domain names,
resolving both issues.

Signed-off-by: Tyler Fenby <tylerf@securecominc.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42318 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-08-28 06:27:49 +00:00
Steven Barth
5401347fda dnsmasq: fix a race condition possibly leading to lockup
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42225 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-08-20 09:52:29 +00:00
Steven Barth
bb96082ca0 dnsmasq: respect option dhcpv4 disabled in dhcp-config
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42216 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-08-19 05:58:44 +00:00
Steven Barth
3b59de8bc7 dnsmasq: use config_get_bool for dnsmasq
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41302 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-22 15:34:36 +00:00
Steven Barth
5691e7e3ec dnsmasq: set procd respawn
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41297 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-22 09:08:14 +00:00
Steven Barth
f439aef6cd dnsmasq: removing nettle 3.0 support due to nettle downgrade
Signed-off-by: Steven Barth <steven@midlink.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41264 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-18 17:06:37 +00:00
Steven Barth
12b41b0c5f dnsmasq: compatibility with nettle 3.0
Signed-off-by: Steven Barth <steven@midlink.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41249 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-18 10:04:47 +00:00
Steven Barth
3d5f483474 dnsmasq: various house-keeping updates
* Add Authoritative DNS and IPSET to full variant
* Remove some bloat from IPSET support
* Reintroduce "DHCP no address warning"-patch

Signed-off-by: Steven Barth <steven@midlink.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41246 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-18 10:04:34 +00:00
Steven Barth
15646b2175 dnsmasq: add UCI DNSSEC runtime support
Ship keys for the root zone and add two uci options to enable
DNSSEC checks:

Option 'dnssec': Activate DNSSEC validation
Option 'dnsseccheckunsigned': Ensure answers without DNSSEC are in
unsigned zones.

Signed-off-by: Andre Heider <a.heider@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41245 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-18 10:04:29 +00:00