[Glibc-bsd-commits] r5829 - in branches/jessie/kfreebsd-10/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2015-11-04 22:53:30 +0000 (Wed, 04 Nov 2015)
New Revision: 5829

Added:
   branches/jessie/kfreebsd-10/debian/patches/EN-15_19.kqueue.patch
   branches/jessie/kfreebsd-10/debian/patches/EN-15_20.vm.patch
Modified:
   branches/jessie/kfreebsd-10/debian/changelog
   branches/jessie/kfreebsd-10/debian/patches/series
Log:
Pick SVN r290362 from FreeBSD 10.1-RELEASE:
- EN-15:19: Fix kqueue write events never fired for files greater than 2GB.
- EN-15:20: Fix applications exiting due to segmentation violation on a
  correct memory address.


Modified: branches/jessie/kfreebsd-10/debian/changelog
===================================================================
--- branches/jessie/kfreebsd-10/debian/changelog	2015-11-02 19:42:44 UTC (rev 5828)
+++ branches/jessie/kfreebsd-10/debian/changelog	2015-11-04 22:53:30 UTC (rev 5829)
@@ -14,6 +14,10 @@
       (CVE-2015-5675) (Closes: #796996)
     - EN-15:14: Disabled ixgbe(4) flow-director support, due to an 
       implementation bug.
+  * Pick SVN r290362 from FreeBSD 10.1-RELEASE:
+    - EN-15:19: Fix kqueue write events never fired for files greater than 2GB.
+    - EN-15:20: Fix applications exiting due to segmentation violation on a
+      correct memory address.
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Sat, 23 May 2015 14:57:14 +0100
 

Added: branches/jessie/kfreebsd-10/debian/patches/EN-15_19.kqueue.patch
===================================================================
--- branches/jessie/kfreebsd-10/debian/patches/EN-15_19.kqueue.patch	                        (rev 0)
+++ branches/jessie/kfreebsd-10/debian/patches/EN-15_19.kqueue.patch	2015-11-04 22:53:30 UTC (rev 5829)
@@ -0,0 +1,28 @@
+Description:
+ Fix kqueue write events never fired for files greater than 2GB.
+ [EN-15:19]
+Origin: vendor
+Bug: https://www.freebsd.org/security/advisories/FreeBSD-EN-15:19.kqueue.asc
+Applied-Upstream: https://svnweb.freebsd.org/base?view=revision&revision=290362
+
+--- a/sys/sys/vnode.h
++++ b/sys/sys/vnode.h
+@@ -781,7 +781,8 @@
+ 
+ #define	VOP_WRITE_PRE(ap)						\
+ 	struct vattr va;						\
+-	int error, osize, ooffset, noffset;				\
++	int error;							\
++	off_t osize, ooffset, noffset;					\
+ 									\
+ 	osize = ooffset = noffset = 0;					\
+ 	if (!VN_KNLIST_EMPTY((ap)->a_vp)) {				\
+@@ -789,7 +790,7 @@
+ 		if (error)						\
+ 			return (error);					\
+ 		ooffset = (ap)->a_uio->uio_offset;			\
+-		osize = va.va_size;					\
++		osize = (off_t)va.va_size;				\
+ 	}
+ 
+ #define VOP_WRITE_POST(ap, ret)						\

Added: branches/jessie/kfreebsd-10/debian/patches/EN-15_20.vm.patch
===================================================================
--- branches/jessie/kfreebsd-10/debian/patches/EN-15_20.vm.patch	                        (rev 0)
+++ branches/jessie/kfreebsd-10/debian/patches/EN-15_20.vm.patch	2015-11-04 22:53:30 UTC (rev 5829)
@@ -0,0 +1,38 @@
+Description:
+ Fix applications exiting due to segmentation violation on a correct
+ memory address. [EN-15:20]
+Origin: vendor
+Bug: https://www.freebsd.org/security/advisories/FreeBSD-EN-15:20.vm.asc
+Applied-Upstream: https://svnweb.freebsd.org/base?view=revision&revision=290362
+
+--- a/sys/vm/vm_map.c
++++ b/sys/vm/vm_map.c
+@@ -3976,12 +3976,10 @@
+ 		vm_map_unlock_read(map);
+ 		return (KERN_PROTECTION_FAILURE);
+ 	}
+-	if ((entry->eflags & MAP_ENTRY_USER_WIRED) &&
+-	    (entry->eflags & MAP_ENTRY_COW) &&
+-	    (fault_type & VM_PROT_WRITE)) {
+-		vm_map_unlock_read(map);
+-		return (KERN_PROTECTION_FAILURE);
+-	}
++	KASSERT((prot & VM_PROT_WRITE) == 0 || (entry->eflags &
++	    (MAP_ENTRY_USER_WIRED | MAP_ENTRY_NEEDS_COPY)) !=
++	    (MAP_ENTRY_USER_WIRED | MAP_ENTRY_NEEDS_COPY),
++	    ("entry %p flags %x", entry, entry->eflags));
+ 	if ((fault_typea & VM_PROT_COPY) != 0 &&
+ 	    (entry->max_protection & VM_PROT_WRITE) == 0 &&
+ 	    (entry->eflags & MAP_ENTRY_COW) == 0) {
+@@ -4135,10 +4133,6 @@
+ 	fault_type &= VM_PROT_READ | VM_PROT_WRITE | VM_PROT_EXECUTE;
+ 	if ((fault_type & prot) != fault_type)
+ 		return (KERN_PROTECTION_FAILURE);
+-	if ((entry->eflags & MAP_ENTRY_USER_WIRED) &&
+-	    (entry->eflags & MAP_ENTRY_COW) &&
+-	    (fault_type & VM_PROT_WRITE))
+-		return (KERN_PROTECTION_FAILURE);
+ 
+ 	/*
+ 	 * If this page is not pageable, we have to get it for all possible
+

Modified: branches/jessie/kfreebsd-10/debian/patches/series
===================================================================
--- branches/jessie/kfreebsd-10/debian/patches/series	2015-11-02 19:42:44 UTC (rev 5828)
+++ branches/jessie/kfreebsd-10/debian/patches/series	2015-11-04 22:53:30 UTC (rev 5829)
@@ -46,3 +46,5 @@
 EN-15_05.ufs.patch
 EN-15_14.ixgbe.patch
 SA-15_21.amd64.patch
+EN-15_19.kqueue.patch
+EN-15_20.vm.patch