[Midnightbsd-cvs] src [7622] stable/0.8/sys: Security updates for libarchive, linux emulation and stat(2) in compat bsd43.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue May 31 18:35:12 EDT 2016
Revision: 7622
http://svnweb.midnightbsd.org/src/?rev=7622
Author: laffer1
Date: 2016-05-31 18:35:12 -0400 (Tue, 31 May 2016)
Log Message:
-----------
Security updates for libarchive, linux emulation and stat(2) in compat bsd43.
Modified Paths:
--------------
stable/0.8/contrib/libarchive/cpio/bsdcpio.1
stable/0.8/contrib/libarchive/cpio/cpio.c
stable/0.8/contrib/libarchive/libarchive/archive.h
stable/0.8/contrib/libarchive/libarchive/archive_write.c
stable/0.8/contrib/libarchive/libarchive/archive_write_disk.3
stable/0.8/contrib/libarchive/libarchive/archive_write_disk.c
stable/0.8/contrib/libarchive/libarchive/test/test_write_disk_secure.c
stable/0.8/sys/compat/linux/linux_ioctl.c
stable/0.8/sys/compat/linux/linux_misc.c
stable/0.8/sys/kern/vfs_syscalls.c
Property Changed:
----------------
stable/0.8/
stable/0.8/contrib/libarchive/
stable/0.8/sys/compat/linux/linux_ioctl.c
Index: stable/0.8
===================================================================
--- stable/0.8 2016-05-31 22:14:01 UTC (rev 7621)
+++ stable/0.8 2016-05-31 22:35:12 UTC (rev 7622)
Property changes on: stable/0.8
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:7563-7565
\ No newline at end of property
+/trunk:7563-7565,7613-7616
\ No newline at end of property
Index: stable/0.8/contrib/libarchive
===================================================================
--- stable/0.8/contrib/libarchive 2016-05-31 22:14:01 UTC (rev 7621)
+++ stable/0.8/contrib/libarchive 2016-05-31 22:35:12 UTC (rev 7622)
Property changes on: stable/0.8/contrib/libarchive
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,3 ##
/branches/KIENTZLE/contrib/libarchive:4569-6386
+/trunk/contrib/libarchive:7615-7616
/vendor/libarchive/dist:6387-7251
\ No newline at end of property
Modified: stable/0.8/contrib/libarchive/cpio/bsdcpio.1
===================================================================
--- stable/0.8/contrib/libarchive/cpio/bsdcpio.1 2016-05-31 22:14:01 UTC (rev 7621)
+++ stable/0.8/contrib/libarchive/cpio/bsdcpio.1 2016-05-31 22:35:12 UTC (rev 7622)
@@ -156,7 +156,8 @@
.It Fl Fl insecure
(i and p mode only)
Disable security checks during extraction or copying.
-This allows extraction via symbolic links and path names containing
+This allows extraction via symbolic links, absolute paths,
+and path names containing
.Sq ..
in the name.
.It Fl J , Fl Fl xz
Modified: stable/0.8/contrib/libarchive/cpio/cpio.c
===================================================================
--- stable/0.8/contrib/libarchive/cpio/cpio.c 2016-05-31 22:14:01 UTC (rev 7621)
+++ stable/0.8/contrib/libarchive/cpio/cpio.c 2016-05-31 22:35:12 UTC (rev 7622)
@@ -179,6 +179,7 @@
cpio->extract_flags |= ARCHIVE_EXTRACT_NO_OVERWRITE_NEWER;
cpio->extract_flags |= ARCHIVE_EXTRACT_SECURE_SYMLINKS;
cpio->extract_flags |= ARCHIVE_EXTRACT_SECURE_NODOTDOT;
+ cpio->extract_flags |= ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS;
cpio->extract_flags |= ARCHIVE_EXTRACT_PERM;
cpio->extract_flags |= ARCHIVE_EXTRACT_FFLAGS;
cpio->extract_flags |= ARCHIVE_EXTRACT_ACL;
@@ -264,6 +265,7 @@
case OPTION_INSECURE:
cpio->extract_flags &= ~ARCHIVE_EXTRACT_SECURE_SYMLINKS;
cpio->extract_flags &= ~ARCHIVE_EXTRACT_SECURE_NODOTDOT;
+ cpio->extract_flags &= ~ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS;
break;
case 'L': /* GNU cpio */
cpio->option_follow_links = 1;
@@ -300,6 +302,7 @@
"Cannot use both -p and -%c", cpio->mode);
cpio->mode = opt;
cpio->extract_flags &= ~ARCHIVE_EXTRACT_SECURE_NODOTDOT;
+ cpio->extract_flags &= ~ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS;
break;
case OPTION_PRESERVE_OWNER:
cpio->extract_flags |= ARCHIVE_EXTRACT_OWNER;
Modified: stable/0.8/contrib/libarchive/libarchive/archive.h
===================================================================
--- stable/0.8/contrib/libarchive/libarchive/archive.h 2016-05-31 22:14:01 UTC (rev 7621)
+++ stable/0.8/contrib/libarchive/libarchive/archive.h 2016-05-31 22:35:12 UTC (rev 7622)
@@ -562,6 +562,8 @@
/* Default: Do not use HFS+ compression if it was not compressed. */
/* This has no effect except on Mac OS v10.6 or later. */
#define ARCHIVE_EXTRACT_HFS_COMPRESSION_FORCED (0x8000)
+/* Default: Do not reject entries with absolute paths */
+#define ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS (0x10000)
__LA_DECL int archive_read_extract(struct archive *, struct archive_entry *,
int flags);
Modified: stable/0.8/contrib/libarchive/libarchive/archive_write.c
===================================================================
--- stable/0.8/contrib/libarchive/libarchive/archive_write.c 2016-05-31 22:14:01 UTC (rev 7621)
+++ stable/0.8/contrib/libarchive/libarchive/archive_write.c 2016-05-31 22:35:12 UTC (rev 7622)
@@ -671,8 +671,13 @@
_archive_write_data(struct archive *_a, const void *buff, size_t s)
{
struct archive_write *a = (struct archive_write *)_a;
+ const size_t max_write = INT_MAX;
+
archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
ARCHIVE_STATE_DATA, "archive_write_data");
+ /* In particular, this catches attempts to pass negative values. */
+ if (s > max_write)
+ s = max_write;
archive_clear_error(&a->archive);
return ((a->format_write_data)(a, buff, s));
}
Modified: stable/0.8/contrib/libarchive/libarchive/archive_write_disk.3
===================================================================
--- stable/0.8/contrib/libarchive/libarchive/archive_write_disk.3 2016-05-31 22:14:01 UTC (rev 7621)
+++ stable/0.8/contrib/libarchive/libarchive/archive_write_disk.3 2016-05-31 22:35:12 UTC (rev 7622)
@@ -177,6 +177,9 @@
Note that paths ending in
.Pa ..
always cause an error, regardless of this flag.
+.It Cm ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS
+Refuse to extract an absolute path.
+The default is to not refuse such paths.
.It Cm ARCHIVE_EXTRACT_SPARSE
Scan data for blocks of NUL bytes and try to recreate them with holes.
This results in sparse files, independent of whether the archive format
Modified: stable/0.8/contrib/libarchive/libarchive/archive_write_disk.c
===================================================================
--- stable/0.8/contrib/libarchive/libarchive/archive_write_disk.c 2016-05-31 22:14:01 UTC (rev 7621)
+++ stable/0.8/contrib/libarchive/libarchive/archive_write_disk.c 2016-05-31 22:35:12 UTC (rev 7622)
@@ -1566,8 +1566,9 @@
/*
* Canonicalize the pathname. In particular, this strips duplicate
* '/' characters, '.' elements, and trailing '/'. It also raises an
- * error for an empty path, a trailing '..' or (if _SECURE_NODOTDOT is
- * set) any '..' in the path.
+ * error for an empty path, a trailing '..', (if _SECURE_NODOTDOT is
+ * set) any '..' in the path or (if ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS
+ * is set) if the path is absolute.
*/
static int
cleanup_pathname(struct archive_write_disk *a)
@@ -1586,8 +1587,15 @@
cleanup_pathname_win(a);
#endif
/* Skip leading '/'. */
- if (*src == '/')
+ if (*src == '/') {
+ if (a->flags & ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS) {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+ "Path is absolute");
+ return (ARCHIVE_FAILED);
+ }
+
separator = *src++;
+ }
/* Scan the pathname one element at a time. */
for (;;) {
Modified: stable/0.8/contrib/libarchive/libarchive/test/test_write_disk_secure.c
===================================================================
--- stable/0.8/contrib/libarchive/libarchive/test/test_write_disk_secure.c 2016-05-31 22:14:01 UTC (rev 7621)
+++ stable/0.8/contrib/libarchive/libarchive/test/test_write_disk_secure.c 2016-05-31 22:35:12 UTC (rev 7622)
@@ -180,6 +180,31 @@
assertEqualInt(ARCHIVE_OK, archive_write_free(a));
+ /*
+ * Without security checks, we should be able to
+ * extract an absolute path.
+ */
+ assert((ae = archive_entry_new()) != NULL);
+ archive_entry_copy_pathname(ae, "/tmp/libarchive_test-test_write_disk_secure-absolute_path.tmp");
+ archive_entry_set_mode(ae, S_IFREG | 0777);
+ assert(0 == archive_write_header(a, ae));
+ assert(0 == archive_write_finish_entry(a));
+ assertFileExists("/tmp/libarchive_test-test_write_disk_secure-absolute_path.tmp");
+ assert(0 == unlink("/tmp/libarchive_test-test_write_disk_secure-absolute_path.tmp"));
+
+ /* But with security checks enabled, this should fail. */
+ assert(archive_entry_clear(ae) != NULL);
+ archive_entry_copy_pathname(ae, "/tmp/libarchive_test-test_write_disk_secure-absolute_path.tmp");
+ archive_entry_set_mode(ae, S_IFREG | 0777);
+ archive_write_disk_set_options(a, ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS);
+ failure("Extracting an absolute path should fail here.");
+ assertEqualInt(ARCHIVE_FAILED, archive_write_header(a, ae));
+ archive_entry_free(ae);
+ assert(0 == archive_write_finish_entry(a));
+ assertFileNotExists("/tmp/libarchive_test-test_write_disk_secure-absolute_path.tmp");
+
+
+
/* Test the entries on disk. */
assert(0 == lstat("dir", &st));
failure("dir: st.st_mode=%o", st.st_mode);
Modified: stable/0.8/sys/compat/linux/linux_ioctl.c
===================================================================
--- stable/0.8/sys/compat/linux/linux_ioctl.c 2016-05-31 22:14:01 UTC (rev 7621)
+++ stable/0.8/sys/compat/linux/linux_ioctl.c 2016-05-31 22:35:12 UTC (rev 7622)
@@ -29,7 +29,7 @@
#include "opt_compat.h"
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD: src/sys/compat/linux/linux_ioctl.c,v 1.4 2013/01/08 00:27:47 laffer1 Exp $");
+__MBSDID("$MidnightBSD$");
#include <sys/param.h>
#include <sys/systm.h>
@@ -911,6 +911,8 @@
case LINUX_TIOCGSERIAL: {
struct linux_serial_struct lss;
+
+ bzero(&lss, sizeof(lss));
lss.type = LINUX_PORT_16550A;
lss.flags = 0;
lss.close_delay = 0;
Property changes on: stable/0.8/sys/compat/linux/linux_ioctl.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5
\ No newline at end of property
Modified: stable/0.8/sys/compat/linux/linux_misc.c
===================================================================
--- stable/0.8/sys/compat/linux/linux_misc.c 2016-05-31 22:14:01 UTC (rev 7621)
+++ stable/0.8/sys/compat/linux/linux_misc.c 2016-05-31 22:35:12 UTC (rev 7622)
@@ -124,6 +124,7 @@
int i, j;
struct timespec ts;
+ bzero(&sysinfo, sizeof(sysinfo));
getnanouptime(&ts);
if (ts.tv_nsec != 0)
ts.tv_sec++;
Modified: stable/0.8/sys/kern/vfs_syscalls.c
===================================================================
--- stable/0.8/sys/kern/vfs_syscalls.c 2016-05-31 22:14:01 UTC (rev 7621)
+++ stable/0.8/sys/kern/vfs_syscalls.c 2016-05-31 22:35:12 UTC (rev 7622)
@@ -2330,6 +2330,7 @@
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;
More information about the Midnightbsd-cvs
mailing list