diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-04-24 13:30:14 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-04-24 13:30:14 +0000 |
| commit | ca64327748a6964f6b2e542beccd2cd01ae40015 (patch) | |
| tree | c68f3a1e16e864adb80c6eb807ddcf6ead2073bc | |
| parent | 68626613f16bffc10f13a88f731d4f911da4a2f9 (diff) | |
| download | aports-ca64327748a6964f6b2e542beccd2cd01ae40015.tar.bz2 aports-ca64327748a6964f6b2e542beccd2cd01ae40015.tar.xz | |
main/libarchive: fix CVE-2013-0211
fixes #1806
| -rw-r--r-- | main/libarchive/APKBUILD | 23 | ||||
| -rw-r--r-- | main/libarchive/CVE-2013-0211.patch | 32 |
2 files changed, 50 insertions, 5 deletions
diff --git a/main/libarchive/APKBUILD b/main/libarchive/APKBUILD index fe4e07a160..5305967e1b 100644 --- a/main/libarchive/APKBUILD +++ b/main/libarchive/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libarchive pkgver=3.1.2 -pkgrel=0 +pkgrel=1 pkgdesc="library that can create and read several streaming archive formats" url="http://libarchive.googlecode.com/" arch="all" @@ -10,9 +10,19 @@ depends="" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" makedepends="zlib-dev bzip2-dev xz-dev acl-dev openssl-dev expat-dev" depends_dev="$makedepends" -source="http://www.libarchive.org/downloads/libarchive-$pkgver.tar.gz" +source="http://www.libarchive.org/downloads/libarchive-$pkgver.tar.gz + CVE-2013-0211.patch" _builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + build () { cd "$_builddir" ./configure --prefix=/usr --without-xml2 @@ -31,6 +41,9 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -md5sums="efad5a503f66329bb9d2f4308b5de98a libarchive-3.1.2.tar.gz" -sha256sums="eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e libarchive-3.1.2.tar.gz" -sha512sums="1f3c2a675031f93c7d42ae2ed06742b0b1e2236ff57d9117791d62fb8ae77d6cafffbcb5d45b5bd98daa908bd18c576cf82e01a9b1eba699705e23eff3688114 libarchive-3.1.2.tar.gz" +md5sums="efad5a503f66329bb9d2f4308b5de98a libarchive-3.1.2.tar.gz +fc5f5158d414e3a7e9f085d8d1470014 CVE-2013-0211.patch" +sha256sums="eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e libarchive-3.1.2.tar.gz +75f30c3867d3924461bb764ea2ca3c1b1e43240aeb5b0dd93a103fd7a7ca7fe9 CVE-2013-0211.patch" +sha512sums="1f3c2a675031f93c7d42ae2ed06742b0b1e2236ff57d9117791d62fb8ae77d6cafffbcb5d45b5bd98daa908bd18c576cf82e01a9b1eba699705e23eff3688114 libarchive-3.1.2.tar.gz +c10470ab67dd94944489f72e4d6f39d98163f5d7a92bcd550aa323e9a1b96148588bd04ac7d8c6ff232dc388559fb3e67552bb5c83ac7626ad714517f5022fce CVE-2013-0211.patch" diff --git a/main/libarchive/CVE-2013-0211.patch b/main/libarchive/CVE-2013-0211.patch new file mode 100644 index 0000000000..c927a860e2 --- /dev/null +++ b/main/libarchive/CVE-2013-0211.patch @@ -0,0 +1,32 @@ +From 22531545514043e04633e1c015c7540b9de9dbe4 Mon Sep 17 00:00:00 2001 +From: Tim Kientzle <kientzle@acm.org> +Date: Fri, 22 Mar 2013 23:48:41 -0700 +Subject: [PATCH] Limit write requests to at most INT_MAX. This prevents a + certain common programming error (passing -1 to write) from leading to other + problems deeper in the library. + +--- + libarchive/archive_write.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c +index eede5e0..be85621 100644 +--- a/libarchive/archive_write.c ++++ b/libarchive/archive_write.c +@@ -673,8 +673,13 @@ struct archive_write_filter * + _archive_write_data(struct archive *_a, const void *buff, size_t s) + { + struct archive_write *a = (struct archive_write *)_a; ++ const size_t max_write = INT_MAX; ++ + archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC, + ARCHIVE_STATE_DATA, "archive_write_data"); ++ /* In particular, this catches attempts to pass negative values. */ ++ if (s > max_write) ++ s = max_write; + archive_clear_error(&a->archive); + return ((a->format_write_data)(a, buff, s)); + } +-- +1.8.1.6 + |