commit: 07dc9d02d63a7aaed4a3ce0bd7376df469be2191 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Wed Jun 13 17:51:13 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Jun 13 18:51:34 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07dc9d02
sys-freebsd/freebsd-sources: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/8838 .../files/freebsd-sources-6.1-ntfs.patch | 32 -------- .../freebsd-sources-7.0-tmpfs_whiteout_stub.patch | 44 ----------- .../files/freebsd-sources-7.1-types.h-fix.patch | 15 ---- .../files/freebsd-sources-9.1-ciss.patch | 65 ---------------- .../files/freebsd-sources-9.1-cve-2013-3077.patch | 26 ------- .../files/freebsd-sources-9.1-cve-2013-3266.patch | 13 ---- .../files/freebsd-sources-9.1-cve-2013-5209.patch | 19 ----- .../files/freebsd-sources-9.1-cve-2013-5691.patch | 89 ---------------------- .../files/freebsd-sources-9.1-cve-2013-5710.patch | 28 ------- .../files/freebsd-sources-9.1-cve-2014-1453.patch | 70 ----------------- .../files/freebsd-sources-9.1-exec.patch | 66 ---------------- .../files/freebsd-sources-9.1-gentoo.patch | 21 ----- .../files/freebsd-sources-9.1-ktrace.patch | 12 --- .../files/freebsd-sources-9.1-mmap-2014.patch | 20 ----- .../files/freebsd-sources-9.1-mmap.patch | 20 ----- .../files/freebsd-sources-9.1-nfsserver.patch | 16 ---- .../files/freebsd-sources-9.1-random.patch | 27 ------- .../files/freebsd-sources-9.1-tcp.patch | 32 -------- 18 files changed, 615 deletions(-) diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch deleted file mode 100644 index e74fcd3f9b8..00000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- sys/fs/ntfs/ntfs_vnops.c.orig 2006-10-17 17:31:36 -0300 -+++ sys/fs/ntfs/ntfs_vnops.c 2006-10-17 17:30:24 -0300 -@@ -507,8 +507,12 @@ - - /* Simulate . in every dir except ROOT */ - if( ip->i_number != NTFS_ROOTINO ) { -- struct dirent dot = { NTFS_ROOTINO, -- sizeof(struct dirent), DT_DIR, 1, "." }; -+ struct dirent dot; -+ dot.d_fileno = NTFS_ROOTINO; -+ dot.d_reclen = sizeof(struct dirent); -+ dot.d_type = DT_DIR; -+ dot.d_namlen = 1; -+ bcopy(".", dot.d_name, 1); - - if( uio->uio_offset < sizeof(struct dirent) ) { - dot.d_fileno = ip->i_number; -@@ -522,8 +526,12 @@ - - /* Simulate .. in every dir including ROOT */ - if( uio->uio_offset < 2 * sizeof(struct dirent) ) { -- struct dirent dotdot = { NTFS_ROOTINO, -- sizeof(struct dirent), DT_DIR, 2, ".." }; -+ struct dirent dotdot; -+ dotdot.d_fileno = NTFS_ROOTINO; -+ dotdot.d_reclen = sizeof(struct dirent); -+ dotdot.d_type = DT_DIR; -+ dotdot.d_namlen = 2; -+ bcopy("..", dotdot.d_name, 2); - - error = uiomove((char *)&dotdot,sizeof(struct dirent),uio); - if(error) diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-tmpfs_whiteout_stub.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-tmpfs_whiteout_stub.patch deleted file mode 100644 index 13524efa6e0..00000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-tmpfs_whiteout_stub.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -ur sys/fs/tmpfs.orig/tmpfs_vnops.c sys/fs/tmpfs/tmpfs_vnops.c ---- sys/fs/tmpfs.orig/tmpfs_vnops.c 2008-06-22 12:17:48 -0300 -+++ sys/fs/tmpfs/tmpfs_vnops.c 2008-06-28 12:05:10 -0300 -@@ -1459,6 +1459,30 @@ - return (0); - } - -+ -+/* --------------------------------------------------------------------- */ -+/* This does absolutely nothing */ -+#ifdef GENTOO_LIVECD -+static int -+tmpfs_whiteout(struct vop_whiteout_args *ap) -+{ -+ switch (ap->a_flags) { -+ case LOOKUP: -+ return (0); -+ break; -+ case CREATE: -+ return(EOPNOTSUPP); -+ break; -+ case DELETE: -+ return (0); -+ break; -+ default: -+ return(EOPNOTSUPP); -+ } -+ return(0); -+} -+#endif -+ - /* --------------------------------------------------------------------- */ - - /* -@@ -1484,6 +1508,9 @@ - .vop_mkdir = tmpfs_mkdir, - .vop_rmdir = tmpfs_rmdir, - .vop_symlink = tmpfs_symlink, -+#ifdef GENTOO_LIVECD -+ .vop_whiteout = tmpfs_whiteout, -+#endif - .vop_readdir = tmpfs_readdir, - .vop_readlink = tmpfs_readlink, - .vop_inactive = tmpfs_inactive, diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-types.h-fix.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-types.h-fix.patch deleted file mode 100644 index 8de5df2d16a..00000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-types.h-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -Fixes a compile error if XOPEN_SOURCE 600 is defined. - -See: http://www.mailinglistarchive.com/[email protected]/msg15011.html - ---- sys/sys/types.h.orig -+++ sys/sys/types.h -@@ -46,7 +46,7 @@ - - #include <sys/_pthreadtypes.h> - --#if __BSD_VISIBLE -+#ifndef _POSIX_SOURCE - typedef unsigned char u_char; - typedef unsigned short u_short; - typedef unsigned int u_int; diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ciss.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ciss.patch deleted file mode 100644 index 697984b92e7..00000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ciss.patch +++ /dev/null @@ -1,65 +0,0 @@ -Index: sys/dev/ciss/ciss.c -=================================================================== ---- sys/dev/ciss/ciss.c (revision 264510) -+++ sys/dev/ciss/ciss.c (revision 264511) -@@ -180,8 +180,6 @@ - static void ciss_cam_poll(struct cam_sim *sim); - static void ciss_cam_complete(struct ciss_request *cr); - static void ciss_cam_complete_fixup(struct ciss_softc *sc, struct ccb_scsiio *csio); --static struct cam_periph *ciss_find_periph(struct ciss_softc *sc, -- int bus, int target); - static int ciss_name_device(struct ciss_softc *sc, int bus, int target); - - /* periodic status monitoring */ -@@ -3398,27 +3396,6 @@ - - - /******************************************************************************** -- * Find a peripheral attached at (target) -- */ --static struct cam_periph * --ciss_find_periph(struct ciss_softc *sc, int bus, int target) --{ -- struct cam_periph *periph; -- struct cam_path *path; -- int status; -- -- status = xpt_create_path(&path, NULL, cam_sim_path(sc->ciss_cam_sim[bus]), -- target, 0); -- if (status == CAM_REQ_CMP) { -- periph = cam_periph_find(path, NULL); -- xpt_free_path(path); -- } else { -- periph = NULL; -- } -- return(periph); --} -- --/******************************************************************************** - * Name the device at (target) - * - * XXX is this strictly correct? -@@ -3427,12 +3404,22 @@ - ciss_name_device(struct ciss_softc *sc, int bus, int target) - { - struct cam_periph *periph; -+ struct cam_path *path; -+ int status; - - if (CISS_IS_PHYSICAL(bus)) - return (0); -- if ((periph = ciss_find_periph(sc, bus, target)) != NULL) { -+ -+ status = xpt_create_path(&path, NULL, cam_sim_path(sc->ciss_cam_sim[bus]), -+ target, 0); -+ -+ if (status == CAM_REQ_CMP) { -+ mtx_lock(&sc->ciss_mtx); -+ periph = cam_periph_find(path, NULL); - sprintf(sc->ciss_logical[bus][target].cl_name, "%s%d", - periph->periph_name, periph->unit_number); -+ mtx_unlock(&sc->ciss_mtx); -+ xpt_free_path(path); - return(0); - } - sc->ciss_logical[bus][target].cl_name[0] = 0; diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3077.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3077.patch deleted file mode 100644 index 23f68ed9c3d..00000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3077.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: sys/netinet/in_mcast.c -=================================================================== ---- sys/netinet/in_mcast.c (revision 254252) -+++ sys/netinet/in_mcast.c (working copy) -@@ -1648,6 +1648,8 @@ - * has asked for, but we always tell userland how big the - * buffer really needs to be. - */ -+ if (msfr.msfr_nsrcs > in_mcast_maxsocksrc) -+ msfr.msfr_nsrcs = in_mcast_maxsocksrc; - tss = NULL; - if (msfr.msfr_srcs != NULL && msfr.msfr_nsrcs > 0) { - tss = malloc(sizeof(struct sockaddr_storage) * msfr.msfr_nsrcs, -Index: sys/netinet6/in6_mcast.c -=================================================================== ---- sys/netinet6/in6_mcast.c (revision 254252) -+++ sys/netinet6/in6_mcast.c (working copy) -@@ -1625,6 +1625,8 @@ - * has asked for, but we always tell userland how big the - * buffer really needs to be. - */ -+ if (msfr.msfr_nsrcs > in6_mcast_maxsocksrc) -+ msfr.msfr_nsrcs = in6_mcast_maxsocksrc; - tss = NULL; - if (msfr.msfr_srcs != NULL && msfr.msfr_nsrcs > 0) { - tss = malloc(sizeof(struct sockaddr_storage) * msfr.msfr_nsrcs, 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 deleted file mode 100644 index 0d1a89419e5..00000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3266.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/files/freebsd-sources-9.1-cve-2013-5209.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5209.patch deleted file mode 100644 index e6710e3bcb8..00000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5209.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: sys/netinet/sctp_output.c -=================================================================== ---- sys/netinet/sctp_output.c (revision 254337) -+++ sys/netinet/sctp_output.c (revision 254338) -@@ -5406,6 +5406,14 @@ - } - SCTP_BUF_LEN(m) = sizeof(struct sctp_init_chunk); - -+ /* -+ * We might not overwrite the identification[] completely and on -+ * some platforms time_entered will contain some padding. Therefore -+ * zero out the cookie to avoid putting uninitialized memory on the -+ * wire. -+ */ -+ memset(&stc, 0, sizeof(struct sctp_state_cookie)); -+ - /* the time I built cookie */ - (void)SCTP_GETTIME_TIMEVAL(&stc.time_entered); - diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5691.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5691.patch deleted file mode 100644 index 9aef1503f77..00000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5691.patch +++ /dev/null @@ -1,89 +0,0 @@ -Index: sys/net/if.c -=================================================================== ---- sys/net/if.c (revision 254941) -+++ sys/net/if.c (working copy) -@@ -2553,11 +2553,23 @@ - CURVNET_RESTORE(); - return (EOPNOTSUPP); - } -+ -+ /* -+ * Pass the request on to the socket control method, and if the -+ * latter returns EOPNOTSUPP, directly to the interface. -+ * -+ * Make an exception for the legacy SIOCSIF* requests. Drivers -+ * trust SIOCSIFADDR et al to come from an already privileged -+ * layer, and do not perform any credentials checks or input -+ * validation. -+ */ - #ifndef COMPAT_43 - error = ((*so->so_proto->pr_usrreqs->pru_control)(so, cmd, - data, - ifp, td)); -- if (error == EOPNOTSUPP && ifp != NULL && ifp->if_ioctl != NULL) -+ if (error == EOPNOTSUPP && ifp != NULL && ifp->if_ioctl != NULL && -+ cmd != SIOCSIFADDR && cmd != SIOCSIFBRDADDR && -+ cmd != SIOCSIFDSTADDR && cmd != SIOCSIFNETMASK) - error = (*ifp->if_ioctl)(ifp, cmd, data); - #else - { -@@ -2601,7 +2613,9 @@ - data, - ifp, td)); - if (error == EOPNOTSUPP && ifp != NULL && -- ifp->if_ioctl != NULL) -+ ifp->if_ioctl != NULL && -+ cmd != SIOCSIFADDR && cmd != SIOCSIFBRDADDR && -+ cmd != SIOCSIFDSTADDR && cmd != SIOCSIFNETMASK) - error = (*ifp->if_ioctl)(ifp, cmd, data); - switch (ocmd) { - -Index: sys/netinet6/in6.c -=================================================================== ---- sys/netinet6/in6.c (revision 254941) -+++ sys/netinet6/in6.c (working copy) -@@ -431,6 +431,18 @@ - case SIOCGIFSTAT_ICMP6: - sa6 = &ifr->ifr_addr; - break; -+ case SIOCSIFADDR: -+ case SIOCSIFBRDADDR: -+ case SIOCSIFDSTADDR: -+ case SIOCSIFNETMASK: -+ /* -+ * Although we should pass any non-INET6 ioctl requests -+ * down to driver, we filter some legacy INET requests. -+ * Drivers trust SIOCSIFADDR et al to come from an already -+ * privileged layer, and do not perform any credentials -+ * checks or input validation. -+ */ -+ return (EINVAL); - default: - sa6 = NULL; - break; -Index: sys/netnatm/natm.c -=================================================================== ---- sys/netnatm/natm.c (revision 254941) -+++ sys/netnatm/natm.c (working copy) -@@ -339,6 +339,21 @@ - npcb = (struct natmpcb *)so->so_pcb; - KASSERT(npcb != NULL, ("natm_usr_control: npcb == NULL")); - -+ switch (cmd) { -+ case SIOCSIFADDR: -+ case SIOCSIFBRDADDR: -+ case SIOCSIFDSTADDR: -+ case SIOCSIFNETMASK: -+ /* -+ * Although we should pass any non-ATM ioctl requests -+ * down to driver, we filter some legacy INET requests. -+ * Drivers trust SIOCSIFADDR et al to come from an already -+ * privileged layer, and do not perform any credentials -+ * checks or input validation. -+ */ -+ return (EINVAL); -+ } -+ - if (ifp == NULL || ifp->if_ioctl == NULL) - return (EOPNOTSUPP); - return ((*ifp->if_ioctl)(ifp, cmd, arg)); diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5710.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5710.patch deleted file mode 100644 index 83f30e84fe9..00000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5710.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: sys/fs/nullfs/null_vnops.c -=================================================================== ---- sys/fs/nullfs/null_vnops.c (revision 254941) -+++ sys/fs/nullfs/null_vnops.c (working copy) -@@ -858,6 +858,15 @@ - return (error); - } - -+static int -+null_link(struct vop_link_args *ap) -+{ -+ -+ if (ap->a_tdvp->v_mount != ap->a_vp->v_mount) -+ return (EXDEV); -+ return (null_bypass((struct vop_generic_args *)ap)); -+} -+ - /* - * Global vfs data structures - */ -@@ -871,6 +880,7 @@ - .vop_getwritemount = null_getwritemount, - .vop_inactive = null_inactive, - .vop_islocked = vop_stdislocked, -+ .vop_link = null_link, - .vop_lock1 = null_lock, - .vop_lookup = null_lookup, - .vop_open = null_open, diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2014-1453.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2014-1453.patch deleted file mode 100644 index fe9e97efd29..00000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2014-1453.patch +++ /dev/null @@ -1,70 +0,0 @@ -Index: sys/fs/nfsserver/nfs_nfsdserv.c -=================================================================== ---- sys/fs/nfsserver/nfs_nfsdserv.c (revision 264251) -+++ sys/fs/nfsserver/nfs_nfsdserv.c (working copy) -@@ -1457,10 +1457,23 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr - nfsvno_relpathbuf(&fromnd); - goto out; - } -+ /* -+ * Unlock dp in this code section, so it is unlocked before -+ * tdp gets locked. This avoids a potential LOR if tdp is the -+ * parent directory of dp. -+ */ - if (nd->nd_flag & ND_NFSV4) { - tdp = todp; - tnes = *toexp; -- tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, nd->nd_cred, p, 0); -+ if (dp != tdp) { -+ NFSVOPUNLOCK(dp, 0); -+ tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, nd->nd_cred, -+ p, 0); /* Might lock tdp. */ -+ } else { -+ tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, nd->nd_cred, -+ p, 1); -+ NFSVOPUNLOCK(dp, 0); -+ } - } else { - tfh.nfsrvfh_len = 0; - error = nfsrv_mtofh(nd, &tfh); -@@ -1481,10 +1494,12 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr - tnes = *exp; - tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, nd->nd_cred, - p, 1); -+ NFSVOPUNLOCK(dp, 0); - } else { -+ NFSVOPUNLOCK(dp, 0); - nd->nd_cred->cr_uid = nd->nd_saveduid; - nfsd_fhtovp(nd, &tfh, LK_EXCLUSIVE, &tdp, &tnes, NULL, -- 0, p); -+ 0, p); /* Locks tdp. */ - if (tdp) { - tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, - nd->nd_cred, p, 1); -@@ -1499,7 +1514,7 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr - if (error) { - if (tdp) - vrele(tdp); -- vput(dp); -+ vrele(dp); - nfsvno_relpathbuf(&fromnd); - nfsvno_relpathbuf(&tond); - goto out; -@@ -1514,7 +1529,7 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr - } - if (tdp) - vrele(tdp); -- vput(dp); -+ vrele(dp); - nfsvno_relpathbuf(&fromnd); - nfsvno_relpathbuf(&tond); - goto out; -@@ -1523,7 +1538,7 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr - /* - * Done parsing, now down to business. - */ -- nd->nd_repstat = nfsvno_namei(nd, &fromnd, dp, 1, exp, p, &fdirp); -+ nd->nd_repstat = nfsvno_namei(nd, &fromnd, dp, 0, exp, p, &fdirp); - if (nd->nd_repstat) { - if (nd->nd_flag & ND_NFSV3) { - nfsrv_wcc(nd, fdirfor_ret, &fdirfor, fdiraft_ret, diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-exec.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-exec.patch deleted file mode 100644 index c36bed59b39..00000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-exec.patch +++ /dev/null @@ -1,66 +0,0 @@ -Index: sys/kern/kern_exec.c -=================================================================== ---- sys/kern/kern_exec.c (revision 266979) -+++ sys/kern/kern_exec.c (working copy) -@@ -280,6 +280,7 @@ kern_execve(td, args, mac_p) - struct mac *mac_p; - { - struct proc *p = td->td_proc; -+ struct vmspace *oldvmspace; - int error; - - AUDIT_ARG_ARGV(args->begin_argv, args->argc, -@@ -296,6 +297,8 @@ kern_execve(td, args, mac_p) - PROC_UNLOCK(p); - } - -+ KASSERT((td->td_pflags & TDP_EXECVMSPC) == 0, ("nested execve")); -+ oldvmspace = td->td_proc->p_vmspace; - error = do_execve(td, args, mac_p); - - if (p->p_flag & P_HADTHREADS) { -@@ -310,6 +313,12 @@ kern_execve(td, args, mac_p) - thread_single_end(); - PROC_UNLOCK(p); - } -+ if ((td->td_pflags & TDP_EXECVMSPC) != 0) { -+ KASSERT(td->td_proc->p_vmspace != oldvmspace, -+ ("oldvmspace still used")); -+ vmspace_free(oldvmspace); -+ td->td_pflags &= ~TDP_EXECVMSPC; -+ } - - return (error); - } -Index: sys/sys/proc.h -=================================================================== ---- sys/sys/proc.h (revision 266979) -+++ sys/sys/proc.h (working copy) -@@ -968,4 +968,5 @@ curthread_pflags_restore(int save) - - #endif /* _KERNEL */ - -+#define TDP_EXECVMSPC 0x40000000 /* Execve destroyed old vmspace */ - #endif /* !_SYS_PROC_H_ */ -Index: sys/vm/vm_map.c -=================================================================== ---- sys/vm/vm_map.c (revision 266979) -+++ sys/vm/vm_map.c (working copy) -@@ -3631,6 +3631,8 @@ vmspace_exec(struct proc *p, vm_offset_t minuser, - struct vmspace *oldvmspace = p->p_vmspace; - struct vmspace *newvmspace; - -+ KASSERT((curthread->td_pflags & TDP_EXECVMSPC) == 0, -+ ("vmspace_exec recursed")); - newvmspace = vmspace_alloc(minuser, maxuser); - if (newvmspace == NULL) - return (ENOMEM); -@@ -3647,7 +3649,7 @@ vmspace_exec(struct proc *p, vm_offset_t minuser, - PROC_VMSPACE_UNLOCK(p); - if (p == curthread->td_proc) - pmap_activate(curthread); -- vmspace_free(oldvmspace); -+ curthread->td_pflags |= TDP_EXECVMSPC; - return (0); - } - diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-gentoo.patch deleted file mode 100644 index b02d8b68870..00000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-gentoo.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nur sys.orig/conf/kern.mk sys/conf/kern.mk ---- sys.orig/conf/kern.mk 2012-07-12 13:26:37.000000000 +0900 -+++ sys/conf/kern.mk 2012-07-16 02:32:19.000000000 +0900 -@@ -5,7 +5,7 @@ - # - CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ - -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ -- -Wundef -Wno-pointer-sign -fformat-extensions \ -+ -Wundef -Wno-pointer-sign \ - -Wmissing-include-dirs -fdiagnostics-show-option \ - ${CWARNEXTRA} - # -@@ -52,7 +52,7 @@ - # - .if ${MACHINE_CPUARCH} == "i386" - .if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang" --CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 -+CFLAGS+= -mpreferred-stack-boundary=2 - .else - CFLAGS+= -mno-aes -mno-avx - .endif diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ktrace.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ktrace.patch deleted file mode 100644 index 0fb6df7600e..00000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ktrace.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: sys/kern/kern_ktrace.c -=================================================================== ---- sys/kern/kern_ktrace.c (revision 266771) -+++ sys/kern/kern_ktrace.c (working copy) -@@ -119,6 +119,7 @@ static int data_lengths[] = { - 0, /* KTR_SYSCTL */ - sizeof(struct ktr_proc_ctor), /* KTR_PROCCTOR */ - 0, /* KTR_PROCDTOR */ -+ 0, /* unused */ - sizeof(struct ktr_fault), /* KTR_FAULT */ - sizeof(struct ktr_faultend), /* KTR_FAULTEND */ - }; diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap-2014.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap-2014.patch deleted file mode 100644 index fd4040a8816..00000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap-2014.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: sys/vm/vm_map.c -=================================================================== ---- sys/vm/vm_map.c (revision 259950) -+++ sys/vm/vm_map.c (revision 259951) -@@ -1207,6 +1207,7 @@ charged: - } - else if ((prev_entry != &map->header) && - (prev_entry->eflags == protoeflags) && -+ (cow & (MAP_ENTRY_GROWS_DOWN | MAP_ENTRY_GROWS_UP)) == 0 && - (prev_entry->end == start) && - (prev_entry->wired_count == 0) && - (prev_entry->cred == cred || -@@ -3339,7 +3340,6 @@ vm_map_stack(vm_map_t map, vm_offset_t addrbos, vm - * NOTE: We explicitly allow bi-directional stacks. - */ - orient = cow & (MAP_STACK_GROWS_DOWN|MAP_STACK_GROWS_UP); -- cow &= ~orient; - KASSERT(orient != 0, ("No stack grow direction")); - - if (addrbos < vm_map_min(map) || diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap.patch deleted file mode 100644 index ef2d0a78206..00000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap.patch +++ /dev/null @@ -1,20 +0,0 @@ -http://www.freebsd.org/security/advisories/FreeBSD-SA-13:06.mmap.asc -https://bugs.gentoo.org/show_bug.cgi?id=473688 - -Index: sys/vm/vm_map.c -=================================================================== ---- sys/vm/vm_map.c (revision 251636) -+++ sys/vm/vm_map.c (working copy) -@@ -3761,6 +3761,12 @@ RetryLookup:; - vm_map_unlock_read(map); - return (KERN_PROTECTION_FAILURE); - } -+ if ((fault_typea & VM_PROT_COPY) != 0 && -+ (entry->max_protection & VM_PROT_WRITE) == 0 && -+ (entry->eflags & MAP_ENTRY_COW) == 0) { -+ vm_map_unlock_read(map); -+ return (KERN_PROTECTION_FAILURE); -+ } - - /* - * If this page is not pageable, we have to get it for all possible diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-nfsserver.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-nfsserver.patch deleted file mode 100644 index 767588fc86f..00000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-nfsserver.patch +++ /dev/null @@ -1,16 +0,0 @@ -http://www.freebsd.org/security/advisories/FreeBSD-SA-13:08.nfsserver.asc -https://bugs.gentoo.org/show_bug.cgi?id=478314 - -Index: sys/kern/vfs_export.c -=================================================================== ---- sys/kern/vfs_export.c (revision 253367) -+++ sys/kern/vfs_export.c (working copy) -@@ -208,7 +208,7 @@ - np->netc_anon = crget(); - np->netc_anon->cr_uid = argp->ex_anon.cr_uid; - crsetgroups(np->netc_anon, argp->ex_anon.cr_ngroups, -- np->netc_anon->cr_groups); -+ argp->ex_anon.cr_groups); - np->netc_anon->cr_prison = &prison0; - prison_hold(np->netc_anon->cr_prison); - np->netc_numsecflavors = argp->ex_numsecflavors; diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-random.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-random.patch deleted file mode 100644 index bb3caba0013..00000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-random.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: sys/dev/random/probe.c -=================================================================== ---- sys/dev/random/probe.c (revision 260523) -+++ sys/dev/random/probe.c (working copy) -@@ -30,6 +30,8 @@ __FBSDID("$FreeBSD$"); - - #include <sys/types.h> - #include <sys/param.h> -+#include <sys/systm.h> -+#include <sys/kernel.h> - #include <sys/malloc.h> - #include <sys/random.h> - #include <sys/selinfo.h> -@@ -57,7 +59,12 @@ random_ident_hardware(struct random_systat *systat - /* Then go looking for hardware */ - #if defined(__amd64__) || (defined(__i386__) && !defined(PC98)) - if (via_feature_rng & VIA_HAS_RNG) { -- *systat = random_nehemiah; -+ int enable; -+ -+ enable = 0; -+ TUNABLE_INT_FETCH("hw.nehemiah_rng_enable", &enable); -+ if (enable) -+ *systat = random_nehemiah; - } - #endif - } diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-tcp.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-tcp.patch deleted file mode 100644 index 2f82a5f98a5..00000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-tcp.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: sys/netinet/tcp_reass.c -=================================================================== ---- sys/netinet/tcp_reass.c (revision 264836) -+++ sys/netinet/tcp_reass.c (working copy) -@@ -211,7 +211,7 @@ tcp_reass(struct tcpcb *tp, struct tcphdr *th, int - * Investigate why and re-evaluate the below limit after the behaviour - * is understood. - */ -- if (th->th_seq != tp->rcv_nxt && -+ if ((th->th_seq != tp->rcv_nxt || !TCPS_HAVEESTABLISHED(tp->t_state)) && - tp->t_segqlen >= (so->so_rcv.sb_hiwat / tp->t_maxseg) + 1) { - V_tcp_reass_overflows++; - TCPSTAT_INC(tcps_rcvmemdrop); -@@ -234,7 +234,7 @@ tcp_reass(struct tcpcb *tp, struct tcphdr *th, int - */ - te = uma_zalloc(V_tcp_reass_zone, M_NOWAIT); - if (te == NULL) { -- if (th->th_seq != tp->rcv_nxt) { -+ if (th->th_seq != tp->rcv_nxt || !TCPS_HAVEESTABLISHED(tp->t_state)) { - TCPSTAT_INC(tcps_rcvmemdrop); - m_freem(m); - *tlenp = 0; -@@ -282,7 +282,8 @@ tcp_reass(struct tcpcb *tp, struct tcphdr *th, int - TCPSTAT_INC(tcps_rcvduppack); - TCPSTAT_ADD(tcps_rcvdupbyte, *tlenp); - m_freem(m); -- uma_zfree(V_tcp_reass_zone, te); -+ if (te != &tqs) -+ uma_zfree(V_tcp_reass_zone, te); - tp->t_segqlen--; - /* - * Try to present any queued data
