svn commit: r301051 - in releng/10.2: . sys/compat/linux sys/conf sys/kern

[Gleb Smirnoff]

Author: glebius
Date: Tue May 31 16:55:45 2016
New Revision: 301051
URL: https://svnweb.freebsd.org/changeset/base/301051

Log:
  Fix kernel stack disclosure in Linux compatibility layer. [SA-16:20]
  Fix kernel stack disclosure in 4.3BSD compatibility layer. [SA-16:21]
  
  Security:	SA-16:20
  Security:	SA-16:21
  Approved by:	so

Modified:
  releng/10.2/UPDATING
  releng/10.2/sys/compat/linux/linux_ioctl.c
  releng/10.2/sys/compat/linux/linux_misc.c
  releng/10.2/sys/conf/newvers.sh
  releng/10.2/sys/kern/vfs_syscalls.c

Modified: releng/10.2/UPDATING
==============================================================================
--- releng/10.2/UPDATING	Tue May 31 16:55:41 2016	(r301050)
+++ releng/10.2/UPDATING	Tue May 31 16:55:45 2016	(r301051)
@@ -16,6 +16,14 @@ 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.
 
+20160531	p18	FreeBSD-SA-16:20.linux
+			FreeBSD-SA-16:21.43bsd
+			FreeBSD-SA-16:22.libarchive
+
+	Fix kernel stack disclosure in Linux compatibility layer. [SA-16:20]
+	Fix kernel stack disclosure in 4.3BSD compatibility layer. [SA-16:21]
+	Fix directory traversal in cpio(1). [SA-16:22]
+
 20160517	p17	FreeBSD-SA-16:18.atkbd
 			FreeBSD-SA-16:19.sendmsg
 

Modified: releng/10.2/sys/compat/linux/linux_ioctl.c
==============================================================================
--- releng/10.2/sys/compat/linux/linux_ioctl.c	Tue May 31 16:55:41 2016	(r301050)
+++ releng/10.2/sys/compat/linux/linux_ioctl.c	Tue May 31 16:55:45 2016	(r301051)
@@ -919,6 +919,8 @@ linux_ioctl_termio(struct thread *td, st
 
 	case LINUX_TIOCGSERIAL: {
 		struct linux_serial_struct lss;
+
+		bzero(&lss, sizeof(lss));
 		lss.type = LINUX_PORT_16550A;
 		lss.flags = 0;
 		lss.close_delay = 0;

Modified: releng/10.2/sys/compat/linux/linux_misc.c
==============================================================================
--- releng/10.2/sys/compat/linux/linux_misc.c	Tue May 31 16:55:41 2016	(r301050)
+++ releng/10.2/sys/compat/linux/linux_misc.c	Tue May 31 16:55:45 2016	(r301051)
@@ -138,6 +138,7 @@ linux_sysinfo(struct thread *td, struct 
 	int i, j;
 	struct timespec ts;
 
+	bzero(&sysinfo, sizeof(sysinfo));
 	getnanouptime(&ts);
 	if (ts.tv_nsec != 0)
 		ts.tv_sec++;

Modified: releng/10.2/sys/conf/newvers.sh
==============================================================================
--- releng/10.2/sys/conf/newvers.sh	Tue May 31 16:55:41 2016	(r301050)
+++ releng/10.2/sys/conf/newvers.sh	Tue May 31 16:55:45 2016	(r301051)
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="10.2"
-BRANCH="RELEASE-p17"
+BRANCH="RELEASE-p18"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi

Modified: releng/10.2/sys/kern/vfs_syscalls.c
==============================================================================
--- releng/10.2/sys/kern/vfs_syscalls.c	Tue May 31 16:55:41 2016	(r301050)
+++ releng/10.2/sys/kern/vfs_syscalls.c	Tue May 31 16:55:45 2016	(r301051)
@@ -2195,6 +2195,7 @@ cvtstat(st, ost)
 	struct ostat *ost;
 {
 
+	bzero(ost, sizeof(*ost));
 	ost->st_dev = st->st_dev;
 	ost->st_ino = st->st_ino;
 	ost->st_mode = st->st_mode;