diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-08-09 04:41:24 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-08-09 04:41:24 +0000 |
| commit | dc2e6f35570e16e73479bfe5fc6d6c8156d8528c (patch) | |
| tree | 3410488a6f1dedd5d3557a24187d2713a466a301 | |
| parent | 529a6037918c01d1eb282d1ab3445e25be2de67d (diff) | |
| download | packages-dc2e6f35570e16e73479bfe5fc6d6c8156d8528c.tar.gz packages-dc2e6f35570e16e73479bfe5fc6d6c8156d8528c.tar.bz2 packages-dc2e6f35570e16e73479bfe5fc6d6c8156d8528c.tar.xz packages-dc2e6f35570e16e73479bfe5fc6d6c8156d8528c.zip | |
user/c-ares: fix segfault with .onion TLD
| -rw-r--r-- | user/c-ares/APKBUILD | 12 | ||||
| -rw-r--r-- | user/c-ares/onion-segfault.patch | 36 |
2 files changed, 42 insertions, 6 deletions
diff --git a/user/c-ares/APKBUILD b/user/c-ares/APKBUILD index 5b33772a3..8b9cc81ee 100644 --- a/user/c-ares/APKBUILD +++ b/user/c-ares/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=c-ares pkgver=1.15.0 -pkgrel=0 +pkgrel=1 pkgdesc="Asynchronous DNS/name resolver library" url="https://c-ares.haxx.se/" arch="all" @@ -11,10 +11,11 @@ license="MIT" depends="" makedepends="" subpackages="$pkgname-doc $pkgname-dev" -source="https://c-ares.haxx.se/download/$pkgname-$pkgver.tar.gz" +source="https://c-ares.haxx.se/download/$pkgname-$pkgver.tar.gz + onion-segfault.patch + " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,13 +27,12 @@ build() { } check() { - cd "$builddir" make -C test check } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install } -sha512sums="a1de6c5e7e1a6a13c926aae690e83d5caa51e7313d63da1cf2af6bc757c41d585aad5466bc3ba7b7f7793cb1748fa589f40972b196728851c8b059cfc8c3be50 c-ares-1.15.0.tar.gz" +sha512sums="a1de6c5e7e1a6a13c926aae690e83d5caa51e7313d63da1cf2af6bc757c41d585aad5466bc3ba7b7f7793cb1748fa589f40972b196728851c8b059cfc8c3be50 c-ares-1.15.0.tar.gz +f26d4e981afc87fe734893d91210f1d5cbdf841d7704acf41a964991ab669fffd0ffd661c24be84d67edc9e1d6804214e6e7188e77f6555c01c9ad8165f6fbfa onion-segfault.patch" diff --git a/user/c-ares/onion-segfault.patch b/user/c-ares/onion-segfault.patch new file mode 100644 index 000000000..7e5a712cd --- /dev/null +++ b/user/c-ares/onion-segfault.patch @@ -0,0 +1,36 @@ +From 43a915a1b741b7c5bad2f622de90f353cdae7694 Mon Sep 17 00:00:00 2001 +From: Khaidi Chu <i@2333.moe> +Date: Mon, 4 Feb 2019 10:38:07 +0800 +Subject: [PATCH] fix: init bufp before reject .onion to make it can be free + correctly (#241) + +When querying a .onion domain, it returns directly without setting bufp to NULL. A subsequent free() that occurs can cause a segmentation fault. + +Fix By: Khaidi Chu (@XadillaX) +--- + ares_create_query.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/ares_create_query.c b/ares_create_query.c +index 1606b1a1..9efce17c 100644 +--- a/ares_create_query.c ++++ b/ares_create_query.c +@@ -94,14 +94,14 @@ int ares_create_query(const char *name, int dnsclass, int type, + size_t buflen; + unsigned char *buf; + +- /* Per RFC 7686, reject queries for ".onion" domain names with NXDOMAIN. */ +- if (ares__is_onion_domain(name)) +- return ARES_ENOTFOUND; +- + /* Set our results early, in case we bail out early with an error. */ + *buflenp = 0; + *bufp = NULL; + ++ /* Per RFC 7686, reject queries for ".onion" domain names with NXDOMAIN. */ ++ if (ares__is_onion_domain(name)) ++ return ARES_ENOTFOUND; ++ + /* Allocate a memory area for the maximum size this packet might need. +2 + * is for the length byte and zero termination if no dots or ecscaping is + * used. |