diff options
author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2017-10-02 15:28:32 +0100 |
---|---|---|
committer | Hans Dedecker <dedeckeh@gmail.com> | 2017-10-02 18:36:21 +0200 |
commit | 4b4a4af814e1602f7ef12c5d07ff15c4fa2570ca (patch) | |
tree | 2ea03d074a50ee69a1c915949e1f36b0dc3d6d97 /package/network/services/dnsmasq/patches/010-Tweak-ICMP-ping-check-logic-for-DHCPv4.patch | |
parent | b8357e87d7cbc73e19073b4b8cd749e46e6b7fc2 (diff) | |
download | upstream-4b4a4af814e1602f7ef12c5d07ff15c4fa2570ca.tar.gz upstream-4b4a4af814e1602f7ef12c5d07ff15c4fa2570ca.tar.bz2 upstream-4b4a4af814e1602f7ef12c5d07ff15c4fa2570ca.zip |
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 <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'package/network/services/dnsmasq/patches/010-Tweak-ICMP-ping-check-logic-for-DHCPv4.patch')
-rw-r--r-- | package/network/services/dnsmasq/patches/010-Tweak-ICMP-ping-check-logic-for-DHCPv4.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/package/network/services/dnsmasq/patches/010-Tweak-ICMP-ping-check-logic-for-DHCPv4.patch b/package/network/services/dnsmasq/patches/010-Tweak-ICMP-ping-check-logic-for-DHCPv4.patch deleted file mode 100644 index 571ff3683d..0000000000 --- a/package/network/services/dnsmasq/patches/010-Tweak-ICMP-ping-check-logic-for-DHCPv4.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4bb68866a8aeb31db8100492bceae051e33be5d0 Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon@thekelleys.org.uk> -Date: Thu, 15 Jun 2017 23:18:44 +0100 -Subject: [PATCH] Tweak ICMP ping check logic for DHCPv4. - ---- - src/rfc2131.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/rfc2131.c b/src/rfc2131.c -index 1c850e5..75792da 100644 ---- a/src/rfc2131.c -+++ b/src/rfc2131.c -@@ -1040,7 +1040,7 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index, - else if (have_config(config, CONFIG_DECLINED) && - difftime(now, config->decline_time) < (float)DECLINE_BACKOFF) - my_syslog(MS_DHCP | LOG_WARNING, _("not using configured address %s because it was previously declined"), addrs); -- else if (!do_icmp_ping(now, config->addr, 0, loopback)) -+ else if ((!lease || lease->addr.s_addr != config->addr.s_addr) && !do_icmp_ping(now, config->addr, 0, loopback)) - my_syslog(MS_DHCP | LOG_WARNING, _("not using configured address %s because it is in use by another host"), addrs); - else - conf = config->addr; --- -1.9.1 - |