diff options
| author | taca <taca@pkgsrc.org> | 2012-05-01 02:47:52 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2012-05-01 02:47:52 +0000 |
| commit | 46c787c34620caa1512679581ef172cd83540152 (patch) | |
| tree | c6fd19847043a3af6f66b01367906f744b781e65 /net/bind97 | |
| parent | 1bcba581666203b69b0a2cf537155068fb0cf4bb (diff) | |
| download | pkgsrc-46c787c34620caa1512679581ef172cd83540152.tar.gz | |
Add fix to a race condition in the resolver code that can cause a recursive
nameserver: <https://kb.isc.org/article/AA-00664>.
Bump PKGREVISION.
Diffstat (limited to 'net/bind97')
| -rw-r--r-- | net/bind97/Makefile | 3 | ||||
| -rw-r--r-- | net/bind97/distinfo | 3 | ||||
| -rw-r--r-- | net/bind97/patches/patch-lib_dns_resolver.c | 34 |
3 files changed, 38 insertions, 2 deletions
diff --git a/net/bind97/Makefile b/net/bind97/Makefile index 0d3e9c95cde..9ebbbf31075 100644 --- a/net/bind97/Makefile +++ b/net/bind97/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2012/04/05 00:40:09 taca Exp $ +# $NetBSD: Makefile,v 1.13 2012/05/01 02:48:58 taca Exp $ DISTNAME= bind-${BIND_VERSION} PKGNAME= ${DISTNAME:S/-P/pl/} +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ \ http://ftp.belnet.be/pub/mirror/ftp.isc.org/isc/bind9/${BIND_VERSION}/ diff --git a/net/bind97/distinfo b/net/bind97/distinfo index 0a6b73df457..748ae36354a 100644 --- a/net/bind97/distinfo +++ b/net/bind97/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2012/04/05 00:40:09 taca Exp $ +$NetBSD: distinfo,v 1.12 2012/05/01 02:48:58 taca Exp $ SHA1 (bind-9.7.5.tar.gz) = d66705bb898340de88653892a75e0038c3dec86e RMD160 (bind-9.7.5.tar.gz) = 0186557e4d20b06c45939988b47dbf2cf600ae9b @@ -8,3 +8,4 @@ SHA1 (patch-ab) = 9585a26a376d32f80ac8266eb7967c00b433f14d SHA1 (patch-ac) = ee4ca3d200b3d3f93b8ccfa2c6e51ab005b35a01 SHA1 (patch-ad) = 29fb5c24ff3558f1621e93ea16419e32dbc695b7 SHA1 (patch-ae) = 68b8155daa8f75081b6f8fd70ca23fda60506c64 +SHA1 (patch-lib_dns_resolver.c) = 1c0bc26a159219f65dc59429d395f7796a5165f6 diff --git a/net/bind97/patches/patch-lib_dns_resolver.c b/net/bind97/patches/patch-lib_dns_resolver.c new file mode 100644 index 00000000000..6bae806b32a --- /dev/null +++ b/net/bind97/patches/patch-lib_dns_resolver.c @@ -0,0 +1,34 @@ +$NetBSD: patch-lib_dns_resolver.c,v 1.1 2012/05/01 02:48:58 taca Exp $ + +Prevent segmentation fault in resolver.c: https://kb.isc.org/article/AA-00664 + +--- lib/dns/resolver.c.orig 2012-03-22 19:14:04.000000000 +0000 ++++ lib/dns/resolver.c +@@ -2157,7 +2157,6 @@ fctx_finddone(isc_task_t *task, isc_even + isc_boolean_t want_try = ISC_FALSE; + isc_boolean_t want_done = ISC_FALSE; + isc_boolean_t bucket_empty = ISC_FALSE; +- isc_boolean_t destroy = ISC_FALSE; + unsigned int bucketnum; + + find = event->ev_sender; +@@ -2196,17 +2195,12 @@ fctx_finddone(isc_task_t *task, isc_even + } + } else if (SHUTTINGDOWN(fctx) && fctx->pending == 0 && + fctx->nqueries == 0 && ISC_LIST_EMPTY(fctx->validators)) { +- /* +- * Note that we had to wait until we had the lock before +- * looking at fctx->references. +- */ ++ + if (fctx->references == 0) +- destroy = ISC_TRUE; ++ bucket_empty = fctx_destroy(fctx); + } + UNLOCK(&res->buckets[bucketnum].lock); + +- if (destroy) +- bucket_empty = fctx_destroy(fctx); + isc_event_free(&event); + dns_adb_destroyfind(&find); + |