Add fix by Andreas Wiese for NULL ptr deref #256464.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 107 insertions, 6 deletions

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index d90598d6b5cc..b8e70470838e 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.157 2009/01/29 18:25:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.158 2009/01/29 18:57:16 vapier Exp $
+
+*pciutils-3.1.0-r1 (29 Jan 2009)
+
+  29 Jan 2009; Mike Frysinger <vapier@gentoo.org>
+  +files/pciutils-3.1.0-null-ptr.patch, +pciutils-3.1.0-r1.ebuild:
+  Add fix by Andreas Wiese for NULL ptr deref #256464.
 
   29 Jan 2009; Mike Frysinger <vapier@gentoo.org> pciutils-3.1.0.ebuild:
   Force LC_ALL=C with tr since upper/lower don't work #256447 by Gürkan
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index a0fb5ad475fe..7541f7ae32a4 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -11,19 +11,20 @@ AUX pciutils-2.2.7-update-pciids-both-forms.patch 843 RMD160 6be4dd832f8274512bf
 AUX pciutils-3.0.0-build.patch 340 RMD160 b734b9bc3148f68e479fe763c182cd294ba16802 SHA1 0464ceb78aa3f80760a94f3ed0b5b4e55786980b SHA256 969f2496e2310342aed5af38d6470714ac1d34a5547a4195ce779c5d5131dc8d
 AUX pciutils-3.0.0-locale-happiness.patch 1199 RMD160 3b1bb4df333de85929748d4290ccb46923f82c81 SHA1 10b018ca036cd48528d48510b78b6d42eb8ac1cd SHA256 5e56f412bd51647cf43fa860d48a7de8d01c8185ac04940f29099194f82fccaa
 AUX pciutils-3.0.0-resolv.patch 1163 RMD160 5cfe106380413349a514db75dda37d3163404d7b SHA1 c51a69794c252ea63083a40363dbb38e84fcfbaa SHA256 1756e747cfe0801e4189e69f516115fba207564d5ff7bc0e697fac1a0aa7b242
+AUX pciutils-3.1.0-null-ptr.patch 666 RMD160 0a7c227245dda3bac4c38e30d7d5d748b6705a34 SHA1 456f68df91755e6c3d15728e965d34284ef71da6 SHA256 05beaebdcf50b75e212ec002621844e5650af32d660556d462e348370b62a98d
 AUX pciutils.cron 42 RMD160 ed2388ec7eb6d08d75b4178b3a3d33071d705eee SHA1 1e0385c0477dffe5ac5c2a4bcd2a3e248dd8a166 SHA256 f97b127efda8095683b0a20ca071694f90e18c131743a9d36c8baf633b112836
 DIST pciutils-3.0.0.tar.gz 244756 RMD160 e0ac0d4f4da0732a159520d8ca4fdea547d97230 SHA1 75436a6b88604bdd288492c4076d39edd2321b92 SHA256 df1a63315bbea8f81591fdeaed2005606eb9f675ab1f9839bea5fba02855a773
 DIST pciutils-3.0.2.tar.gz 270474 RMD160 bab0a8261267dd7be50c29984c1d813174c4a0f7 SHA1 4591785f6f70ed44e593933bb34012d83b4c3853 SHA256 ab11bd88c7e20b2bc4801df044086be69b6d728dc88cf6e73db47cdd02c46584
 DIST pciutils-3.1.0.tar.gz 290333 RMD160 5e3e5118327e34c83930970ecd4e490946f67da0 SHA1 582c149f7adfdcf09ac91b6340f5949300d1d4e7 SHA256 7e581c881979001f4ca52fd3ca6c8b141e99ffd4df51002dae8c398ad5ee8888
 EBUILD pciutils-3.0.0.ebuild 1841 RMD160 0eaa5e8714ad27985809d046a44be29a3e950f65 SHA1 1ad671455feb9838467562fbd75e31015fee6dc9 SHA256 f10f0b345a7eb665e22013d2ce314a45b812a552ec13c550d7c85e013e5eafc5
 EBUILD pciutils-3.0.2.ebuild 1960 RMD160 5c4fc2e4ec433ebd24bc07a0af1a4f04c8bfbeed SHA1 0ddd0c5b1f97be9e750a4826d057dca14e8bdbc7 SHA256 2a0ae989459b777679e74bae37ac3b58d0944fbc625e8445e5fc692dd775cb93
