Christian Heusel pushed to branch main at Arch Linux / Packaging / Packages / sslh
Commits: 3c411803 by Christian Heusel at 2024-05-06T16:31:09+02:00 upgpkg: 2.1.1-3: fix buffer overflow issue related to https://gitlab.archlinux.org/archlinux/packaging/packages/sslh/-/issues/2 - - - - - 3 changed files: - .SRCINFO - PKGBUILD - + sslh-2_1_2-fix-buffer-len.patch Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = sslh pkgdesc = SSL/SSH/OpenVPN/XMPP/tinc port multiplexer pkgver = 2.1.1 - pkgrel = 2 + pkgrel = 3 url = https://www.rutschle.net/tech/sslh/README.html install = sslh.install arch = x86_64 @@ -17,6 +17,7 @@ pkgbase = sslh backup = etc/sslh.cfg source = https://www.rutschle.net/tech/sslh/sslh-v2.1.1.tar.gz source = https://www.rutschle.net/tech/sslh/sslh-v2.1.1.tar.gz.asc + source = sslh-2_1_2-fix-buffer-len.patch source = sslh.cfg source = sslh.service source = sslh-select.service @@ -25,6 +26,7 @@ pkgbase = sslh validpgpkeys = CDDDBADBEA4B72748E007D326C056F7AC7934136 sha256sums = 0ad3526e072d0f0d4f77ddcdbade4bf315ebd45d468848fd3367996f414d06d7 sha256sums = SKIP + sha256sums = ea508d01c1f5256727b7f7514ba73ef63c33b9f296ee6f65e5ba64506d8fb071 sha256sums = 7db2e873ed4c8770e3c38d7ac3ced94221356a3ceafa9d6c8cdc65dd8f09a18e sha256sums = 3d084889cb671df22382767d181e25f1c0a0d63b6937cadb550af0153c488c74 sha256sums = 42182146dfe6ca99c5e07e1009f017567a276c504308ed39ecc05b304f28f107 ===================================== PKGBUILD ===================================== @@ -4,7 +4,7 @@ pkgname=sslh pkgver=2.1.1 -pkgrel=2 +pkgrel=3 pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer' arch=('x86_64') url='https://www.rutschle.net/tech/sslh/README.html' @@ -14,6 +14,7 @@ depends=('glibc' 'libcap' 'libconfig' 'pcre2' 'systemd-libs' 'libev' 'libbsd') backup=('etc/sslh.cfg') install=$pkgname.install source=("https://www.rutschle.net/tech/sslh/$pkgname-v$pkgver.tar.gz"{,.asc} + "sslh-2_1_2-fix-buffer-len.patch" 'sslh.cfg' 'sslh.service' 'sslh-select.service' @@ -22,6 +23,7 @@ source=("https://www.rutschle.net/tech/sslh/$pkgname-v$pkgver.tar.gz"{,.asc} validpgpkeys=('CDDDBADBEA4B72748E007D326C056F7AC7934136') # Yves Rutschle <y...@rutschle.net> sha256sums=('0ad3526e072d0f0d4f77ddcdbade4bf315ebd45d468848fd3367996f414d06d7' 'SKIP' + 'ea508d01c1f5256727b7f7514ba73ef63c33b9f296ee6f65e5ba64506d8fb071' '7db2e873ed4c8770e3c38d7ac3ced94221356a3ceafa9d6c8cdc65dd8f09a18e' '3d084889cb671df22382767d181e25f1c0a0d63b6937cadb550af0153c488c74' '42182146dfe6ca99c5e07e1009f017567a276c504308ed39ecc05b304f28f107' ===================================== sslh-2_1_2-fix-buffer-len.patch ===================================== @@ -0,0 +1,13 @@ +diff --git a/systemd-sslh-generator.c b/systemd-sslh-generator.c +index 640e7cf..6442873 100644 +--- a/systemd-sslh-generator.c ++++ b/systemd-sslh-generator.c +@@ -57,7 +57,7 @@ static int get_listen_from_conf(const char *filename, char **listen[]) { + } else { + char *resolved_listen = resolve_listen(hostname, port); + +- (*listen)[i] = malloc(strlen(resolved_listen)); ++ (*listen)[i] = malloc(strlen(resolved_listen)+1); + CHECK_ALLOC((*listen)[i], "malloc"); + strcpy((*listen)[i], resolved_listen); + free(resolved_listen); View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/sslh/-/commit/3c4118034a636cdef7008cc442c041baee961b32 -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/sslh/-/commit/3c4118034a636cdef7008cc442c041baee961b32 You're receiving this email because of your account on gitlab.archlinux.org.
