svn commit: r290363 - in releng/9.3: . sys/conf sys/sys sys/vm usr.sbin/ntp usr.sbin/ntp/ntpdc usr.sbin/ntp/ntpq
Gleb Smirnoff
glebius at FreeBSD.org
Wed Nov 4 11:27:33 UTC 2015
Author: glebius
Date: Wed Nov 4 11:27:30 2015
New Revision: 290363
URL: https://svnweb.freebsd.org/changeset/base/290363
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/9.3/UPDATING
releng/9.3/sys/conf/newvers.sh
releng/9.3/sys/sys/vnode.h
releng/9.3/sys/vm/vm_map.c
releng/9.3/usr.sbin/ntp/config.h
releng/9.3/usr.sbin/ntp/ntpdc/Makefile
releng/9.3/usr.sbin/ntp/ntpq/Makefile
Directory Properties:
releng/9.3/sys/ (props changed)
releng/9.3/usr.sbin/ntp/ (props changed)
Modified: releng/9.3/UPDATING
==============================================================================
--- releng/9.3/UPDATING Wed Nov 4 11:27:21 2015 (r290362)
+++ releng/9.3/UPDATING Wed Nov 4 11:27:30 2015 (r290363)
@@ -11,6 +11,21 @@ handbook:
Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before running portupgrade.
+20151104 p30 FreeBSD-SA-15:25.ntp [revised]
+ FreeBSD-EN-15:19.kqueue
+ FreeBSD-EN-15:20.vm
+
+ Fix regression of ntpq(8) utility exiting due to trap 6 in
+ 9.3-RELEASE-p29. [SA-15:25]
+
+ Fix regression in ntpd(8) lacking support for RAWDCF reference
+ clock in 9.3-RELEASE-p29. [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]
+
20151026: p29 FreeBSD-SA-15:25.ntp
Fix multiple NTP vulnerabilities. New NTP version is 4.2.8p4.
Modified: releng/9.3/sys/conf/newvers.sh
==============================================================================
--- releng/9.3/sys/conf/newvers.sh Wed Nov 4 11:27:21 2015 (r290362)
+++ releng/9.3/sys/conf/newvers.sh Wed Nov 4 11:27:30 2015 (r290363)
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="9.3"
-BRANCH="RELEASE-p29"
+BRANCH="RELEASE-p30"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
Modified: releng/9.3/sys/sys/vnode.h
==============================================================================
--- releng/9.3/sys/sys/vnode.h Wed Nov 4 11:27:21 2015 (r290362)
+++ releng/9.3/sys/sys/vnode.h Wed Nov 4 11:27:30 2015 (r290363)
@@ -768,7 +768,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)) { \
@@ -776,7 +777,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/9.3/sys/vm/vm_map.c
==============================================================================
--- releng/9.3/sys/vm/vm_map.c Wed Nov 4 11:27:21 2015 (r290362)
+++ releng/9.3/sys/vm/vm_map.c Wed Nov 4 11:27:30 2015 (r290363)
@@ -3878,12 +3878,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) {
@@ -4037,10 +4035,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/9.3/usr.sbin/ntp/config.h
==============================================================================
--- releng/9.3/usr.sbin/ntp/config.h Wed Nov 4 11:27:21 2015 (r290362)
+++ releng/9.3/usr.sbin/ntp/config.h Wed Nov 4 11:27:30 2015 (r290363)
@@ -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 */
Modified: releng/9.3/usr.sbin/ntp/ntpdc/Makefile
==============================================================================
--- releng/9.3/usr.sbin/ntp/ntpdc/Makefile Wed Nov 4 11:27:21 2015 (r290362)
+++ releng/9.3/usr.sbin/ntp/ntpdc/Makefile Wed Nov 4 11:27:30 2015 (r290363)
@@ -17,8 +17,8 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/n
-I${.CURDIR}/../../../lib/libc/${MACHINE_ARCH} \
-I${.CURDIR}/../ -I${.CURDIR}
-DPADD= ${LIBNTP} ${LIBM} ${LIBOPTS} ${LIBEDIT} ${LIBTERMCAP}
-LDADD= ${LIBNTP} -lm ${LIBOPTS} -ledit -ltermcap
+DPADD= ${LIBNTP} ${LIBM} ${LIBOPTS} ${LIBEDIT} ${LIBTERMCAP} ${LIBPTHREAD}
+LDADD= ${LIBNTP} -lm ${LIBOPTS} -ledit -ltermcap -lpthread
CFLAGS+= -DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \
-I${DESTDIR}/${INCLUDEDIR}/edit
Modified: releng/9.3/usr.sbin/ntp/ntpq/Makefile
==============================================================================
--- releng/9.3/usr.sbin/ntp/ntpq/Makefile Wed Nov 4 11:27:21 2015 (r290362)
+++ releng/9.3/usr.sbin/ntp/ntpq/Makefile Wed Nov 4 11:27:30 2015 (r290363)
@@ -20,8 +20,8 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/n
-I${.CURDIR}/../../../contrib/ntp/sntp/libopts \
-I${.CURDIR}/../
-DPADD= ${LIBEDIT} ${LIBNTP} ${LIBM} ${LIBOPTS}
-LDADD= -ledit ${LIBNTP} -lm ${LIBOPTS}
+DPADD= ${LIBEDIT} ${LIBNTP} ${LIBM} ${LIBOPTS} ${LIBPTHREAD}
+LDADD= -ledit ${LIBNTP} -lm ${LIBOPTS} -lpthread
.if ${MK_OPENSSL} != "no"
DPADD+= ${LIBCRYPTO}
More information about the svn-src-all
mailing list