-EBUILD pciutils-3.1.0.ebuild 1967 RMD160 8338e144d79b50d45a8448fa41fea33e8ad4252c SHA1 edc4774e3703dd07702eb7f108a29be2dc3ac4f8 SHA256 fec790b4c7e0417ebe8d8496053739b728ef9de0d56f8925c50a683b3150dbf0
-MISC ChangeLog 20781 RMD160 f9b97c30bbcf9469ed76b08eb20e1ae86b8e1ccc SHA1 a65955a698ac4d28f0f836cbe4cc261c0e6a9ddd SHA256 21cb51c008dcef2e7213fa6cba5afef3ac26f012dd54b7f5df4d6c56e95bf847
+EBUILD pciutils-3.1.0-r1.ebuild 2020 RMD160 bb1c4abc662ccfb97ea3c8f15de81f5bedf0b085 SHA1 750304d3905c1a2d019d2715d64b6f17edf72e56 SHA256 e6e0898b7bde3a9259155c0ac1722ec08c1bdf63a8aff530792678689c768fd0
+MISC ChangeLog 20988 RMD160 e662a6539eacff8843d9e3e76971f1ed9bae0224 SHA1 ed8ca3346196f145e1f9d4d4d2bab1cf2c1dfc34 SHA256 d109b809587e03d41c831a9ad3114704d5e35a6f8030eb08313a538f38431317
 MISC metadata.xml 257 RMD160 bda78cd844850cace7d31b3bff6de2d1a7a298d5 SHA1 d754bc91dd7fc7496f5c3aa307879ae74ce3b465 SHA256 665e73270ac904a5c3989d16be4ad8e3d3b492049adebb76621f772d60647a97
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkmB9L0ACgkQn/5bYzqsSmG7OgCgmOLnhQmM70iZJCX+NcNVDg+M
-jhwAn01K6Y6eZLny9l+V5gPjLvanhn4S
-=nNJb
+iEYEARECAAYFAkmB/BIACgkQn/5bYzqsSmHA6QCfeaVJ9+vQpiIrHBPfc0ETjG/a
+HgIAn3rL2pXcTdw9xi11l68AKkkkzljB
+=H2Ud
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pciutils/files/pciutils-3.1.0-null-ptr.patch b/sys-apps/pciutils/files/pciutils-3.1.0-null-ptr.patch
new file mode 100644
index 000000000000..f7aee8a63afb
--- /dev/null
+++ b/sys-apps/pciutils/files/pciutils-3.1.0-null-ptr.patch
@@ -0,0 +1,24 @@
+http://bugs.gentoo.org/256464
+
+if "f" is NULL, dont try to deref it
+
+patch by Andreas Wiese
+
+--- a/setpci.c
++++ b/setpci.c
+@@ -630,13 +630,13 @@
+       e = strchr(value, ',');
+       if (e)
+ 	*e++ = 0;
+-      if (parse_x32(value, &f, &ll) < 0 || *f && *f != ':')
++      if (parse_x32(value, &f, &ll) < 0 || f && *f != ':')
+ 	parse_err("Invalid value \"%s\"", value);
+       lim = max_values[op->width];
+       if (ll > lim && ll < ~0UL - lim)
+ 	parse_err("Value \"%s\" is out of range", value);
+       op->values[j].value = ll;
+-      if (*f == ':')
++      if (f && *f == ':')
+ 	{
+ 	  if (parse_x32(f+1, NULL, &ll) <= 0)
+ 	    parse_err("Invalid mask \"%s\"", f+1);
diff --git a/sys-apps/pciutils/pciutils-3.1.0-r1.ebuild b/sys-apps/pciutils/pciutils-3.1.0-r1.ebuild
new file mode 100644
index 000000000000..2c3daeb8cda4
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-3.1.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.1.0-r1.ebuild,v 1.1 2009/01/29 18:57:16 vapier Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="Various utilities dealing with the PCI bus"
+HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html"
+SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="network-cron zlib"
+
+DEPEND="zlib? ( sys-libs/zlib )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-3.0.0-build.patch #233314
+	epatch "${FILESDIR}"/pcimodules-${PN}-3.1.0.patch
+	epatch "${FILESDIR}"/${P}-null-ptr.patch #256464
+	epatch "${FILESDIR}"/${PN}-2.2.7-update-pciids-both-forms.patch
+	cp "${FILESDIR}"/pcimodules.c . || die
+	sed -i -e 's:| tr:| LC_ALL=C tr:' lib/configure
+	sed -i -e "/^LIBDIR=/s:/lib:/$(get_libdir):" Makefile
+}
+
+uyesno() { use $1 && echo yes || echo no ; }
+pemake() {
+	emake \
+		HOST="${CHOST}" \
+		CROSS_COMPILE="${CHOST}-" \
+		DNS="yes" \
+		IDSDIR="/usr/share/misc" \
+		MANDIR="/usr/share/man" \
+		PREFIX="/usr" \
+		SHARED="yes" \
+		STRIP="" \
+		ZLIB=$(uyesno zlib) \
+		"$@"
+}
+
+src_compile() {
+	pemake OPT="${CFLAGS}" all pcimodules || die "emake failed"
+}
+
+src_install() {
+	pemake DESTDIR="${D}" install install-lib || die
+	dosbin pcimodules || die
+	doman "${FILESDIR}"/pcimodules.8
+	dodoc ChangeLog README TODO
+
+	if use network-cron ; then
+		exeinto /etc/cron.monthly
+		newexe "${FILESDIR}"/pciutils.cron update-pciids \
+			|| die "Failed to install update cronjob"
+	fi
+
+	# Install both forms until HAL has migrated
+	if use zlib ; then
+		local sharedir="${D}/usr/share/misc"
+		elog "Providing a backwards compatibility non-compressed pci.ids"
+		gzip -d <"${sharedir}"/pci.ids.gz >"${sharedir}"/pci.ids
+	fi
+
+	newinitd "${FILESDIR}"/init.d-pciparm pciparm
+	newconfd "${FILESDIR}"/conf.d-pciparm pciparm
+}