diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2018-08-01 07:22:00 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2018-08-01 07:22:00 +0000 |
| commit | bc87f726a7390f8442b3f76f979840a249d08972 (patch) | |
| tree | a7bee070be059d27b2f102b6919c0389c0d21b27 | |
| parent | 2ef5366ea150211a50e41df95f19a25958f26745 (diff) | |
| download | aports-bc87f726a7390f8442b3f76f979840a249d08972.tar.bz2 aports-bc87f726a7390f8442b3f76f979840a249d08972.tar.xz | |
main/kamailio: security fix
https://skalatan.de/blog/advisory-hw-2018-05
| -rw-r--r-- | main/kamailio/APKBUILD | 6 | ||||
| -rw-r--r-- | main/kamailio/core-improve-to-header-check-guards.patch | 32 |
2 files changed, 37 insertions, 1 deletions
diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD index 145adc8bea..2f47752cf6 100644 --- a/main/kamailio/APKBUILD +++ b/main/kamailio/APKBUILD @@ -13,7 +13,7 @@ _gittag=HEAD pkgver=4.2.7 -pkgrel=3 +pkgrel=4 [ -z "${_gitcommit}" ] && _suffix="_src" || _suffix="-${_gitcommit}" pkgdesc="Open Source SIP Server" @@ -229,6 +229,7 @@ source="http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}${_su DMQ-multi-notify.patch 0002-mohqueue-v0-13.patch 0003-mtree-fixes.patch + core-improve-to-header-check-guards.patch default_ctl.patch kamctl_build.patch CVE-2016-2385.patch @@ -501,6 +502,7 @@ e9c0ba8192a1a4f2a08a2e2add20e3d7 kamailio-4.2-ipops-srv-query.patch 7df723eb9e14df28adfff8643d99a1a9 DMQ-multi-notify.patch 33dea6379cce71f5443258ec96950070 0002-mohqueue-v0-13.patch 4a9cdcd75e41d996202da49fa027324b 0003-mtree-fixes.patch +7e4ec3df07c11701dee9277a5598ed8c core-improve-to-header-check-guards.patch 841fa62c432c5d8aeb57ad70d2ec3030 default_ctl.patch d0052e6054884b9cec955af4480c7c85 kamctl_build.patch 38282b05e14c0aa1eb4b3d9689dd673a CVE-2016-2385.patch @@ -513,6 +515,7 @@ b98555ff304b51b82c6cf7e01d757b15ea4f05bd2e603c84d4384df6a6be62b6 0001-musl-fixe 384eeaa5b253228341dc7a74ec61314db4b8f2f1c9c2f3bdf9ba189d2d56911d DMQ-multi-notify.patch f8dc8ddafc24f9091e9cbb95f9699d18ff4e929d074ac8c152a1837e4c921c28 0002-mohqueue-v0-13.patch d788babf11149ea9650e156c6f7047ff202853d16d56ee330143986361e48c89 0003-mtree-fixes.patch +35777009ffeaffcec73beb25ffb28f1dcb2b192a16d0283e75671146e991accc core-improve-to-header-check-guards.patch 755efa4ad126c672bc67c53268260b57f7da1f454cdc1a1601778ed7c7d5f0e5 default_ctl.patch e00eefed792acbc1ee6eca8fa7389f9973bd53b68fa7abc573f19f1ff26812a1 kamctl_build.patch 3d8f1c5f22665f3add1b34bf81be0beda3e2e87623cfd1ffa3dd1e635a300e50 CVE-2016-2385.patch @@ -525,6 +528,7 @@ b5c048b6e06de0c7514c14d0ec99bbe939eaa956d9d9d3dd5f48b1bcbcff06dbd6498d384427253f 7ddf6444c15f7338e7aab779ea5b75f4fd936b51cf5d9ba0d09e813566e527f74e59e100661d2b27db99e5fa042614c83e8145e999a8b6bfcfab71c9595bb626 DMQ-multi-notify.patch 24fee56e5d8bb191ad42fc8ce71fb1bbb8137af4fcfd45cfe3a422ea525e4dfb50fdb76cda702b923cdc7743748204832c7caef29ef8b3a5096b1f0bcd118d29 0002-mohqueue-v0-13.patch c32d83b24d492c55423b1a94e209db1625b7a104852f181af8982ecff56b534f0dfd4b1bb9bc0361f8ecd1040ed4c3662a45ce2a38060322aad39bc80dd48444 0003-mtree-fixes.patch +4c199996bf848b2efdc6552bc48d576dd8c0f3cd0b8499f4f2e8a8695a1e7348c58828651ee971751876e97b06b358147ad0a807158d1c6af7e42770e2360a65 core-improve-to-header-check-guards.patch 2321d8afe29b53057ce21e0552dfb80fd6a0e7dc0caf3c4798a8b253518f4c8c546797302933373f4b055a4531329a36ee2d7117b0a88fe39cf153bfef91a656 default_ctl.patch 4c2c9bde3a4c44feca2863bb03cb031aa55e1c3df21dc7c0acb3a392c34cb36d9a132bcbdf451a0624f8ec202152f1cf238c89280c32f1c04312ce80427a18c6 kamctl_build.patch 9e5daf343bfaccc1519cfeb2f024e62811c022cc04541c7fb18e5b4d2d35a3fda51487dcb6bd0cdc14a112a92b0c58ecbc043ba59f3daf307bf7a2d5eef73ebb CVE-2016-2385.patch diff --git a/main/kamailio/core-improve-to-header-check-guards.patch b/main/kamailio/core-improve-to-header-check-guards.patch new file mode 100644 index 0000000000..543ed12222 --- /dev/null +++ b/main/kamailio/core-improve-to-header-check-guards.patch @@ -0,0 +1,32 @@ +From 281a6c6b6eaaf30058b603325e8ded20b99e1456 Mon Sep 17 00:00:00 2001 +From: Henning Westerholt <hw@kamailio.org> +Date: Mon, 7 May 2018 09:36:53 +0200 +Subject: [PATCH] core: improve to header check guards, str consists of length + and pointer + +--- + msg_translator.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c +index 22122768a1..4dd648e874 100644 +--- a/msg_translator.c ++++ b/msg_translator.c +@@ -2369,7 +2369,7 @@ char * build_res_buf_from_sip_req( unsigned int code, str *text ,str *new_tag, + case HDR_TO_T: + if (new_tag && new_tag->len) { + to_tag=get_to(msg)->tag_value; +- if ( to_tag.len || to_tag.s ) ++ if ( to_tag.len && to_tag.s ) + len+=new_tag->len-to_tag.len; + else + len+=new_tag->len+TOTAG_TOKEN_LEN/*";tag="*/; +@@ -2497,7 +2497,7 @@ char * build_res_buf_from_sip_req( unsigned int code, str *text ,str *new_tag, + break; + case HDR_TO_T: + if (new_tag && new_tag->len){ +- if (to_tag.s ) { /* replacement */ ++ if (to_tag.len && to_tag.s) { /* replacement */ + /* before to-tag */ + append_str( p, hdr->name.s, to_tag.s-hdr->name.s); + /* to tag replacement */ |