summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaohiro Aota <naota@gentoo.org>2013-05-07 14:18:08 +0000
committerNaohiro Aota <naota@gentoo.org>2013-05-07 14:18:08 +0000
commit8d657e46cb24155abac3fe58d7b48ae7aa55815e (patch)
treea30c00ce2ddda8a98aa15eeee71f707c3ec53ccd /sys-freebsd
parentStable for ppc, wrt bug #468730 (diff)
downloadgentoo-2-8d657e46cb24155abac3fe58d7b48ae7aa55815e.tar.gz
gentoo-2-8d657e46cb24155abac3fe58d7b48ae7aa55815e.tar.bz2
gentoo-2-8d657e46cb24155abac3fe58d7b48ae7aa55815e.zip
Add patch to deal with CVE-2013-3266. #468422
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key F8551514)
Diffstat (limited to 'sys-freebsd')
-rw-r--r--sys-freebsd/freebsd-sources/ChangeLog9
-rw-r--r--sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3266.patch13
-rw-r--r--sys-freebsd/freebsd-sources/freebsd-sources-9.1-r1.ebuild (renamed from sys-freebsd/freebsd-sources/freebsd-sources-9.1.ebuild)5
3 files changed, 24 insertions, 3 deletions
diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index 58fdb6db150b..415a2b3c67e7 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-freebsd/freebsd-sources
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.82 2013/01/29 13:11:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.83 2013/05/07 14:18:08 naota Exp $
+
+*freebsd-sources-9.1-r1 (07 May 2013)
+
+ 07 May 2013; Naohiro Aota <naota@gentoo.org>
+ +files/freebsd-sources-9.1-cve-2013-3266.patch,
+ +freebsd-sources-9.1-r1.ebuild, -freebsd-sources-9.1.ebuild:
+ Add patch to deal with CVE-2013-3266. #468422
29 Jan 2013; Alexis Ballier <aballier@gentoo.org> freebsd-sources-9.1.ebuild:
Install to /usr/src/PN-RV to ease upgrades, bug #454414 by Yuta SATOH
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3266.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3266.patch
new file mode 100644
index 000000000000..0d1a89419e5f
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3266.patch
@@ -0,0 +1,13 @@
+Index: sys/fs/nfsserver/nfs_nfsdport.c
+===================================================================
+--- sys/fs/nfsserver/nfs_nfsdport.c (revision 249651)
++++ sys/fs/nfsserver/nfs_nfsdport.c (working copy)
+@@ -1568,6 +1568,8 @@ nfsrvd_readdir(struct nfsrv_descript *nd, int isdg
+ nd->nd_repstat = NFSERR_BAD_COOKIE;
+ #endif
+ }
++ if (!nd->nd_repstat && vp->v_type != VDIR)
++ nd->nd_repstat = NFSERR_NOTDIR;
+ if (nd->nd_repstat == 0 && cnt == 0) {
+ if (nd->nd_flag & ND_NFSV2)
+ /* NFSv2 does not have NFSERR_TOOSMALL */
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r1.ebuild
index 1dcf6dbba18d..2f254d83b253 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.1.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.1.ebuild,v 1.2 2013/01/29 13:11:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r1.ebuild,v 1.1 2013/05/07 14:18:08 naota Exp $
inherit bsdmk freebsd flag-o-matic
@@ -27,7 +27,8 @@ PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
"${FILESDIR}/${PN}-7.1-includes.patch"
"${FILESDIR}/${PN}-9.0-sysctluint.patch"
- "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch" )
+ "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch"
+ "${FILESDIR}/${PN}-9.1-cve-2013-3266.patch" )
src_unpack() {
freebsd_src_unpack