diff options
| author |   florian <florian@openbsd.org> | 2016-09-03 13:09:25 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2016-09-03 13:09:25 +0000 |
| commit | 1345ce214d2433c5059a8d12ae06cd5a908772b9 (patch) | |
| tree | b8ecb3d87172040cbaa79bb3c47717bd402323b8 | |
| parent | proving once again my commit and somebody will test strategy works, (diff) | |
| download | wireguard-openbsd-1345ce214d2433c5059a8d12ae06cd5a908772b9.tar.xz wireguard-openbsd-1345ce214d2433c5059a8d12ae06cd5a908772b9.zip | |
Update to 4.1.12
-----------------------------------------------------------------
BUG FIXES:
- Fix malformed edns query assertion failure, reported by
Michal Kepien (NASK).
-----------------------------------------------------------------
Does not effect OpenBSD since we are not running configure with
--enable-checking
OK sthen@
| -rw-r--r-- | usr.sbin/nsd/configure.ac | 2 | ||||
| -rw-r--r-- | usr.sbin/nsd/edns.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/usr.sbin/nsd/configure.ac b/usr.sbin/nsd/configure.ac index da75edc073c..75a44c54fe6 100644 --- a/usr.sbin/nsd/configure.ac +++ b/usr.sbin/nsd/configure.ac @@ -4,7 +4,7 @@ dnl sinclude(acx_nlnetlabs.m4) -AC_INIT(NSD,4.1.11,nsd-bugs@nlnetlabs.nl) +AC_INIT(NSD,4.1.12,nsd-bugs@nlnetlabs.nl) AC_CONFIG_HEADER([config.h]) CFLAGS="$CFLAGS" diff --git a/usr.sbin/nsd/edns.c b/usr.sbin/nsd/edns.c index 57c2e6c6634..d37e624a716 100644 --- a/usr.sbin/nsd/edns.c +++ b/usr.sbin/nsd/edns.c @@ -95,6 +95,10 @@ edns_parse_record(edns_record_type *edns, buffer_type *packet) } if (opt_rdlen > 0) { + if(!buffer_available(packet, opt_rdlen)) + return 0; + if(opt_rdlen < 4) + return 0; /* there is more to come, read opt code * should be NSID - there are no others */ opt_nsid = buffer_read_u16(packet); |