diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2016-02-16 12:58:16 +0200 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2016-02-16 12:59:02 +0200 |
| commit | 18d31d958ffc644e9e604af822fec408e0894101 (patch) | |
| tree | 4858da240afaf31e09101a2b8279f73609721d37 | |
| parent | 46b05a3d895fd8eb4faba17d93e8812e5882188c (diff) | |
| download | aports-18d31d958ffc644e9e604af822fec408e0894101.tar.bz2 aports-18d31d958ffc644e9e604af822fec408e0894101.tar.xz | |
main/zoneminder: fix memcpy buffer overlap
| -rw-r--r-- | main/zoneminder/0001-zm_monitor-fix-overlap-in-memcpy-buffers.patch | 26 | ||||
| -rw-r--r-- | main/zoneminder/APKBUILD | 6 |
2 files changed, 31 insertions, 1 deletions
diff --git a/main/zoneminder/0001-zm_monitor-fix-overlap-in-memcpy-buffers.patch b/main/zoneminder/0001-zm_monitor-fix-overlap-in-memcpy-buffers.patch new file mode 100644 index 0000000000..5de984909b --- /dev/null +++ b/main/zoneminder/0001-zm_monitor-fix-overlap-in-memcpy-buffers.patch @@ -0,0 +1,26 @@ +From 6332f28c5364c3f7b8cd6797c335041a9293ec77 Mon Sep 17 00:00:00 2001 +From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> +Date: Tue, 16 Feb 2016 11:47:49 +0200 +Subject: [PATCH] zm_monitor: fix overlap in memcpy buffers + +behavior undefined by POSIX and causes a crash with FORTIFY_SOURCE +--- + src/zm_monitor.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp +index 20b8b78..e674879 100644 +--- a/src/zm_monitor.cpp ++++ b/src/zm_monitor.cpp +@@ -3981,7 +3981,7 @@ void MonitorStream::processCommand( const CmdMsg *msg ) + + DataMsg status_msg; + status_msg.msg_type = MSG_DATA_WATCH; +- memcpy( &status_msg.msg_data, &status_data, sizeof(status_msg.msg_data) ); ++ memcpy( &status_msg.msg_data, &status_data, sizeof(status_data) ); + int nbytes = 0; + if ( (nbytes = sendto( sd, &status_msg, sizeof(status_msg), MSG_DONTWAIT, (sockaddr *)&rem_addr, sizeof(rem_addr) )) < 0 ) + { +-- +2.5.0 + diff --git a/main/zoneminder/APKBUILD b/main/zoneminder/APKBUILD index b74f0c8ee0..6d2ecfa23f 100644 --- a/main/zoneminder/APKBUILD +++ b/main/zoneminder/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> pkgname=zoneminder pkgver=1.29.0 -pkgrel=3 +pkgrel=4 pkgdesc="Video camera surveillance system" url="http://www.zoneminder.com/" arch="x86_64" @@ -22,6 +22,7 @@ subpackages=$pkgname-doc source="zoneminder-$pkgver.tar.gz::https://github.com/ZoneMinder/ZoneMinder/archive/v${pkgver}.tar.gz $pkgname.initd musl-fix.patch + 0001-zm_monitor-fix-overlap-in-memcpy-buffers.patch zm-additional.sql" _builddir=$srcdir/ZoneMinder-$pkgver @@ -87,12 +88,15 @@ package() { md5sums="b4de8dd3fd86fc72e929e116e926d901 zoneminder-1.29.0.tar.gz ab1fe4fb2392b82acf18ca8412fb927f zoneminder.initd b95482fefbf22e8a89fb061805d05f03 musl-fix.patch +1429766dc44764dc77c735f4320b5a44 0001-zm_monitor-fix-overlap-in-memcpy-buffers.patch 24359849eef7c5293f63136e704fdca4 zm-additional.sql" sha256sums="34e1f0d4b616e320e557f8e3fbe278d3ab70f30f6278cc153b44f2193c85ddbd zoneminder-1.29.0.tar.gz 887174a6d1489bdcfbadf760758b14ef4e184dfcae728e15cb0e697e61e1c42f zoneminder.initd 829551a83e62ff84fcba7a0f88105a0b6d15d89a66e1e98dc50098c30c48672f musl-fix.patch +a830478a806e36d41016d3c2663d892fafa65b580d3bccccc131fe114c842834 0001-zm_monitor-fix-overlap-in-memcpy-buffers.patch dea3a1b493bc7d7dbe9c431f565b9e916fb8a8bd29fcd74947b14592ef7f4494 zm-additional.sql" sha512sums="71a397df83c92de3b977832bb0a11791a3a756e7219e0cf3dc6c5c30fa0dd488ea00a925433669bf4e79873df980a852f2c805d1b7c9c8a06b6c39b9a16a2fda zoneminder-1.29.0.tar.gz fa993a86c21697467c8f63ce584531f8e2c3da977b65e6557161b4b91807b1c78b14fb64f6f54c50fddcb51b54bae6dff45776f5a69bfcc635a5c2927a292b57 zoneminder.initd b2c4e31fd0a31f034be3029eab4f2943e07e95e64bb2d8eb38d93b790059d694a9a007e98b0f9b4c47ecfe91296bc21a3795b8a4aaf5b2a83071251456e533da musl-fix.patch +8a35bfc782792ca559d6cf78e3e17f0caa45e19981cea12090b4f0ececa98bd9a121d2918e06e991ae5c06ab876ffddc94cd4f9db640f510314a3d09a6d90b4c 0001-zm_monitor-fix-overlap-in-memcpy-buffers.patch 0bb99af417441e2c12cb3b8c00ecb8d76bdc343d39092a222841ae0bd684eeba1783a8bccf5630dae56f64992f8a09ec16e0cbc7069665e1ee3b62dd3f96c3a9 zm-additional.sql" |