diff options
author | Thomas Beierlein <tomjbe@gentoo.org> | 2010-10-04 15:19:36 +0000 |
---|---|---|
committer | Thomas Beierlein <tomjbe@gentoo.org> | 2010-10-04 15:19:36 +0000 |
commit | 29d54a335c2c86e1ed6f2362382c225f90f657a2 (patch) | |
tree | 58a6bd8988d6212b6b8b0d97da83ec9d76260cc7 /media-radio | |
parent | ppc64 stable wrt #317381 (diff) | |
download | historical-29d54a335c2c86e1ed6f2362382c225f90f657a2.tar.gz historical-29d54a335c2c86e1ed6f2362382c225f90f657a2.tar.bz2 historical-29d54a335c2c86e1ed6f2362382c225f90f657a2.zip |
Fix buffer overflow (bug #339652). Thanks for reporting Diego.
Package-Manager: portage-2.1.9.13/cvs/Linux x86_64
Diffstat (limited to 'media-radio')
-rw-r--r-- | media-radio/xlog/ChangeLog | 6 | ||||
-rw-r--r-- | media-radio/xlog/Manifest | 15 | ||||
-rw-r--r-- | media-radio/xlog/files/xlog-2.0.3-memmove.patch | 48 | ||||
-rw-r--r-- | media-radio/xlog/xlog-2.0.3.ebuild | 4 |
4 files changed, 59 insertions, 14 deletions
diff --git a/media-radio/xlog/ChangeLog b/media-radio/xlog/ChangeLog index f76d20b7886b..0c6dddcfbcdf 100644 --- a/media-radio/xlog/ChangeLog +++ b/media-radio/xlog/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-radio/xlog # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/xlog/ChangeLog,v 1.13 2010/07/17 12:43:00 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-radio/xlog/ChangeLog,v 1.14 2010/10/04 15:19:36 tomjbe Exp $ + + 04 Oct 2010; Thomas Beierlein <tomjbe@gentoo.org> xlog-2.0.3.ebuild, + +files/xlog-2.0.3-memmove.patch: + Fix buffer overflow (bug #339652) 17 Jul 2010; Christian Faulhammer <fauli@gentoo.org> xlog-2.0.3.ebuild: stable x86, bug 328071 diff --git a/media-radio/xlog/Manifest b/media-radio/xlog/Manifest index ccf08e0d11ef..e1351c27c453 100644 --- a/media-radio/xlog/Manifest +++ b/media-radio/xlog/Manifest @@ -1,17 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX xlog-1.9-desktop-update.patch 1393 RMD160 045463b085cb4587b571c9ecbf70aafadaf5b716 SHA1 d4143c9f581ab1859f7ea38584248f61358e0b05 SHA256 c9f9afee6309420b875363a3a52a996e48e98c6d6d236c91c2c81c78ce21c13a AUX xlog-2.0.1-adif.patch 364 RMD160 5747c9bfd9a5e6e68d03b3e850736081af27805e SHA1 9077661c53401c44191c653d99250e0e4c9d63ea SHA256 b2ae523994271baa65f5847b5ee3528cc4d0e3924bdeacb9bb46098b21452986 AUX xlog-2.0.2-qsl.patch 809 RMD160 e1e124b746c0f08febf4f7e1bc33c66735181d18 SHA1 eab5c1cd9a3ba051abcce4ab3c843390410731c9 SHA256 e6cf4baa72b46f4e705fc9d6084f0ff538874fe6774c796dab8c4126799d8997 +AUX xlog-2.0.3-memmove.patch 1873 RMD160 23deb0ae3eec9e5f7cd8f799368bd44d3b90b35a SHA1 000b00cf73ac915e47d92a57554a5a9053706d17 SHA256 b13e49ed3b305463a4e9fc38afb1806f8b53348b55fd48dd21c39b29ca1f4f12 DIST xlog-2.0.3.tar.gz 11141993 RMD160 b4882d0916ebb80306e497367dacf065b687009b SHA1 cc073fb3844b240ecaeed3119fc9b430e4116faf SHA256 ca12a468d2b10b11adbff365d0731853bfc54d915a342b2e3b712629d092f245 -EBUILD xlog-2.0.3.ebuild 1321 RMD160 2f4d40e7f87bfaf5371b06807d8b53a0bff1233e SHA1 69e9d88e644fc5ff30cccc0ed328f0e6f7bf1ad1 SHA256 761de5e4266351513eba4844c15e15619dd67f3a44fd43a5077803bc47a54fcc -MISC ChangeLog 671 RMD160 5fdea6ea8210295c0f60fedcaac8e2a892b83f7c SHA1 1642828fd7fa4e79b6f71e9af05319c0ed7a15e1 SHA256 737ea5797bd27e1c85a64f1bf6d1f3a2608365bba0bf8ce5124450cbbbeb015e +EBUILD xlog-2.0.3.ebuild 1399 RMD160 98a58b9d6423271ff0b1b8ed68195a1ee4a412f6 SHA1 5508027aba38863ebf6e023d900829c747db0c56 SHA256 aef0afcb2f76ffad230ee6ae8f8272bc9dac6d6cc893e1af30c99bf69e99204d +MISC ChangeLog 815 RMD160 38c21784f3dc6ca72f85d1f70d650ca9c0cb07d1 SHA1 4db7b201a06391576dbd17d9a1fdfcaa3d188c3f SHA256 62744cb73cd4edcf8e763c71b4059e1fa63277eeacc310db73242125545f63e4 MISC metadata.xml 252 RMD160 97b7e7d78993c6123ed2d99298be3bade7e52197 SHA1 d747c2ba9a0158afb075712518f6442af74a6fbb SHA256 e9ecb799a64ff215ac2412db6e6c133d8d325c330d07b087b23d21ad0b56c7a6 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEARECAAYFAkxBpc8ACgkQNQqtfCuFneOBogCghpsAAha6q6ZzePGOgKSxs86W -6UEAoIdQZTAn6ltO6GHQhI0BhrljZQp6 -=d8pf ------END PGP SIGNATURE----- diff --git a/media-radio/xlog/files/xlog-2.0.3-memmove.patch b/media-radio/xlog/files/xlog-2.0.3-memmove.patch new file mode 100644 index 000000000000..8775829e98de --- /dev/null +++ b/media-radio/xlog/files/xlog-2.0.3-memmove.patch @@ -0,0 +1,48 @@ +diff -Nur src/logfile.old/oh1aa.c src/logfile/oh1aa.c +--- src/logfile.old/oh1aa.c 2010-10-04 15:03:52.000000000 +0000 ++++ src/logfile/oh1aa.c 2010-10-04 15:05:13.000000000 +0000 +@@ -111,25 +111,25 @@ + //0502201751OK2BMA 59 59 28 MHzSSB pavel 0 + + /* insert a space between date and time */ +- memmove (buffer+7, buffer+6, MAXROWLEN); ++ memmove (buffer+7, buffer+6, MAXROWLEN-7); + buffer[6] = ' '; + /* insert a space between time and call */ +- memmove (buffer+12, buffer+11, MAXROWLEN); ++ memmove (buffer+12, buffer+11, MAXROWLEN-12); + buffer[11] = ' '; + /* insert a space between call and myrst */ +- memmove (buffer+24, buffer+23, MAXROWLEN); ++ memmove (buffer+24, buffer+23, MAXROWLEN-24); + buffer[24] = ' '; + /* insert a space between myrst and rst */ +- memmove (buffer+28, buffer+27, MAXROWLEN); ++ memmove (buffer+28, buffer+27, MAXROWLEN-28); + buffer[28] = ' '; + /* insert a space between rst and band */ +- memmove (buffer+32, buffer+31, MAXROWLEN); ++ memmove (buffer+32, buffer+31, MAXROWLEN-32); + buffer[32] = ' '; + /* insert a space between band and mode */ +- memmove (buffer+40, buffer+39, MAXROWLEN); ++ memmove (buffer+40, buffer+39, MAXROWLEN-40); + buffer[40] = ' '; + /* insert a space between mode and remarks */ +- memmove (buffer+45, buffer+44, MAXROWLEN); ++ memmove (buffer+45, buffer+44, MAXROWLEN-45); + buffer[45] = ' '; + + for (i = 0; i < oh1aa_field_nr; i++) +diff -Nur src/logfile.old/trlog.c src/logfile/trlog.c +--- src/logfile.old/trlog.c 2010-10-04 15:03:52.000000000 +0000 ++++ src/logfile/trlog.c 2010-10-04 15:04:21.000000000 +0000 +@@ -195,7 +195,7 @@ + continue; + + /* insert a space between band and mode */ +- memmove (buffer+4, buffer+3, MAXROWLEN); ++ memmove (buffer+4, buffer+3, MAXROWLEN-4); + buffer[3] = ' '; + + for (i = 0; i < trlog_field_nr - 1; i++) diff --git a/media-radio/xlog/xlog-2.0.3.ebuild b/media-radio/xlog/xlog-2.0.3.ebuild index 7bb69fc33bc2..4eabf9e6944e 100644 --- a/media-radio/xlog/xlog-2.0.3.ebuild +++ b/media-radio/xlog/xlog-2.0.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/xlog/xlog-2.0.3.ebuild,v 1.3 2010/07/17 12:43:00 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-radio/xlog/xlog-2.0.3.ebuild,v 1.4 2010/10/04 15:19:36 tomjbe Exp $ EAPI=2 @@ -28,6 +28,8 @@ src_prepare() { # and patch wrong ADIF export epatch "${FILESDIR}/${PN}-2.0.1-adif.patch" \ "${FILESDIR}/${PN}-2.0.2-qsl.patch" + # fix buffer overflow (bug 339652) + epatch "${FILESDIR}/${P}-memmove.patch" eautoreconf } |