aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ0WI <J0WI@users.noreply.github.com>2020-09-01 03:40:01 +0200
committerJ0WI <J0WI@users.noreply.github.com>2020-09-01 16:07:47 +0200
commit5ce579e0032d7796c0a2b2bb1b8b71361499dab0 (patch)
tree8d722138f65289b7fc38f910dc7cdebbf5d6e178
parent1642ecb41c1a7a54357f39b2e0067c4f07aed129 (diff)
downloadaports-5ce579e0032d7796c0a2b2bb1b8b71361499dab0.tar.gz
aports-5ce579e0032d7796c0a2b2bb1b8b71361499dab0.tar.bz2
aports-5ce579e0032d7796c0a2b2bb1b8b71361499dab0.tar.xz
main/samba: security upgrade to 4.10.17
-rw-r--r--main/samba/APKBUILD11
-rw-r--r--main/samba/posix-bufferlen.patch172
2 files changed, 181 insertions, 2 deletions
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index 0b0e53804d..ced7cab719 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=samba
-pkgver=4.10.15
+pkgver=4.10.17
pkgrel=0
pkgdesc="Tools to access a server's filespace and printers via SMB"
url="https://www.samba.org/"
@@ -79,6 +79,7 @@ source="
bind-9.12.patch
missing-headers.patch
musl_rm_unistd_incl.patch
+ posix-bufferlen.patch
$pkgname.initd
$pkgname.confd
$pkgname.logrotate
@@ -87,6 +88,11 @@ pkggroups="winbind"
builddir="$srcdir/$pkgname-$pkgver"
# secfixes:
+# 4.10.17-r0:
+# - CVE-2020-10730
+# - CVE-2020-10745
+# - CVE-2020-10760
+# - CVE-2020-14303
# 4.10.15-r0:
# - CVE-2020-10700
# - CVE-2020-10704
@@ -577,7 +583,7 @@ libs() {
"$pkgdir"/usr
}
-sha512sums="2d900704b80987e44a07269ffcc1ef0df182a772bcc4ae33751f4ab64b9467fd1a617c7b5c3fee215830aedfb02e75a8327305ed32550bc0876460819195480e samba-4.10.15.tar.gz
+sha512sums="8674ddfd840ff30d6d30bec470c4c8e14cc534c993a134bfb14717574e019398a4f5f22784c50328919ff3d677c5a44ec692fbdcbe413b539a89caf5ddf78351 samba-4.10.17.tar.gz
0d4fd9862191554dc9c724cec0b94fd19afbfd0c4ed619e4c620c075e849cb3f3d44db1e5f119d890da23a3dd0068d9873703f3d86c47b91310521f37356208b getpwent_r.patch
a99e771f28d787dc22e832b97aa48a1c5e13ddc0c030c501a3c12819ff6e62800ef084b62930abe88c6767d785d5c37e2e9f18a4f9a24f2ee1f5d9650320c556 musl_uintptr.patch
1854577d0e4457e27da367a6c7ec0fb5cfd63cefea0a39181c9d6e78cf8d3eb50878cdddeea3daeec955d00263151c2f86ea754ff4276ef98bc52c0276d9ffe8 netdb-defines.patch
@@ -585,6 +591,7 @@ a99e771f28d787dc22e832b97aa48a1c5e13ddc0c030c501a3c12819ff6e62800ef084b62930abe8
27f12c8395be25d9806d232cc30334f2f7c7d175971d2d1944dd886d699e0381a6f222c17e3d7bc087cf7a29bfb3e98cf25ba98f414c4afe0297b9d134a28bd8 bind-9.12.patch
c0afe8b1dfddc5290c9aa611163d20adc3a546f54bba0081f739cda4255829f1a72bae422b6cb049aca82e58d4daf63ad5553f4c5c51671019bfbbc2781460f0 missing-headers.patch
5cda0a07089b99d99f33de74aae89a338954451167f72a9972cc437a7d06d92590c07386fd24e94c72ff34f1dd42494c5d7fcb48ca1823affa8168e83c239067 musl_rm_unistd_incl.patch
+2064c8b2314adb8ac1fbbea4a122b9dfc19468b039d9af8f948c641878f355a45e10370db4e8025acef6a4619d78c726bbbb3cedd23b3c75adc81c2fbd3bc4f1 posix-bufferlen.patch
96070e2461370437f48571e7de550c13a332fef869480cfe92e7cac73a998f6c2ee85d2580df58211953bebd0e577691aa710c8edddf3ea0f30e9d47d0a2fd44 samba.initd
e2b49cb394e758447ca97de155a61b4276499983a0a5c00b44ae621c5559b759a766f8d1c8d3ee98ad5560f4064a847a7a20cfa2e14f85c061bec8b80fd649eb samba.confd
3458a4e1f8a8b44c966afb339b2dca51615be049f594c14911fc4d8203623deee416b6fe881436e246fc7d49c97a2b3bf9c5f33ba774302b24190a1103d6b67d samba.logrotate"
diff --git a/main/samba/posix-bufferlen.patch b/main/samba/posix-bufferlen.patch
new file mode 100644
index 0000000000..49c809b7e2
--- /dev/null
+++ b/main/samba/posix-bufferlen.patch
@@ -0,0 +1,172 @@
+From 42ad8c2c4805b825317b8944df1c3cf1c2c3c2cc Mon Sep 17 00:00:00 2001
+From: Martin Schwenke <martin@meltin.net>
+Date: Tue, 9 Jun 2020 11:52:50 +1000
+Subject: [PATCH] util: Simplify input validation
+
+It appears that snprintf(3) is being used for input validation.
+However, this seems like overkill because it causes szPath to be
+copied an extra time. The mostly likely protections being sought
+here, according to https://cwe.mitre.org/data/definitions/20.html,
+look to be DoS attacks involving CPU and memory usage. A simpler
+check that uses strnlen(3) can mitigate against both of these and is
+simpler.
+
+Signed-off-by: Martin Schwenke <martin@meltin.net>
+Reviewed-by: Volker Lendecke <vl@samba.org>
+Reviewed-by: Bjoern Jacke <bjacke@samba.org>
+(cherry picked from commit 922bce2668994dd2a5988c17060f977e9bb0c229)
+---
+ lib/util/util_paths.c | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/lib/util/util_paths.c b/lib/util/util_paths.c
+index c0ee5c32c30..dec91772d9e 100644
+--- a/lib/util/util_paths.c
++++ b/lib/util/util_paths.c
+@@ -69,21 +69,20 @@ static char *get_user_home_dir(TALLOC_CTX *mem_ctx)
+ struct passwd pwd = {0};
+ struct passwd *pwdbuf = NULL;
+ char buf[NSS_BUFLEN_PASSWD] = {0};
++ size_t len;
+ int rc;
+
+ rc = getpwuid_r(getuid(), &pwd, buf, NSS_BUFLEN_PASSWD, &pwdbuf);
+ if (rc != 0 || pwdbuf == NULL ) {
+- int len_written;
+ const char *szPath = getenv("HOME");
+ if (szPath == NULL) {
+ return NULL;
+ }
+- len_written = snprintf(buf, sizeof(buf), "%s", szPath);
+- if (len_written >= sizeof(buf) || len_written < 0) {
+- /* Output was truncated or an error. */
++ len = strnlen(szPath, PATH_MAX);
++ if (len >= PATH_MAX) {
+ return NULL;
+ }
+- return talloc_strdup(mem_ctx, buf);
++ return talloc_strdup(mem_ctx, szPath);
+ }
+
+ return talloc_strdup(mem_ctx, pwd.pw_dir);
+--
+GitLab
+
+From 581b581700c967d38bcbb8d81767a7dfdfe68147 Mon Sep 17 00:00:00 2001
+From: Martin Schwenke <martin@meltin.net>
+Date: Fri, 5 Jun 2020 21:52:23 +1000
+Subject: [PATCH] util: Fix build on FreeBSD by avoiding NSS_BUFLEN_PASSWD
+
+NSS_BUFLEN_PASSWD is not defined on FreeBSD. Use
+sysconf(_SC_GETPW_R_SIZE_MAX) instead, as per POSIX.
+
+Use a dynamically allocated buffer instead of trying to cram all of
+the logic into the declarations. This will come in useful later
+anyway.
+
+Signed-off-by: Martin Schwenke <martin@meltin.net>
+Reviewed-by: Volker Lendecke <vl@samba.org>
+Reviewed-by: Bjoern Jacke <bjacke@samba.org>
+(cherry picked from commit 847208cd8ac68c4c7d1dae63767820db1c69292b)
+---
+ lib/util/util_paths.c | 27 ++++++++++++++++++++++-----
+ 1 file changed, 22 insertions(+), 5 deletions(-)
+
+diff --git a/lib/util/util_paths.c b/lib/util/util_paths.c
+index dec91772d9e..9bc6df37e5d 100644
+--- a/lib/util/util_paths.c
++++ b/lib/util/util_paths.c
+@@ -68,24 +68,41 @@ static char *get_user_home_dir(TALLOC_CTX *mem_ctx)
+ {
+ struct passwd pwd = {0};
+ struct passwd *pwdbuf = NULL;
+- char buf[NSS_BUFLEN_PASSWD] = {0};
++ char *buf = NULL;
++ char *out = NULL;
++ long int initlen;
+ size_t len;
+ int rc;
+
+- rc = getpwuid_r(getuid(), &pwd, buf, NSS_BUFLEN_PASSWD, &pwdbuf);
++ initlen = sysconf(_SC_GETPW_R_SIZE_MAX);
++ if (initlen == -1) {
++ len = 1024;
++ } else {
++ len = (size_t)initlen;
++ }
++ buf = talloc_size(mem_ctx, len);
++ if (buf == NULL) {
++ return NULL;
++ }
++
++ rc = getpwuid_r(getuid(), &pwd, buf, len, &pwdbuf);
+ if (rc != 0 || pwdbuf == NULL ) {
+ const char *szPath = getenv("HOME");
+ if (szPath == NULL) {
+- return NULL;
++ goto done;
+ }
+ len = strnlen(szPath, PATH_MAX);
+ if (len >= PATH_MAX) {
+ return NULL;
+ }
+- return talloc_strdup(mem_ctx, szPath);
++ out = talloc_strdup(mem_ctx, szPath);
++ goto done;
+ }
+
+- return talloc_strdup(mem_ctx, pwd.pw_dir);
++ out = talloc_strdup(mem_ctx, pwd.pw_dir);
++done:
++ TALLOC_FREE(buf);
++ return out;
+ }
+
+ char *path_expand_tilde(TALLOC_CTX *mem_ctx, const char *d)
+--
+GitLab
+
+From 8cffe254eda6c7ae843d79610eacb9a1020ef01a Mon Sep 17 00:00:00 2001
+From: Martin Schwenke <martin@meltin.net>
+Date: Fri, 5 Jun 2020 22:05:42 +1000
+Subject: [PATCH] util: Reallocate larger buffer if getpwuid_r() returns ERANGE
+
+Signed-off-by: Martin Schwenke <martin@meltin.net>
+Reviewed-by: Volker Lendecke <vl@samba.org>
+Reviewed-by: Bjoern Jacke <bjacke@samba.org>
+
+Autobuild-User(master): Martin Schwenke <martins@samba.org>
+Autobuild-Date(master): Tue Jun 9 21:07:24 UTC 2020 on sn-devel-184
+
+(cherry picked from commit ddac6b2eb4adaec8fc5e25ca07387d2b9417764c)
+---
+ lib/util/util_paths.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/lib/util/util_paths.c b/lib/util/util_paths.c
+index 9bc6df37e5d..72cc0aab8de 100644
+--- a/lib/util/util_paths.c
++++ b/lib/util/util_paths.c
+@@ -86,6 +86,19 @@ static char *get_user_home_dir(TALLOC_CTX *mem_ctx)
+ }
+
+ rc = getpwuid_r(getuid(), &pwd, buf, len, &pwdbuf);
++ while (rc == ERANGE) {
++ size_t newlen = 2 * len;
++ if (newlen < len) {
++ /* Overflow */
++ goto done;
++ }
++ len = newlen;
++ buf = talloc_realloc_size(mem_ctx, buf, len);
++ if (buf == NULL) {
++ goto done;
++ }
++ rc = getpwuid_r(getuid(), &pwd, buf, len, &pwdbuf);
++ }
+ if (rc != 0 || pwdbuf == NULL ) {
+ const char *szPath = getenv("HOME");
+ if (szPath == NULL) {
+--
+GitLab
+