diff options
author | Mike Frysinger <vapier@gentoo.org> | 2005-12-22 04:50:18 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2005-12-22 04:50:18 +0000 |
commit | 392ca9efe43cda0bfa7bcd5ab174bc71038c62c3 (patch) | |
tree | 67aa45fee9c52e6d48e0fc08cdb28ee0967bcd07 /sys-block | |
parent | Version bump (bug #116226). (diff) | |
download | historical-392ca9efe43cda0bfa7bcd5ab174bc71038c62c3.tar.gz historical-392ca9efe43cda0bfa7bcd5ab174bc71038c62c3.tar.bz2 historical-392ca9efe43cda0bfa7bcd5ab174bc71038c62c3.zip |
Add patch to check for buffer overflow #116314.
Package-Manager: portage-2.0.53
Diffstat (limited to 'sys-block')
-rw-r--r-- | sys-block/nbd/ChangeLog | 8 | ||||
-rw-r--r-- | sys-block/nbd/Manifest | 11 | ||||
-rw-r--r-- | sys-block/nbd/files/digest-nbd-2.8.2-r1 | 2 | ||||
-rw-r--r-- | sys-block/nbd/files/nbd-2.8.2-buffer-check.patch | 26 | ||||
-rw-r--r-- | sys-block/nbd/nbd-2.8.2-r1.ebuild | 43 |
5 files changed, 85 insertions, 5 deletions
diff --git a/sys-block/nbd/ChangeLog b/sys-block/nbd/ChangeLog index 23bc6169afba..53827610a314 100644 --- a/sys-block/nbd/ChangeLog +++ b/sys-block/nbd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-block/nbd # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/ChangeLog,v 1.5 2005/11/20 13:04:26 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/ChangeLog,v 1.6 2005/12/22 04:50:18 vapier Exp $ + +*nbd-2.8.2-r1 (22 Dec 2005) + + 22 Dec 2005; Mike Frysinger <vapier@gentoo.org> + +files/nbd-2.8.2-buffer-check.patch, +nbd-2.8.2-r1.ebuild: + Add patch to check for buffer overflow #116314. *nbd-2.8.2 (20 Nov 2005) diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest index 4639769489f7..918e67826f00 100644 --- a/sys-block/nbd/Manifest +++ b/sys-block/nbd/Manifest @@ -1,22 +1,25 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 0edaa1eeee1e891d6ad2e09fa30f4f9e ChangeLog 2462 +MD5 88a23d5906ecb1496151a8b445ca440b ChangeLog 2653 MD5 55671361131ffc00d6ab74e8bebbecbd files/digest-nbd-2.7.2 127 MD5 fd3fb561bafa4b382526a90c675be601 files/digest-nbd-2.7.3 127 MD5 b896e2588a2d34c93efa92003c6f8407 files/digest-nbd-2.7.4 127 MD5 2f2d8719abd2a75b55141ac6c16444be files/digest-nbd-2.8.2 127 +MD5 2f2d8719abd2a75b55141ac6c16444be files/digest-nbd-2.8.2-r1 127 MD5 3c92585e853a1de0f617fc02554655a4 files/docbook2man.patch 585 +MD5 7e395f41867132f388466283ce268b28 files/nbd-2.8.2-buffer-check.patch 960 MD5 0b97fc740e0f0a79a3b139f86be6623e files/nbd-2.8.2-gznbd.patch 545 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 dfb4b0cbd303a764e3f261b0e8d31d63 nbd-2.7.2.ebuild 991 MD5 6ccc31f89d7cbc4f2b959a6b4047014c nbd-2.7.3.ebuild 951 MD5 d27ba6f296400c23a19b8c1038fb1ea3 nbd-2.7.4.ebuild 954 +MD5 1e50967e444103b7f70e686c08091c0b nbd-2.8.2-r1.ebuild 989 MD5 c2ac0bbe68d730f447584af47d32d3eb nbd-2.8.2.ebuild 940 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDgHS7gIKl8Uu19MoRAiMXAJ9sb3SabF4RtwdNrBHTa+6v1Ai5bQCZAcx5 -GdeNIyPQqVzhXJASSecsdi8= -=oJI4 +iD8DBQFDqjC/2+ySkm8kpY0RAgWeAJ9jgH3e2d0975xv8kLX7vCxcV9s9gCdGA7C +klyy8yQlZZ21Y9DGNJLfLWQ= +=+a3o -----END PGP SIGNATURE----- diff --git a/sys-block/nbd/files/digest-nbd-2.8.2-r1 b/sys-block/nbd/files/digest-nbd-2.8.2-r1 new file mode 100644 index 000000000000..8ba4e4456dfa --- /dev/null +++ b/sys-block/nbd/files/digest-nbd-2.8.2-r1 @@ -0,0 +1,2 @@ +MD5 ca9087568f2d5d3d2d3ed5fe1b506ec4 nbd-2.8.2.tar.gz 154065 +MD5 3e45be16d413bda30b23bf7dd30c48d7 nbd-linux-include.h.bz2 1248 diff --git a/sys-block/nbd/files/nbd-2.8.2-buffer-check.patch b/sys-block/nbd/files/nbd-2.8.2-buffer-check.patch new file mode 100644 index 000000000000..5367b0c0aa14 --- /dev/null +++ b/sys-block/nbd/files/nbd-2.8.2-buffer-check.patch @@ -0,0 +1,26 @@ +Kurt Fitzner writes: +There is a buffer size bug in the nbd server from at least version 2.7.5 +and on. + +The buffer size is exactly one megabyte, but nbd-server will accept +requests that are the buffer size. The problem is, the server makes no +allowance that the buffer must also hold the reply header. A read +request that is exactly one megabyte will write past the end of the +buffer by the size of the reply header. + +The allocation of the buffer needs to be BUFSIZE + sizeof(struct nbd_reply). + +http://sourceforge.net/mailarchive/forum.php?thread_id=9201144&forum_id=40388 +http://bugs.gentoo.org/116314 + +--- nbd/nbd-server.c ++++ nbd/nbd-server.c +@@ -677,7 +677,7 @@ int mainloop(CLIENT *client) { + + if (request.magic != htonl(NBD_REQUEST_MAGIC)) + err("Not enough magic."); +- if (len > BUFSIZE) ++ if (len > BUFSIZE - sizeof(struct nbd_reply)) + err("Request too big!"); + #ifdef DODBG + printf("%s from %Lu (%Lu) len %d, ", request.type ? "WRITE" : diff --git a/sys-block/nbd/nbd-2.8.2-r1.ebuild b/sys-block/nbd/nbd-2.8.2-r1.ebuild new file mode 100644 index 000000000000..818b4f65150d --- /dev/null +++ b/sys-block/nbd/nbd-2.8.2-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/nbd-2.8.2-r1.ebuild,v 1.1 2005/12/22 04:50:18 vapier Exp $ + +inherit eutils flag-o-matic + +DESCRIPTION="Userland client/server for kernel network block device" +HOMEPAGE="http://nbd.sourceforge.net/" +SRC_URI="mirror://sourceforge/nbd/${P}.tar.gz + mirror://gentoo/nbd-linux-include.h.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +DEPEND="" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-gznbd.patch + epatch "${FILESDIR}"/${P}-buffer-check.patch + + mkdir -p "${S}"/inc-after/linux + mv "${WORKDIR}"/nbd-linux-include.h "${S}"/inc-after/linux/nbd.h + append-flags -idirafter "${S}"/inc-after +} + +src_compile() { + econf \ + --enable-lfs \ + --enable-syslog \ + || die + emake || die + emake -C gznbd || die +} + +src_install() { + make install DESTDIR="${D}" || die + dobin gznbd/gznbd || die + dodoc README +} |