Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 4 Nov 2015 11:27:13 +0000 (UTC)
From:      Gleb Smirnoff <glebius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org
Subject:   svn commit: r290361 - in releng/10.2: . sys/conf sys/sys sys/vm usr.sbin/ntp
Message-ID:  <201511041127.tA4BRDZ8069861@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: glebius
Date: Wed Nov  4 11:27:13 2015
New Revision: 290361
URL: https://svnweb.freebsd.org/changeset/base/290361

Log:
  o Fix regressions related to SA-15:25 upgrade of NTP. [1]
  o Fix kqueue write events never fired for files greater 2GB. [2]
  o Fix kpplications exiting due to segmentation violation on a correct
    memory address. [3]
  
  PR:		204046 [1]
  PR:		204203 [1]
  Errata Notice:	FreeBSD-EN-15:19.kqueue [2]
  Errata Notice:	FreeBSD-EN-15:20.vm [3]
  Approved by:	so

Modified:
  releng/10.2/UPDATING
  releng/10.2/sys/conf/newvers.sh
  releng/10.2/sys/sys/vnode.h
  releng/10.2/sys/vm/vm_map.c
  releng/10.2/usr.sbin/ntp/config.h
Directory Properties:
  releng/10.2/   (props changed)

Modified: releng/10.2/UPDATING
==============================================================================
--- releng/10.2/UPDATING	Wed Nov  4 10:42:51 2015	(r290360)
+++ releng/10.2/UPDATING	Wed Nov  4 11:27:13 2015	(r290361)
@@ -16,6 +16,18 @@ from older versions of FreeBSD, try WITH
 stable/10, and then rebuild without this option. The bootstrap process from
 older version of current is a bit fragile.
 
+20151104	p7	FreeBSD-SA-15:25.ntp [revised]
+			FreeBSD-EN-15:19.kqueue
+			FreeBSD-EN-15:20.vm
+
+	Fix regression in ntpd(8) lacking support for RAWDCF reference
+	clock in 10.2-RELEASE-p6. [SA-15:25]
+
+	Fix kqueue write events never fired for files greater 2GB. [EN-15:19]
+
+	Fix applications exiting due to segmentation violation on a correct
+	memory address. [EN-15:20.vm]
+
 20151026:	p6	FreeBSD-SA-15:25.ntp
 
 	Fix multiple NTP vulnerabilities. New NTP version is 4.2.8p4.

Modified: releng/10.2/sys/conf/newvers.sh
==============================================================================
--- releng/10.2/sys/conf/newvers.sh	Wed Nov  4 10:42:51 2015	(r290360)
+++ releng/10.2/sys/conf/newvers.sh	Wed Nov  4 11:27:13 2015	(r290361)
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="10.2"
-BRANCH="RELEASE-p6"
+BRANCH="RELEASE-p7"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi

Modified: releng/10.2/sys/sys/vnode.h
==============================================================================
--- releng/10.2/sys/sys/vnode.h	Wed Nov  4 10:42:51 2015	(r290360)
+++ releng/10.2/sys/sys/vnode.h	Wed Nov  4 11:27:13 2015	(r290361)
@@ -787,7 +787,8 @@ void	vop_rename_fail(struct vop_rename_a
 
 #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)) {				\
@@ -795,7 +796,7 @@ void	vop_rename_fail(struct vop_rename_a
 		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)						\

Modified: releng/10.2/sys/vm/vm_map.c
==============================================================================
--- releng/10.2/sys/vm/vm_map.c	Wed Nov  4 10:42:51 2015	(r290360)
+++ releng/10.2/sys/vm/vm_map.c	Wed Nov  4 11:27:13 2015	(r290361)
@@ -3988,12 +3988,10 @@ RetryLookup:;
 		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) {
@@ -4147,10 +4145,6 @@ vm_map_lookup_locked(vm_map_t *var_map,	
 	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: releng/10.2/usr.sbin/ntp/config.h
==============================================================================
--- releng/10.2/usr.sbin/ntp/config.h	Wed Nov  4 10:42:51 2015	(r290360)
+++ releng/10.2/usr.sbin/ntp/config.h	Wed Nov  4 11:27:13 2015	(r290361)
@@ -120,7 +120,7 @@
 #define CLOCK_PST 1
 
 /* DCF77 raw time code */
-/* #undef CLOCK_RAWDCF */
+#define CLOCK_RAWDCF 1
 
 /* RCC 8000 clock */
 /* #undef CLOCK_RCC8000 */

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511041127.tA4BRDZ8069861>