aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2015-07-26 11:37:13 +0300
committerTimo Teräs <timo.teras@iki.fi>2015-07-26 11:37:32 +0300
commitb058a6d0c9137d23fbba5a6e1c195b9dcd682f55 (patch)
tree46427c9b1ad2133672533bd41dec6d48d9feaaa9
parentdde93838a0b847a99df574c6c47f70c379b652dc (diff)
downloadaports-b058a6d0c9137d23fbba5a6e1c195b9dcd682f55.tar.bz2
aports-b058a6d0c9137d23fbba5a6e1c195b9dcd682f55.tar.xz
main/strongswan: fix invalid read in internal printf
-rw-r--r--main/strongswan/1006-fix-printf-strlen.patch21
-rw-r--r--main/strongswan/APKBUILD6
2 files changed, 26 insertions, 1 deletions
diff --git a/main/strongswan/1006-fix-printf-strlen.patch b/main/strongswan/1006-fix-printf-strlen.patch
new file mode 100644
index 0000000000..ad5948d24a
--- /dev/null
+++ b/main/strongswan/1006-fix-printf-strlen.patch
@@ -0,0 +1,21 @@
+diff --git a/src/libstrongswan/utils/printf_hook/printf_hook_builtin.c b/src/libstrongswan/utils/printf_hook/printf_hook_builtin.c
+index 466c673..219c7bd 100644
+--- a/src/libstrongswan/utils/printf_hook/printf_hook_builtin.c
++++ b/src/libstrongswan/utils/printf_hook/printf_hook_builtin.c
+@@ -843,14 +843,14 @@ int builtin_vsnprintf(char *buffer, size_t n, const char *format, va_list ap)
+ /* String */
+ sarg = va_arg(ap, const char *);
+ sarg = sarg ? sarg : "(null)";
+- slen = strlen(sarg);
++ slen = prec ? strnlen(sarg, prec) : strlen(sarg);
+ goto is_string;
+ }
+ case 'm':
+ {
+ /* glibc error string */
+ sarg = strerror(errno);
+- slen = strlen(sarg);
++ slen = prec ? strnlen(sarg, prec) : strlen(sarg);
+ goto is_string;
+ }
+ is_string:
diff --git a/main/strongswan/APKBUILD b/main/strongswan/APKBUILD
index 82066ab1e5..965fd3c17a 100644
--- a/main/strongswan/APKBUILD
+++ b/main/strongswan/APKBUILD
@@ -3,7 +3,7 @@
pkgname=strongswan
pkgver=5.3.2
_pkgver=${pkgver//_rc/rc}
-pkgrel=5
+pkgrel=6
pkgdesc="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE"
url="http://www.strongswan.org/"
arch="all"
@@ -26,6 +26,7 @@ source="http://download.strongswan.org/$pkgname-$_pkgver.tar.bz2
1003-vici-add-support-rekeying-events-and-individual-sa-s.patch
1004-vici-support-asynchronous-initiation.patch
1005-ikev1-message-priorities.patch
+ 1006-fix-printf-strlen.patch
2001-support-gre-key-in-ikev1.patch
strongswan.initd
@@ -120,6 +121,7 @@ b7244e10364e6348665048b9eec43cc6 1001-charon-add-optional-source-and-remote-ove
89f7d85291d6a82230e5337cfa071a67 1003-vici-add-support-rekeying-events-and-individual-sa-s.patch
aac217481a1a8ae68719771039c27354 1004-vici-support-asynchronous-initiation.patch
3accc4500255622cb14844e7111e2932 1005-ikev1-message-priorities.patch
+9b6175216c1761305f2048d9d88865a0 1006-fix-printf-strlen.patch
b9f874287c35cce075b761087c28ab50 2001-support-gre-key-in-ikev1.patch
85ebc1b6c6b9c0c6640d8136e97da8e1 strongswan.initd
7962a720ebef6892d80a3cbdab72c204 charon.initd"
@@ -134,6 +136,7 @@ baa8ee13f207f5e89b34b759c355e48ed79138fabcd9af841692afb15cf8b61f 1002-vici-send
e0de13d4fc6d66e33973696d62b4a45cd63b5fa6c477891e7651102c2bc3a4d7 1003-vici-add-support-rekeying-events-and-individual-sa-s.patch
295476ace69d36f1059c48afb99ec5180086710146a6e10c28c7eed96759a976 1004-vici-support-asynchronous-initiation.patch
0e814067bf47e9b4a0127b5197ea321e1398b1bc8e0635d576898fc977233d67 1005-ikev1-message-priorities.patch
+2b5d384a73373e16dc8bf75e55149173de00f454fe0de1b65296e73e68275042 1006-fix-printf-strlen.patch
ec58de15c3856a2fd9ea003b7e78a7434dad54f9a4c54d499b09a6eef3761d18 2001-support-gre-key-in-ikev1.patch
ad43d1ed2585d84e12ad1e67fbdfe93983c424c5c64b230d5027c0aae496c65f strongswan.initd
97b018796f0f15106b70694449cff36e8fc586292aab09ef83a05c0c13142e73 charon.initd"
@@ -148,6 +151,7 @@ ee5dc2d2c719895e69d9a0324b48d43b4b86122eb8848143db7a4a629e79d594deeb4a000a429c85
1781b8de169d0d41f8cb4d63c0b85b1e9eae2d52935d3753a876e8fee542ab58933be11c36f2a230233144c94c12c1d7641dbb58c89481e27d889e7f17fad87e 1003-vici-add-support-rekeying-events-and-individual-sa-s.patch
aaf0701a4564fdce9d4422e8c33ea704142e371392cb7fa552cf0c71cb00d0dbd5901c21e45fadc23798cfdb95066da9d24b2f2b9b037761e670ee30f4b93b35 1004-vici-support-asynchronous-initiation.patch
bd4c9575d2aebbae48d49ef5e3fcfa0c0366c8d100a0190706b5fff7332ab34ca5f862ba8a3fe9cdcf9996371b554ab0f6561e16d57d6e425497ab015e46299a 1005-ikev1-message-priorities.patch
+dd9d873d63ae9ed47bc61b122e33be406498ca707c53560c704b87b986904f1fbfe6f293df6a6f79a0359ff9b3686fcf26e91624eb73d8139b4afe1bd26f7798 1006-fix-printf-strlen.patch
723aad9269ae7da54b1d551b290c80951c3b779737353fa845c00d190c9ef6c6bc406d8ed22254a27844985b7ffaa12b99acce91ec0b192caf639c81b06bf771 2001-support-gre-key-in-ikev1.patch
b56008c07b804dacb3441d3802880058986ab7b314297fe485649a771861885b9232f9fd53b94faa3388a5e9330e2b38a86af5c04f3ff119199720043967ec64 strongswan.initd
6f3abaaa8da0925f06cdd184fdf534518e40c49533dba427dbf31dbe88172e5626bdc9aadf798d791f82fbded08801c1f565d514e2c289e1f28448d0c2e72b79 charon.initd"