diff options
| author | Seonah Moon <seonah1.moon@samsung.com> | 2017-05-31 18:29:46 +0900 |
|---|---|---|
| committer | Seonah Moon <seonah1.moon@samsung.com> | 2017-05-31 18:29:51 +0900 |
| commit | 2efaee6c64a0e84e37614e4ff124dfaf1e1ab2b4 (patch) | |
| tree | c0a43275558484b4a51b2893e61b65acc575c04b /src | |
| parent | f154296ab918229843c6d9b30c9e52732704270e (diff) | |
| download | dnsmasq-2efaee6c64a0e84e37614e4ff124dfaf1e1ab2b4.tar.gz dnsmasq-2efaee6c64a0e84e37614e4ff124dfaf1e1ab2b4.tar.bz2 dnsmasq-2efaee6c64a0e84e37614e4ff124dfaf1e1ab2b4.zip | |
Fix crash when empty address from DNS overlays A record from hostssubmit/tizen/20170601.042236accepted/tizen/unified/20170602.154229
Upstream patch is backported to resolve CVE-2015-8899
http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=41a8d9e99be9f2cc8b02051dd322cb45e0faac87
Change-Id: I1024adcb4b563130a1656edcb1e093c2e28e8cea
Signed-off-by: Seonah Moon <seonah1.moon@samsung.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cache.c b/src/cache.c index 178d654..1b76b67 100644 --- a/src/cache.c +++ b/src/cache.c @@ -481,7 +481,7 @@ struct crec *cache_insert(char *name, struct all_addr *addr, existing record is for an A or AAAA and the record we're trying to insert is the same, just drop the insert, but don't error the whole process. */ - if ((flags & (F_IPV4 | F_IPV6)) && (flags & F_FORWARD)) + if ((flags & (F_IPV4 | F_IPV6)) && (flags & F_FORWARD) && addr) { if ((flags & F_IPV4) && (new->flags & F_IPV4) && new->addr.addr.addr.addr4.s_addr == addr->addr.addr4.s_addr) |