svn commit: r351008 - stable/10/contrib/bzip2

[Xin LI]

Author: delphij
Date: Wed Aug 14 06:41:22 2019
New Revision: 351008
URL: https://svnweb.freebsd.org/changeset/base/351008

Log:
  MFC r350855: Upgrade to Bzip2 version 1.0.8.

Modified:
  stable/10/contrib/bzip2/CHANGES
  stable/10/contrib/bzip2/LICENSE
  stable/10/contrib/bzip2/README
  stable/10/contrib/bzip2/README.COMPILATION.PROBLEMS
  stable/10/contrib/bzip2/blocksort.c
  stable/10/contrib/bzip2/bzip2.1
  stable/10/contrib/bzip2/bzip2.c
  stable/10/contrib/bzip2/bzip2recover.c
  stable/10/contrib/bzip2/bzlib.c
  stable/10/contrib/bzip2/bzlib.h
  stable/10/contrib/bzip2/bzlib_private.h
  stable/10/contrib/bzip2/compress.c
  stable/10/contrib/bzip2/crctable.c
  stable/10/contrib/bzip2/decompress.c
  stable/10/contrib/bzip2/huffman.c
  stable/10/contrib/bzip2/randtable.c
  stable/10/contrib/bzip2/spewG.c
  stable/10/contrib/bzip2/unzcrash.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/bzip2/CHANGES
==
--- stable/10/contrib/bzip2/CHANGES Wed Aug 14 06:39:20 2019
(r351007)
+++ stable/10/contrib/bzip2/CHANGES Wed Aug 14 06:41:22 2019
(r351008)
@@ -2,8 +2,8 @@
  This file is part of bzip2/libbzip2, a program and library for
  lossless, block-sorting data compression.
 
- bzip2/libbzip2 version 1.0.7 of 27 June 2019
- Copyright (C) 1996-2010 Julian Seward 
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward 
 
  Please read the WARNING, DISCLAIMER and PATENTS sections in the 
  README file.
@@ -338,3 +338,19 @@ Security fix only.  Fixes CERT-FI 20469 as it applies 
 * bzip2recover: Fix use after free issue with outFile (CVE-2016-3189)
 
 * Make sure nSelectors is not out of range (CVE-2019-12900)
+
+1.0.8 (13 Jul 19)
+~
+
+* Accept as many selectors as the file format allows.
+  This relaxes the fix for CVE-2019-12900 from 1.0.7
+  so that bzip2 allows decompression of bz2 files that
+  use (too) many selectors again.
+
+* Fix handling of large (> 4GB) files on Windows.
+
+* Cleanup of bzdiff and bzgrep scripts so they don't use
+  any bash extensions and handle multiple archives correctly.
+
+* There is now a bz2-files testsuite at
+  https://sourceware.org/git/bzip2-tests.git

Modified: stable/10/contrib/bzip2/LICENSE
==
--- stable/10/contrib/bzip2/LICENSE Wed Aug 14 06:39:20 2019
(r351007)
+++ stable/10/contrib/bzip2/LICENSE Wed Aug 14 06:41:22 2019
(r351008)
@@ -2,7 +2,7 @@
 --
 
 This program, "bzip2", the associated library "libbzip2", and all
-documentation, are copyright (C) 1996-2010 Julian R Seward.  All
+documentation, are copyright (C) 1996-2019 Julian R Seward.  All
 rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -37,6 +37,6 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Julian Seward, jsew...@acm.org
-bzip2/libbzip2 version 1.0.7 of 27 June 2019
+bzip2/libbzip2 version 1.0.8 of 13 July 2019
 
 --

Modified: stable/10/contrib/bzip2/README
==
--- stable/10/contrib/bzip2/README  Wed Aug 14 06:39:20 2019
(r351007)
+++ stable/10/contrib/bzip2/README  Wed Aug 14 06:41:22 2019
(r351008)
@@ -6,8 +6,8 @@ This version is fully compatible with the previous pub
 This file is part of bzip2/libbzip2, a program and library for
 lossless, block-sorting data compression.
 
-bzip2/libbzip2 version 1.0.7 of 27 June 2019
-Copyright (C) 1996-2010 Julian Seward 
+bzip2/libbzip2 version 1.0.8 of 13 July 2019
+Copyright (C) 1996-2019 Julian Seward 
 
 Please read the WARNING, DISCLAIMER and PATENTS sections in this file.
 
@@ -165,8 +165,8 @@ WHAT'S NEW IN 1.0.x ?
 
See the CHANGES file.
 
-I hope you find bzip2 useful.  Feel free to contact me at
-   jsew...@acm.org
+I hope you find bzip2 useful.  Feel free to contact the developers at
+   bzip2-de...@sourceware.org
 if you have any suggestions or queries.  Many people mailed me with
 comments, suggestions and patches after the releases of bzip-0.15,
 bzip-0.21, and bzip2 versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1,
@@ -193,3 +193,4 @@ Cambridge, UK.
 10 December 2007 (bzip2, version 1.0.5)
  6 Sept 2010 (bzip2, version 1.0.6)
 27 June 2019 (bzip2, version 1.0.7)
+13 July 2019 (bzip2, version 1.0.8)

Modified: stable/10/contrib/bzip2/README.COMPILATION.PROBLEMS
==
--- stable/10/contrib/bzip2/README.COMPILATION.PROBLEMS Wed Aug 14 06:39:20 
2019(r351007)
+++ stable/10/contrib/bzip2/README.COMPILATION.PROBLEMS Wed Aug 14 06:41:22 

svn commit: r349719 - stable/10/contrib/bzip2

[Xin LI]

Author: delphij
Date: Thu Jul  4 07:36:09 2019
New Revision: 349719
URL: https://svnweb.freebsd.org/changeset/base/349719

Log:
  MFC r349505: Upgrade to Bzip2 version 1.0.7.

Modified:
  stable/10/contrib/bzip2/CHANGES
  stable/10/contrib/bzip2/LICENSE
  stable/10/contrib/bzip2/README
  stable/10/contrib/bzip2/README.COMPILATION.PROBLEMS
  stable/10/contrib/bzip2/blocksort.c
  stable/10/contrib/bzip2/bzip2.1
  stable/10/contrib/bzip2/bzip2.c
  stable/10/contrib/bzip2/bzip2recover.c
  stable/10/contrib/bzip2/bzlib.c
  stable/10/contrib/bzip2/bzlib.h
  stable/10/contrib/bzip2/bzlib_private.h
  stable/10/contrib/bzip2/compress.c
  stable/10/contrib/bzip2/crctable.c
  stable/10/contrib/bzip2/decompress.c
  stable/10/contrib/bzip2/huffman.c
  stable/10/contrib/bzip2/randtable.c
  stable/10/contrib/bzip2/spewG.c
  stable/10/contrib/bzip2/unzcrash.c
  stable/10/contrib/bzip2/words2
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/bzip2/CHANGES
==
--- stable/10/contrib/bzip2/CHANGES Thu Jul  4 07:32:25 2019
(r349718)
+++ stable/10/contrib/bzip2/CHANGES Thu Jul  4 07:36:09 2019
(r349719)
@@ -2,8 +2,8 @@
  This file is part of bzip2/libbzip2, a program and library for
  lossless, block-sorting data compression.
 
- bzip2/libbzip2 version 1.0.6 of 6 September 2010
- Copyright (C) 1996-2010 Julian Seward 
+ bzip2/libbzip2 version 1.0.7 of 27 June 2019
+ Copyright (C) 1996-2010 Julian Seward 
 
  Please read the WARNING, DISCLAIMER and PATENTS sections in the 
  README file.
@@ -325,3 +325,16 @@ Security fix only.  Fixes CERT-FI 20469 as it applies 
   Izdebski.
 
 * Make the documentation build on Ubuntu 10.04
+
+1.0.7 (27 Jun 19)
+~
+
+* Fix undefined behavior in the macros SET_BH, CLEAR_BH, & ISSET_BH
+
+* bzip2: Fix return value when combining --test,-t and -q.
+
+* bzip2recover: Fix buffer overflow for large argv[0]
+
+* bzip2recover: Fix use after free issue with outFile (CVE-2016-3189)
+
+* Make sure nSelectors is not out of range (CVE-2019-12900)

Modified: stable/10/contrib/bzip2/LICENSE
==
--- stable/10/contrib/bzip2/LICENSE Thu Jul  4 07:32:25 2019
(r349718)
+++ stable/10/contrib/bzip2/LICENSE Thu Jul  4 07:36:09 2019
(r349719)
@@ -36,7 +36,7 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUD
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Julian Seward, jsew...@bzip.org
-bzip2/libbzip2 version 1.0.6 of 6 September 2010
+Julian Seward, jsew...@acm.org
+bzip2/libbzip2 version 1.0.7 of 27 June 2019
 
 --

Modified: stable/10/contrib/bzip2/README
==
--- stable/10/contrib/bzip2/README  Thu Jul  4 07:32:25 2019
(r349718)
+++ stable/10/contrib/bzip2/README  Thu Jul  4 07:36:09 2019
(r349719)
@@ -6,8 +6,8 @@ This version is fully compatible with the previous pub
 This file is part of bzip2/libbzip2, a program and library for
 lossless, block-sorting data compression.
 
-bzip2/libbzip2 version 1.0.6 of 6 September 2010
-Copyright (C) 1996-2010 Julian Seward 
+bzip2/libbzip2 version 1.0.7 of 27 June 2019
+Copyright (C) 1996-2010 Julian Seward 
 
 Please read the WARNING, DISCLAIMER and PATENTS sections in this file.
 
@@ -73,7 +73,7 @@ HOW TO BUILD -- Windows 95, NT, DOS, Mac, etc.
 
 It's difficult for me to support compilation on all these platforms.
 My approach is to collect binaries for these platforms, and put them
-on the master web site (http://www.bzip.org).  Look there.  However
+on the master web site (https://sourceware.org/bzip2/).  Look there.  However
 (FWIW), bzip2-1.0.X is very standard ANSI C and should compile
 unmodified with MS Visual C.  If you have difficulties building, you
 might want to read README.COMPILATION.PROBLEMS.
@@ -161,43 +161,22 @@ WHAT'S NEW IN 0.9.5 ?
* Many small improvements in file and flag handling.
* A Y2K statement.
 
-WHAT'S NEW IN 1.0.0 ?
+WHAT'S NEW IN 1.0.x ?
 
See the CHANGES file.
 
-WHAT'S NEW IN 1.0.2 ?
-
-   See the CHANGES file.
-
-WHAT'S NEW IN 1.0.3 ?
-
-   See the CHANGES file.
-
-WHAT'S NEW IN 1.0.4 ?
-
-   See the CHANGES file.
-
-WHAT'S NEW IN 1.0.5 ?
-
-   See the CHANGES file.
-
-WHAT'S NEW IN 1.0.6 ?
-
-   See the CHANGES file.
-
-
 I hope you find bzip2 useful.  Feel free to contact me at
-   jsew...@bzip.org
+   jsew...@acm.org
 if you have any suggestions or queries.  Many people mailed me with
 comments, suggestions and patches after the releases of bzip-0.15,
 bzip-0.21, and bzip2 versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1,
 1.0.2 and 1.0.3, and the changes in bzip2 are largely a result of this
 feedback.  I thank you for your 

svn commit: r338531 - in stable/10: contrib/ntp contrib/ntp/html contrib/ntp/include contrib/ntp/libntp contrib/ntp/ntpd contrib/ntp/ntpdate contrib/ntp/ntpdc contrib/ntp/ntpq contrib/ntp/ntpsnmpd ...

[Xin LI]

Author: delphij
Date: Sat Sep  8 04:10:26 2018
New Revision: 338531
URL: https://svnweb.freebsd.org/changeset/base/338531

Log:
  MFC r338126: MFV r338092: ntp 4.2.8p12.
  
  Relnotes: yes

Modified:
  stable/10/contrib/ntp/ChangeLog
  stable/10/contrib/ntp/NEWS
  stable/10/contrib/ntp/config.h.in
  stable/10/contrib/ntp/configure
  stable/10/contrib/ntp/configure.ac
  stable/10/contrib/ntp/html/authentic.html
  stable/10/contrib/ntp/html/authopt.html
  stable/10/contrib/ntp/html/confopt.html
  stable/10/contrib/ntp/html/keygen.html
  stable/10/contrib/ntp/html/ntpdate.html
  stable/10/contrib/ntp/include/ntp.h
  stable/10/contrib/ntp/include/ntp_md5.h
  stable/10/contrib/ntp/libntp/a_md5encrypt.c
  stable/10/contrib/ntp/libntp/ntp_calendar.c
  stable/10/contrib/ntp/libntp/prettydate.c
  stable/10/contrib/ntp/libntp/ssl_init.c
  stable/10/contrib/ntp/libntp/syssignal.c
  stable/10/contrib/ntp/libntp/work_fork.c
  stable/10/contrib/ntp/libntp/work_thread.c
  stable/10/contrib/ntp/ntpd/complete.conf.in
  stable/10/contrib/ntp/ntpd/invoke-ntp.conf.texi
  stable/10/contrib/ntp/ntpd/invoke-ntp.keys.texi
  stable/10/contrib/ntp/ntpd/invoke-ntpd.texi
  stable/10/contrib/ntp/ntpd/ntp.conf.5man
  stable/10/contrib/ntp/ntpd/ntp.conf.5mdoc
  stable/10/contrib/ntp/ntpd/ntp.conf.def
  stable/10/contrib/ntp/ntpd/ntp.conf.html
  stable/10/contrib/ntp/ntpd/ntp.conf.man.in
  stable/10/contrib/ntp/ntpd/ntp.conf.mdoc.in
  stable/10/contrib/ntp/ntpd/ntp.keys.5man
  stable/10/contrib/ntp/ntpd/ntp.keys.5mdoc
  stable/10/contrib/ntp/ntpd/ntp.keys.def
  stable/10/contrib/ntp/ntpd/ntp.keys.html
  stable/10/contrib/ntp/ntpd/ntp.keys.man.in
  stable/10/contrib/ntp/ntpd/ntp.keys.mdoc.in
  stable/10/contrib/ntp/ntpd/ntp_config.c
  stable/10/contrib/ntp/ntpd/ntp_control.c
  stable/10/contrib/ntp/ntpd/ntp_io.c
  stable/10/contrib/ntp/ntpd/ntp_loopfilter.c
  stable/10/contrib/ntp/ntpd/ntp_parser.c
  stable/10/contrib/ntp/ntpd/ntp_parser.h
  stable/10/contrib/ntp/ntpd/ntp_proto.c
  stable/10/contrib/ntp/ntpd/ntp_refclock.c
  stable/10/contrib/ntp/ntpd/ntp_request.c
  stable/10/contrib/ntp/ntpd/ntpd-opts.c
  stable/10/contrib/ntp/ntpd/ntpd-opts.h
  stable/10/contrib/ntp/ntpd/ntpd.1ntpdman
  stable/10/contrib/ntp/ntpd/ntpd.1ntpdmdoc
  stable/10/contrib/ntp/ntpd/ntpd.c
  stable/10/contrib/ntp/ntpd/ntpd.html
  stable/10/contrib/ntp/ntpd/ntpd.man.in
  stable/10/contrib/ntp/ntpd/ntpd.mdoc.in
  stable/10/contrib/ntp/ntpd/rc_cmdlength.c
  stable/10/contrib/ntp/ntpd/refclock_datum.c
  stable/10/contrib/ntp/ntpd/refclock_gpsdjson.c
  stable/10/contrib/ntp/ntpd/refclock_jupiter.c
  stable/10/contrib/ntp/ntpd/refclock_shm.c
  stable/10/contrib/ntp/ntpd/refclock_true.c
  stable/10/contrib/ntp/ntpdate/ntpdate.c
  stable/10/contrib/ntp/ntpdc/invoke-ntpdc.texi
  stable/10/contrib/ntp/ntpdc/ntpdc-opts.c
  stable/10/contrib/ntp/ntpdc/ntpdc-opts.h
  stable/10/contrib/ntp/ntpdc/ntpdc.1ntpdcman
  stable/10/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc
  stable/10/contrib/ntp/ntpdc/ntpdc.c
  stable/10/contrib/ntp/ntpdc/ntpdc.html
  stable/10/contrib/ntp/ntpdc/ntpdc.man.in
  stable/10/contrib/ntp/ntpdc/ntpdc.mdoc.in
  stable/10/contrib/ntp/ntpq/invoke-ntpq.texi
  stable/10/contrib/ntp/ntpq/ntpq-opts.c
  stable/10/contrib/ntp/ntpq/ntpq-opts.h
  stable/10/contrib/ntp/ntpq/ntpq-subs.c
  stable/10/contrib/ntp/ntpq/ntpq.1ntpqman
  stable/10/contrib/ntp/ntpq/ntpq.1ntpqmdoc
  stable/10/contrib/ntp/ntpq/ntpq.c
  stable/10/contrib/ntp/ntpq/ntpq.html
  stable/10/contrib/ntp/ntpq/ntpq.man.in
  stable/10/contrib/ntp/ntpq/ntpq.mdoc.in
  stable/10/contrib/ntp/ntpq/ntpq.texi
  stable/10/contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd.html
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd.man.in
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in
  stable/10/contrib/ntp/packageinfo.sh
  stable/10/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
  stable/10/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
  stable/10/contrib/ntp/scripts/calc_tickadj/calc_tickadj.html
  stable/10/contrib/ntp/scripts/calc_tickadj/calc_tickadj.man.in
  stable/10/contrib/ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in
  stable/10/contrib/ntp/scripts/calc_tickadj/invoke-calc_tickadj.texi
  stable/10/contrib/ntp/scripts/invoke-plot_summary.texi
  stable/10/contrib/ntp/scripts/invoke-summary.texi
  stable/10/contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi
  stable/10/contrib/ntp/scripts/ntp-wait/ntp-wait-opts
  stable/10/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman
  stable/10/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
  stable/10/contrib/ntp/scripts/ntp-wait/ntp-wait.html
  stable/10/contrib/ntp/scripts/ntp-wait/ntp-wait.man.in
  stable/10/contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in
  

svn commit: r338441 - stable/10/usr.sbin/tzsetup

[Xin LI]

Author: delphij
Date: Mon Sep  3 06:57:25 2018
New Revision: 338441
URL: https://svnweb.freebsd.org/changeset/base/338441

Log:
  MFC r337522:
  
  In read_zones(), check if the file name actually fit in the buffer
  and make sure it would terminate with nul with strlcpy().
  
  Reviewed by:  imp (earlier revision)
  Differential Revision:https://reviews.freebsd.org/D16595

Modified:
  stable/10/usr.sbin/tzsetup/tzsetup.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/tzsetup/tzsetup.c
==
--- stable/10/usr.sbin/tzsetup/tzsetup.cMon Sep  3 06:55:38 2018
(r338440)
+++ stable/10/usr.sbin/tzsetup/tzsetup.cMon Sep  3 06:57:25 2018
(r338441)
@@ -481,7 +481,7 @@ read_zones(void)
charcontbuf[16];
FILE*fp;
struct continent *cont;
-   size_t  len;
+   size_t  len, contlen;
char*line, *tlc, *file, *descr, *p;
int lineno;
 
@@ -504,12 +504,16 @@ read_zones(void)
path_zonetab, lineno, tlc);
/* coord = */ strsep(, "\t");   /* Unused */
file = strsep(, "\t");
+   /* get continent portion from continent/country */
p = strchr(file, '/');
if (p == NULL)
errx(1, "%s:%d: invalid zone name `%s'", path_zonetab,
lineno, file);
-   contbuf[0] = '\0';
-   strncat(contbuf, file, p - file);
+   contlen = p - file + 1; /* trailing nul */
+   if (contlen > sizeof(contbuf))
+   errx(1, "%s:%d: continent name in zone name `%s' too 
long",
+   path_zonetab, lineno, file);
+   strlcpy(contbuf, file, contlen);
cont = find_continent(contbuf);
if (!cont)
errx(1, "%s:%d: invalid region `%s'", path_zonetab,
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r337832 - stable/10/contrib/wpa/src/rsn_supp

[Xin LI]

Author: delphij
Date: Wed Aug 15 05:05:02 2018
New Revision: 337832
URL: https://svnweb.freebsd.org/changeset/base/337832

Log:
  Fix unauthenticated EAPOL-Key decryption vulnerability. [SA-18:11.hostapd]
  
  Approved by:  so

Modified:
  stable/10/contrib/wpa/src/rsn_supp/wpa.c

Modified: stable/10/contrib/wpa/src/rsn_supp/wpa.c
==
--- stable/10/contrib/wpa/src/rsn_supp/wpa.cWed Aug 15 05:03:54 2018
(r337831)
+++ stable/10/contrib/wpa/src/rsn_supp/wpa.cWed Aug 15 05:05:02 2018
(r337832)
@@ -1829,6 +1829,17 @@ int wpa_sm_rx_eapol(struct wpa_sm *sm, const u8 *src_a
 
if (sm->proto == WPA_PROTO_RSN &&
(key_info & WPA_KEY_INFO_ENCR_KEY_DATA)) {
+   /*
+* Only decrypt the Key Data field if the frame's authenticity
+* was verified. When using AES-SIV (FILS), the MIC flag is not
+* set, so this check should only be performed if mic_len != 0
+* which is the case in this code branch.
+*/
+   if (!(key_info & WPA_KEY_INFO_MIC)) {
+   wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
+   "WPA: Ignore EAPOL-Key with encrypted but 
unauthenticated data");
+   goto out;
+   }
if (wpa_supplicant_decrypt_key_data(sm, key, ver))
goto out;
extra_len = WPA_GET_BE16(key->key_data_length);
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r337692 - stable/10/etc

[Xin LI]

Author: delphij
Date: Sun Aug 12 21:43:59 2018
New Revision: 337692
URL: https://svnweb.freebsd.org/changeset/base/337692

Log:
  Remove mention of FreeBSD 9.x which is EoL'ed now.

Modified:
  stable/10/etc/portsnap.conf

Modified: stable/10/etc/portsnap.conf
==
--- stable/10/etc/portsnap.conf Sun Aug 12 21:42:21 2018(r337691)
+++ stable/10/etc/portsnap.conf Sun Aug 12 21:43:59 2018(r337692)
@@ -30,5 +30,4 @@ KEYPRINT=9b5feee6d69f170e3dd0a2c8e469ddbd64f13f978f2f3
 # REFUSE korean polish portuguese russian ukrainian vietnamese
 
 # List of INDEX files to build and the DESCRIBE file to use for each
-INDEX INDEX-9 DESCRIBE.9
 INDEX INDEX-10 DESCRIBE.10
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r334606 - stable/10/sbin/fsck_msdosfs

[Xin LI]

Author: delphij
Date: Mon Jun  4 05:47:15 2018
New Revision: 334606
URL: https://svnweb.freebsd.org/changeset/base/334606

Log:
  MFC r333098:
  
  Don't bail out from the check if readboot() returns !FSFATAL.
  
  This can happen when the fsinfo signature is invalid, and the
  user have choose to fix it, in which case the code would return
  FSBOOTMOD (not FSOK but not FSFATAL either).
  
  All other (fatal) cases would return FSFATAL.
  
  Obtained from:Android Open Source Project
  Obtained from:
https://android.googlesource.com/platform/external/fsck_msdos/+/d8775a29ea7eac2e5f1504dd21da3725b93b3036

Modified:
  stable/10/sbin/fsck_msdosfs/check.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sbin/fsck_msdosfs/check.c
==
--- stable/10/sbin/fsck_msdosfs/check.c Mon Jun  4 05:38:22 2018
(r334605)
+++ stable/10/sbin/fsck_msdosfs/check.c Mon Jun  4 05:47:15 2018
(r334606)
@@ -72,7 +72,7 @@ checkfilesys(const char *fname)
return 8;
}
 
-   if (readboot(dosfs, ) != FSOK) {
+   if (readboot(dosfs, ) == FSFATAL) {
close(dosfs);
printf("\n");
return 8;
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r333357 - stable/10/usr.sbin/syslogd

[Xin LI]

Author: delphij
Date: Tue May  8 05:11:06 2018
New Revision: 57
URL: https://svnweb.freebsd.org/changeset/base/57

Log:
  MFC r332877: Correct size for allocation and bzero of fdsr.
  
  Approved by:  re (gjb)

Modified:
  stable/10/usr.sbin/syslogd/syslogd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/syslogd/syslogd.c
==
--- stable/10/usr.sbin/syslogd/syslogd.cTue May  8 05:10:06 2018
(r56)
+++ stable/10/usr.sbin/syslogd/syslogd.cTue May  8 05:11:06 2018
(r57)
@@ -643,7 +643,7 @@ main(int argc, char *argv[])
fdsrmax = fx->s;
 
fdsr = (fd_set *)calloc(howmany(fdsrmax+1, NFDBITS),
-   sizeof(fd_mask));
+   sizeof(*fdsr));
if (fdsr == NULL)
errx(1, "calloc fd_set");
 
@@ -654,7 +654,7 @@ main(int argc, char *argv[])
die(WantDie);
 
bzero(fdsr, howmany(fdsrmax+1, NFDBITS) *
-   sizeof(fd_mask));
+   sizeof(*fdsr));
 
if (fklog != -1)
FD_SET(fklog, fdsr);
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r332348 - stable/10/usr.sbin/rpcbind

[Xin LI]

Author: delphij
Date: Tue Apr 10 03:15:07 2018
New Revision: 332348
URL: https://svnweb.freebsd.org/changeset/base/332348

Log:
  MFC r331180: Plug a possible memory leak.

Modified:
  stable/10/usr.sbin/rpcbind/rpcbind.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/rpcbind/rpcbind.c
==
--- stable/10/usr.sbin/rpcbind/rpcbind.cTue Apr 10 03:12:22 2018
(r332347)
+++ stable/10/usr.sbin/rpcbind/rpcbind.cTue Apr 10 03:15:07 2018
(r332348)
@@ -548,6 +548,8 @@ init_transport(struct netconfig *nconf)
pml->pml_map.pm_port = PMAPPORT;
if (strcmp(nconf->nc_proto, NC_TCP) == 0) {
if (tcptrans[0]) {
+   free(pml);
+   pml = NULL;
syslog(LOG_ERR,
"cannot have more than one TCP transport");
goto error;
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r330571 - in stable/10: contrib/less usr.bin/less

[Xin LI]

Author: delphij
Date: Wed Mar  7 06:39:00 2018
New Revision: 330571
URL: https://svnweb.freebsd.org/changeset/base/330571

Log:
  MFC r316339,317396,317829,326010,329554: less v530.
  
  Relnotes: yes

Added:
  stable/10/contrib/less/fmt.uni
 - copied unchanged from r326010, head/contrib/less/fmt.uni
Deleted:
  stable/10/contrib/less/mkhelp.c
Modified:
  stable/10/contrib/less/LICENSE
  stable/10/contrib/less/NEWS
  stable/10/contrib/less/README
  stable/10/contrib/less/brac.c
  stable/10/contrib/less/ch.c
  stable/10/contrib/less/charset.c
  stable/10/contrib/less/charset.h
  stable/10/contrib/less/cmd.h
  stable/10/contrib/less/cmdbuf.c
  stable/10/contrib/less/command.c
  stable/10/contrib/less/compose.uni
  stable/10/contrib/less/cvt.c
  stable/10/contrib/less/decode.c
  stable/10/contrib/less/edit.c
  stable/10/contrib/less/filename.c
  stable/10/contrib/less/forwback.c
  stable/10/contrib/less/funcs.h
  stable/10/contrib/less/help.c
  stable/10/contrib/less/ifile.c
  stable/10/contrib/less/input.c
  stable/10/contrib/less/jump.c
  stable/10/contrib/less/less.h
  stable/10/contrib/less/less.hlp
  stable/10/contrib/less/less.nro
  stable/10/contrib/less/lessecho.c
  stable/10/contrib/less/lessecho.nro
  stable/10/contrib/less/lesskey.c
  stable/10/contrib/less/lesskey.h
  stable/10/contrib/less/lesskey.nro
  stable/10/contrib/less/lglob.h
  stable/10/contrib/less/line.c
  stable/10/contrib/less/linenum.c
  stable/10/contrib/less/lsystem.c
  stable/10/contrib/less/main.c
  stable/10/contrib/less/mark.c
  stable/10/contrib/less/mkutable
  stable/10/contrib/less/optfunc.c
  stable/10/contrib/less/option.c
  stable/10/contrib/less/option.h
  stable/10/contrib/less/opttbl.c
  stable/10/contrib/less/os.c
  stable/10/contrib/less/output.c
  stable/10/contrib/less/pattern.c
  stable/10/contrib/less/pattern.h
  stable/10/contrib/less/pckeys.h
  stable/10/contrib/less/position.c
  stable/10/contrib/less/position.h
  stable/10/contrib/less/prompt.c
  stable/10/contrib/less/screen.c
  stable/10/contrib/less/scrsize.c
  stable/10/contrib/less/search.c
  stable/10/contrib/less/signal.c
  stable/10/contrib/less/tags.c
  stable/10/contrib/less/ttyin.c
  stable/10/contrib/less/ubin.uni
  stable/10/contrib/less/version.c
  stable/10/contrib/less/wide.uni
  stable/10/usr.bin/less/defines.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/less/LICENSE
==
--- stable/10/contrib/less/LICENSE  Wed Mar  7 06:13:47 2018
(r330570)
+++ stable/10/contrib/less/LICENSE  Wed Mar  7 06:39:00 2018
(r330571)
@@ -2,7 +2,7 @@
   
 
 Less
-Copyright (C) 1984-2015  Mark Nudelman
+Copyright (C) 1984-2016  Mark Nudelman
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

Modified: stable/10/contrib/less/NEWS
==
--- stable/10/contrib/less/NEWS Wed Mar  7 06:13:47 2018(r330570)
+++ stable/10/contrib/less/NEWS Wed Mar  7 06:39:00 2018(r330571)
@@ -11,6 +11,82 @@
 
 ==
 
+   Major changes between "less" versions 487 and 530
+
+* Don't output terminal init sequence if using -F and file fits on one screen.
+
+* When using -S, mark truncated lines with a special character.
+  The character can be changed or disabled via the new --rscroll option.
+
+* New command M marks the last line displayed on the screen.
+
+* New command ESC-m removes a line mark.
+
+* Status column (enabled via -J) now shows mark letters.
+
+* Status column shows search matches even if highlighting is disabled via -G.
+
+* A second ESC-u command will clear search match markers in the status column.
+
+* Do same ANSI escape code filtering for tag matching that we do for 
+  searching, to help when viewing syntax-highlighted code.
+  
+* Catch SIGTERM and clean up before exiting.
+
+* Fix bug initializing default charset on Windows.
+
+* Handle keypad ENTER key correctly if it sends something other than newline.
+
+* Fix buffering bug when using stdin with a LESSOPEN pipe.
+
+* On Windows, allow 'u' in -D option to enable underlining.
+
+* On Windows, use underline in sgr mode.
+
+* On Windows, convert UTF-8 to multibyte if console is not UTF-8.
+
+* Update Unicode tables to 2017-03-08.
+
+* Pass-thru Unicode formating chars (Cf type) instead of treating them
+  as binary chars. But treat them as binary if -U is set.
+
+* Fix erroneous binary file warning when UTF-8 file contains ANSI SGR 
sequences.
+
+* Fix bugs when using LESSOPEN and switching between stdin and other files.
+
+* Fix some bugs handling filenames containing shell metacharacters.
+
+* Fix some memory leaks.
+
+* Allow some debugging environment variables to be set in lesskey file.
+
+* Code 

svn commit: r330313 - stable/10/release/doc/share/xml

[Xin LI]

Author: delphij
Date: Sat Mar  3 08:52:02 2018
New Revision: 330313
URL: https://svnweb.freebsd.org/changeset/base/330313

Log:
  Document SA-17:12 and correct EN-17:09 link [1]
  
  Reported by:  eadler [1]

Modified:
  stable/10/release/doc/share/xml/errata.xml
  stable/10/release/doc/share/xml/security.xml

Modified: stable/10/release/doc/share/xml/errata.xml
==
--- stable/10/release/doc/share/xml/errata.xml  Sat Mar  3 08:45:56 2018
(r330312)
+++ stable/10/release/doc/share/xml/errata.xml  Sat Mar  3 08:52:02 2018
(r330313)
@@ -20,7 +20,7 @@
 
   
FreeBSD-EN-17:10.tzdata
+   
xlink:href="/FreeBSD-EN-17:09.tzdata.asc">FreeBSD-EN-17:09.tzdata
2November2017
Timezone database information
update

Modified: stable/10/release/doc/share/xml/security.xml
==
--- stable/10/release/doc/share/xml/security.xmlSat Mar  3 08:45:56 
2018(r330312)
+++ stable/10/release/doc/share/xml/security.xmlSat Mar  3 08:52:02 
2018(r330313)
@@ -61,6 +61,13 @@
29November2017
Multiple vulnerabilities
   
+
+  
+   FreeBSD-SA-17:12.openssl
+   09December2017
+   Multiple vulnerabilities
+  
 
   
 
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r330141 - in stable/10: contrib/ntp contrib/ntp/adjtimed contrib/ntp/clockstuff contrib/ntp/html contrib/ntp/html/drivers contrib/ntp/include contrib/ntp/include/isc contrib/ntp/kernel ...

[Xin LI]

Author: delphij
Date: Thu Mar  1 04:06:49 2018
New Revision: 330141
URL: https://svnweb.freebsd.org/changeset/base/330141

Log:
  MFC r330104: MFV r330102: ntp 4.2.8p11

Added:
  stable/10/contrib/ntp/sntp/m4/ntp_af_unspec.m4
 - copied unchanged from r330104, head/contrib/ntp/sntp/m4/ntp_af_unspec.m4
  stable/10/contrib/ntp/sntp/tests/testconf.yml
 - copied unchanged from r330104, head/contrib/ntp/sntp/tests/testconf.yml
Modified:
  stable/10/contrib/ntp/ChangeLog
  stable/10/contrib/ntp/Makefile.am
  stable/10/contrib/ntp/Makefile.in
  stable/10/contrib/ntp/NEWS
  stable/10/contrib/ntp/aclocal.m4
  stable/10/contrib/ntp/adjtimed/Makefile.in
  stable/10/contrib/ntp/clockstuff/Makefile.in
  stable/10/contrib/ntp/configure
  stable/10/contrib/ntp/configure.ac
  stable/10/contrib/ntp/html/access.html
  stable/10/contrib/ntp/html/accopt.html
  stable/10/contrib/ntp/html/authentic.html
  stable/10/contrib/ntp/html/drivers/driver18.html
  stable/10/contrib/ntp/html/drivers/driver40-ja.html
  stable/10/contrib/ntp/html/drivers/driver40.html
  stable/10/contrib/ntp/html/keygen.html
  stable/10/contrib/ntp/html/miscopt.html
  stable/10/contrib/ntp/html/monopt.html
  stable/10/contrib/ntp/html/ntpq.html
  stable/10/contrib/ntp/include/Makefile.in
  stable/10/contrib/ntp/include/isc/Makefile.in
  stable/10/contrib/ntp/include/ntp.h
  stable/10/contrib/ntp/include/ntp_calendar.h
  stable/10/contrib/ntp/include/ntp_config.h
  stable/10/contrib/ntp/include/ntp_fp.h
  stable/10/contrib/ntp/include/ntp_keyacc.h
  stable/10/contrib/ntp/include/ntp_request.h
  stable/10/contrib/ntp/include/ntp_stdlib.h
  stable/10/contrib/ntp/include/ntpd.h
  stable/10/contrib/ntp/include/recvbuff.h
  stable/10/contrib/ntp/include/ssl_applink.c
  stable/10/contrib/ntp/kernel/Makefile.in
  stable/10/contrib/ntp/kernel/sys/Makefile.in
  stable/10/contrib/ntp/libntp/Makefile.in
  stable/10/contrib/ntp/libntp/a_md5encrypt.c
  stable/10/contrib/ntp/libntp/adjtime.c
  stable/10/contrib/ntp/libntp/authkeys.c
  stable/10/contrib/ntp/libntp/authreadkeys.c
  stable/10/contrib/ntp/libntp/libssl_compat.c
  stable/10/contrib/ntp/libntp/ntp_calendar.c
  stable/10/contrib/ntp/libntp/ssl_init.c
  stable/10/contrib/ntp/libntp/statestr.c
  stable/10/contrib/ntp/libntp/systime.c
  stable/10/contrib/ntp/libntp/work_thread.c
  stable/10/contrib/ntp/libparse/Makefile.in
  stable/10/contrib/ntp/ntpd/Makefile.in
  stable/10/contrib/ntp/ntpd/complete.conf.in
  stable/10/contrib/ntp/ntpd/invoke-ntp.conf.texi
  stable/10/contrib/ntp/ntpd/invoke-ntp.keys.texi
  stable/10/contrib/ntp/ntpd/invoke-ntpd.texi
  stable/10/contrib/ntp/ntpd/keyword-gen-utd
  stable/10/contrib/ntp/ntpd/keyword-gen.c
  stable/10/contrib/ntp/ntpd/ntp.conf.5man
  stable/10/contrib/ntp/ntpd/ntp.conf.5mdoc
  stable/10/contrib/ntp/ntpd/ntp.conf.def
  stable/10/contrib/ntp/ntpd/ntp.conf.html
  stable/10/contrib/ntp/ntpd/ntp.conf.man.in
  stable/10/contrib/ntp/ntpd/ntp.conf.mdoc.in
  stable/10/contrib/ntp/ntpd/ntp.keys.5man
  stable/10/contrib/ntp/ntpd/ntp.keys.5mdoc
  stable/10/contrib/ntp/ntpd/ntp.keys.def
  stable/10/contrib/ntp/ntpd/ntp.keys.html
  stable/10/contrib/ntp/ntpd/ntp.keys.man.in
  stable/10/contrib/ntp/ntpd/ntp.keys.mdoc.in
  stable/10/contrib/ntp/ntpd/ntp_config.c
  stable/10/contrib/ntp/ntpd/ntp_control.c
  stable/10/contrib/ntp/ntpd/ntp_crypto.c
  stable/10/contrib/ntp/ntpd/ntp_io.c
  stable/10/contrib/ntp/ntpd/ntp_keyword.h
  stable/10/contrib/ntp/ntpd/ntp_leapsec.c
  stable/10/contrib/ntp/ntpd/ntp_parser.c
  stable/10/contrib/ntp/ntpd/ntp_parser.h
  stable/10/contrib/ntp/ntpd/ntp_peer.c
  stable/10/contrib/ntp/ntpd/ntp_proto.c
  stable/10/contrib/ntp/ntpd/ntp_refclock.c
  stable/10/contrib/ntp/ntpd/ntp_request.c
  stable/10/contrib/ntp/ntpd/ntp_restrict.c
  stable/10/contrib/ntp/ntpd/ntp_scanner.c
  stable/10/contrib/ntp/ntpd/ntp_util.c
  stable/10/contrib/ntp/ntpd/ntpd-opts.c
  stable/10/contrib/ntp/ntpd/ntpd-opts.h
  stable/10/contrib/ntp/ntpd/ntpd.1ntpdman
  stable/10/contrib/ntp/ntpd/ntpd.1ntpdmdoc
  stable/10/contrib/ntp/ntpd/ntpd.c
  stable/10/contrib/ntp/ntpd/ntpd.html
  stable/10/contrib/ntp/ntpd/ntpd.man.in
  stable/10/contrib/ntp/ntpd/ntpd.mdoc.in
  stable/10/contrib/ntp/ntpd/ntpsim.c
  stable/10/contrib/ntp/ntpd/refclock_gpsdjson.c
  stable/10/contrib/ntp/ntpd/refclock_jjy.c
  stable/10/contrib/ntp/ntpd/refclock_palisade.c
  stable/10/contrib/ntp/ntpd/refclock_parse.c
  stable/10/contrib/ntp/ntpdate/Makefile.in
  stable/10/contrib/ntp/ntpdc/Makefile.in
  stable/10/contrib/ntp/ntpdc/invoke-ntpdc.texi
  stable/10/contrib/ntp/ntpdc/layout.std
  stable/10/contrib/ntp/ntpdc/ntpdc-opts.c
  stable/10/contrib/ntp/ntpdc/ntpdc-opts.h
  stable/10/contrib/ntp/ntpdc/ntpdc.1ntpdcman
  stable/10/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc
  stable/10/contrib/ntp/ntpdc/ntpdc.c
  stable/10/contrib/ntp/ntpdc/ntpdc.html
  stable/10/contrib/ntp/ntpdc/ntpdc.man.in
  stable/10/contrib/ntp/ntpdc/ntpdc.mdoc.in
  stable/10/contrib/ntp/ntpdc/ntpdc_ops.c
  stable/10/contrib/ntp/ntpq/Makefile.am
  

svn commit: r328921 - stable/10/share/man/man4

[Xin LI]

Author: delphij
Date: Tue Feb  6 07:50:30 2018
New Revision: 328921
URL: https://svnweb.freebsd.org/changeset/base/328921

Log:
  MFC r328273 (kevlo): Document how to load nmdm(4) from a kernel module.

Modified:
  stable/10/share/man/man4/nmdm.4
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/man/man4/nmdm.4
==
--- stable/10/share/man/man4/nmdm.4 Tue Feb  6 07:47:22 2018
(r328920)
+++ stable/10/share/man/man4/nmdm.4 Tue Feb  6 07:50:30 2018
(r328921)
@@ -21,14 +21,26 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 27, 2005
+.Dd January 23, 2018
 .Dt NMDM 4
 .Os
 .Sh NAME
 .Nm nmdm
 .Nd nullmodem terminal driver
 .Sh SYNOPSIS
+To compile this driver into the kernel,
+place the following line in your
+kernel configuration file:
+.Bd -ragged -offset indent
 .Cd "device nmdm"
+.Ed
+.Pp
+Alternatively, to load the driver as a
+module at boot time, place the following line in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+nmdm_load="YES"
+.Ed
 .Sh DESCRIPTION
 The
 .Nm
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r327192 - stable/10/usr.bin/gzip

[Xin LI]

Author: delphij
Date: Tue Dec 26 08:33:02 2017
New Revision: 327192
URL: https://svnweb.freebsd.org/changeset/base/327192

Log:
  MFC r326791: Close the correct file descriptor.

Modified:
  stable/10/usr.bin/gzip/gzip.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/gzip/gzip.c
==
--- stable/10/usr.bin/gzip/gzip.c   Tue Dec 26 08:32:02 2017
(r327191)
+++ stable/10/usr.bin/gzip/gzip.c   Tue Dec 26 08:33:02 2017
(r327192)
@@ -1630,7 +1630,7 @@ file_uncompress(char *file, char *outfile, size_t outs
if (fd != -1)
close(fd);
if (zfd != -1 && zfd != STDOUT_FILENO)
-   close(fd);
+   close(zfd);
return -1;
 }
 
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r327172 - stable/10/usr.bin/gzip

[Xin LI]

Author: delphij
Date: Mon Dec 25 04:34:10 2017
New Revision: 327172
URL: https://svnweb.freebsd.org/changeset/base/327172

Log:
  MFC r326185: Set errno to EFTYPE instead of EINVAL to be more consistent
  with the rest of code.

Modified:
  stable/10/usr.bin/gzip/zuncompress.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/gzip/zuncompress.c
==
--- stable/10/usr.bin/gzip/zuncompress.cMon Dec 25 04:32:15 2017
(r327171)
+++ stable/10/usr.bin/gzip/zuncompress.cMon Dec 25 04:34:10 2017
(r327172)
@@ -279,7 +279,7 @@ zread(void *cookie, char *rbp, int num)
if (zs->u.r.zs_code > zs->zs_free_ent ||
zs->u.r.zs_oldcode == -1) {
/* Bad stream. */
-   errno = EINVAL;
+   errno = EFTYPE;
return (-1);
}
*zs->u.r.zs_stackp++ = zs->u.r.zs_finchar;
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r327019 - stable/10/libexec/ftpd

[Xin LI]

Author: delphij
Date: Wed Dec 20 07:18:07 2017
New Revision: 327019
URL: https://svnweb.freebsd.org/changeset/base/327019

Log:
  MFC r326562: Use strlcpy().

Modified:
  stable/10/libexec/ftpd/ftpd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/libexec/ftpd/ftpd.c
==
--- stable/10/libexec/ftpd/ftpd.c   Wed Dec 20 07:16:41 2017
(r327018)
+++ stable/10/libexec/ftpd/ftpd.c   Wed Dec 20 07:18:07 2017
(r327019)
@@ -1064,7 +1064,7 @@ user(char *name)
}
}
if (logging)
-   strncpy(curname, name, sizeof(curname)-1);
+   strlcpy(curname, name, sizeof(curname));
 
pwok = 0;
 #ifdef USE_PAM
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r326843 - stable/10/sbin/fsck_msdosfs

[Xin LI]

Author: delphij
Date: Thu Dec 14 07:55:11 2017
New Revision: 326843
URL: https://svnweb.freebsd.org/changeset/base/326843

Log:
  MFC r326391: Prevent OOB access on corrupted msdos directories.
  
  Submitted by: Veo Zhang 

Modified:
  stable/10/sbin/fsck_msdosfs/dir.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sbin/fsck_msdosfs/dir.c
==
--- stable/10/sbin/fsck_msdosfs/dir.c   Thu Dec 14 07:52:38 2017
(r326842)
+++ stable/10/sbin/fsck_msdosfs/dir.c   Thu Dec 14 07:55:11 2017
(r326843)
@@ -619,7 +619,7 @@ readDosDirSection(int f, struct bootblock *boot, struc
dirent.name[8] = '\0';
for (k = 7; k >= 0 && dirent.name[k] == ' '; k--)
dirent.name[k] = '\0';
-   if (dirent.name[k] != '\0')
+   if (k < 0 || dirent.name[k] != '\0')
k++;
if (dirent.name[0] == SLOT_E5)
dirent.name[0] = 0xe5;
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r326818 - stable/10/usr.bin/ipcs

[Xin LI]

Author: delphij
Date: Wed Dec 13 06:20:18 2017
New Revision: 326818
URL: https://svnweb.freebsd.org/changeset/base/326818

Log:
  MFC r326361: Remove unused include.

Modified:
  stable/10/usr.bin/ipcs/ipc.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/ipcs/ipc.c
==
--- stable/10/usr.bin/ipcs/ipc.cWed Dec 13 06:17:20 2017
(r326817)
+++ stable/10/usr.bin/ipcs/ipc.cWed Dec 13 06:20:18 2017
(r326818)
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
-#include 
 
 #include "ipc.h"
 
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r326790 - stable/10/usr.bin/find

[Xin LI]

Author: delphij
Date: Tue Dec 12 04:08:30 2017
New Revision: 326790
URL: https://svnweb.freebsd.org/changeset/base/326790

Log:
  Revert r326763.  The change depends on r264387 which was not merged.
  
  Pointy hat to:delphij

Modified:
  stable/10/usr.bin/find/function.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/find/function.c
==
--- stable/10/usr.bin/find/function.c   Tue Dec 12 03:16:10 2017
(r326789)
+++ stable/10/usr.bin/find/function.c   Tue Dec 12 04:08:30 2017
(r326790)
@@ -896,13 +896,8 @@ f_fstype(PLAN *plan, FTSENT *entry)
} else
p = NULL;
 
-   if (statfs(entry->fts_accpath, )) {
-   if (!ignore_readdir_race || errno != ENOENT) {
-   warn("statfs: %s", entry->fts_accpath);
-   exitstatus = 1;
-   }
-   return 0;
-   }
+   if (statfs(entry->fts_accpath, ))
+   err(1, "%s", entry->fts_accpath);
 
if (p) {
p[0] = save[0];
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r326763 - stable/10/usr.bin/find

[Xin LI]

Author: delphij
Date: Mon Dec 11 05:21:48 2017
New Revision: 326763
URL: https://svnweb.freebsd.org/changeset/base/326763

Log:
  MFC r325723:
  
  find(1): Don't treat statfs() error as fatal in f_fstype, which can happen
  when a directory is removed in the middle of find.
  
  Instead of a full err(), allow find to continue, plus print a warning with
  exitstatus set when appropriate.
  
  Reported by:  100.chksetuid via gordon
  Reviewed by:  jilles

Modified:
  stable/10/usr.bin/find/function.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/find/function.c
==
--- stable/10/usr.bin/find/function.c   Mon Dec 11 05:19:45 2017
(r326762)
+++ stable/10/usr.bin/find/function.c   Mon Dec 11 05:21:48 2017
(r326763)
@@ -896,8 +896,13 @@ f_fstype(PLAN *plan, FTSENT *entry)
} else
p = NULL;
 
-   if (statfs(entry->fts_accpath, ))
-   err(1, "%s", entry->fts_accpath);
+   if (statfs(entry->fts_accpath, )) {
+   if (!ignore_readdir_race || errno != ENOENT) {
+   warn("statfs: %s", entry->fts_accpath);
+   exitstatus = 1;
+   }
+   return 0;
+   }
 
if (p) {
p[0] = save[0];
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r326761 - stable/10/usr.sbin/inetd

[Xin LI]

Author: delphij
Date: Mon Dec 11 05:10:11 2017
New Revision: 326761
URL: https://svnweb.freebsd.org/changeset/base/326761

Log:
  MFC r326244:
  
  Don't assign rs as we will assign it later.

Modified:
  stable/10/usr.sbin/inetd/builtins.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/inetd/builtins.c
==
--- stable/10/usr.sbin/inetd/builtins.c Mon Dec 11 05:06:28 2017
(r326760)
+++ stable/10/usr.sbin/inetd/builtins.c Mon Dec 11 05:10:11 2017
(r326761)
@@ -167,10 +167,8 @@ chargen_stream(int s, struct servtab *sep)
 
inetd_setproctitle(sep->se_service, s);
 
-   if (!endring) {
+   if (!endring)
initring();
-   rs = ring;
-   }
 
text[LINESIZ] = '\r';
text[LINESIZ + 1] = '\n';
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r326357 - stable/10/crypto/openssl/crypto/x509v3

[Xin LI]

Author: delphij
Date: Wed Nov 29 05:35:28 2017
New Revision: 326357
URL: https://svnweb.freebsd.org/changeset/base/326357

Log:
  Avoid out-of-bounds read.
  
  Security: CVE-2017-3735
  Security: FreeBSD-SA-17:11.openssl
  Obtained from:OpenSSL https://github.com/openssl/openssl/pull/4276

Modified:
  stable/10/crypto/openssl/crypto/x509v3/v3_addr.c

Modified: stable/10/crypto/openssl/crypto/x509v3/v3_addr.c
==
--- stable/10/crypto/openssl/crypto/x509v3/v3_addr.cWed Nov 29 05:07:54 
2017(r326356)
+++ stable/10/crypto/openssl/crypto/x509v3/v3_addr.cWed Nov 29 05:35:28 
2017(r326357)
@@ -130,10 +130,12 @@ static int length_from_afi(const unsigned afi)
  */
 unsigned int v3_addr_get_afi(const IPAddressFamily *f)
 {
-return ((f != NULL &&
- f->addressFamily != NULL && f->addressFamily->data != NULL)
-? ((f->addressFamily->data[0] << 8) | (f->addressFamily->data[1]))
-: 0);
+if (f == NULL
+|| f->addressFamily == NULL
+|| f->addressFamily->data == NULL
+|| f->addressFamily->length < 2)
+return 0;
+return (f->addressFamily->data[0] << 8) | f->addressFamily->data[1];
 }
 
 /*
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r326243 - stable/10/sys/kern

[Xin LI]

Author: delphij
Date: Mon Nov 27 03:49:51 2017
New Revision: 326243
URL: https://svnweb.freebsd.org/changeset/base/326243

Log:
  MFC r325755: Be more careful when doing calculation with request from
  userland.

Modified:
  stable/10/sys/kern/kern_proc.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/kern_proc.c
==
--- stable/10/sys/kern/kern_proc.c  Mon Nov 27 03:47:12 2017
(r326242)
+++ stable/10/sys/kern/kern_proc.c  Mon Nov 27 03:49:51 2017
(r326243)
@@ -1858,7 +1858,7 @@ sysctl_kern_proc_args(SYSCTL_HANDLER_ARGS)
if (error != 0 || req->newptr == NULL)
return (error);
 
-   if (req->newlen + sizeof(struct pargs) > ps_arg_cache_limit)
+   if (req->newlen > ps_arg_cache_limit - sizeof(struct pargs))
return (ENOMEM);
newpa = pargs_alloc(req->newlen);
error = SYSCTL_IN(req, newpa->ar_args, req->newlen);
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r326088 - in stable/10: share/man/man4 sys/dev/arcmsr

[Xin LI]

Author: delphij
Date: Wed Nov 22 06:36:55 2017
New Revision: 326088
URL: https://svnweb.freebsd.org/changeset/base/326088

Log:
  MFC r325532: Update arcmsr(4) to 1.40.00.01:
  
   - Fix clear doorbell queue buffer for ADAPTER_TYPE_B
   - Fix release memory resource when detach device
   - Add support for ARC-1216, 1226 SAS 12Gb controllers
   - Declare some functions as static
   - Change checking dword read/write for IOP rqbuffer.
  
  Many thanks to Areca for continuing to support FreeBSD.
  
  Submitted by: 黃清隆 

Modified:
  stable/10/share/man/man4/arcmsr.4
  stable/10/sys/dev/arcmsr/arcmsr.c
  stable/10/sys/dev/arcmsr/arcmsr.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/man/man4/arcmsr.4
==
--- stable/10/share/man/man4/arcmsr.4   Wed Nov 22 06:33:51 2017
(r326087)
+++ stable/10/share/man/man4/arcmsr.4   Wed Nov 22 06:36:55 2017
(r326088)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 14, 2017
+.Dd November 8, 2017
 .Dt ARCMSR 4
 .Os
 .Sh NAME
@@ -104,6 +104,8 @@ ARC-1213
 .It
 ARC-1214
 .It
+ARC-1216
+.It
 ARC-1220
 .It
 ARC-1222
@@ -111,6 +113,8 @@ ARC-1222
 ARC-1223
 .It
 ARC-1224
+.It
+ARC-1226
 .It
 ARC-1230
 .It

Modified: stable/10/sys/dev/arcmsr/arcmsr.c
==
--- stable/10/sys/dev/arcmsr/arcmsr.c   Wed Nov 22 06:33:51 2017
(r326087)
+++ stable/10/sys/dev/arcmsr/arcmsr.c   Wed Nov 22 06:36:55 2017
(r326088)
@@ -78,6 +78,7 @@
 ** 1.20.00.29   12/18/2013  Ching Huang Change simq allocation number, 
support ARC1883
 ** 1.30.00.00   11/30/2015  Ching Huang Added support ARC1203
 ** 1.40.00.00   07/11/2017  Ching Huang Added support ARC1884
+** 1.40.00.01   10/30/2017  Ching Huang Fixed release memory resource
 
**
 */
 
@@ -149,7 +150,7 @@ __FBSDID("$FreeBSD$");
 #define arcmsr_callout_init(a) callout_init(a);
 #endif
 
-#define ARCMSR_DRIVER_VERSION  "arcmsr version 1.40.00.00 2017-07-11"
+#define ARCMSR_DRIVER_VERSION  "arcmsr version 1.40.00.01 2017-10-30"
 #include 
 /*
 **
@@ -187,7 +188,7 @@ static void arcmsr_polling_devmap(void *arg);
 static void arcmsr_srb_timeout(void *arg);
 static void arcmsr_hbd_postqueue_isr(struct AdapterControlBlock *acb);
 static void arcmsr_hbe_postqueue_isr(struct AdapterControlBlock *acb);
-void arcmsr_teardown_intr(device_t dev, struct AdapterControlBlock *acb);
+static void arcmsr_teardown_intr(device_t dev, struct AdapterControlBlock 
*acb);
 #ifdef ARCMSR_DEBUG1
 static void arcmsr_dump_data(struct AdapterControlBlock *acb);
 #endif
@@ -910,6 +911,10 @@ static void arcmsr_drain_donequeue(struct AdapterContr
 
/* check if command done with no error*/
switch (acb->adapter_type) {
+   case ACB_ADAPTER_TYPE_A:
+   case ACB_ADAPTER_TYPE_B:
+   srb = (struct CommandControlBlock 
*)(acb->vir2phy_offset+(flag_srb << 5));/*frame must be 32 bytes aligned*/
+   break;
case ACB_ADAPTER_TYPE_C:
case ACB_ADAPTER_TYPE_D:
srb = (struct CommandControlBlock 
*)(acb->vir2phy_offset+(flag_srb & 0xFFE0)); /*frame must be 32 bytes 
aligned*/
@@ -917,8 +922,6 @@ static void arcmsr_drain_donequeue(struct AdapterContr
case ACB_ADAPTER_TYPE_E:
srb = acb->psrb_pool[flag_srb];
break;
-   case ACB_ADAPTER_TYPE_A:
-   case ACB_ADAPTER_TYPE_B:
default:
srb = (struct CommandControlBlock 
*)(acb->vir2phy_offset+(flag_srb << 5));/*frame must be 32 bytes aligned*/
break;
@@ -1585,8 +1588,7 @@ static u_int32_t arcmsr_Read_iop_rqbuffer_data(struct 
u_int8_t *iop_data;
u_int32_t iop_len;
 
-   if((acb->adapter_type == ACB_ADAPTER_TYPE_C) || (acb->adapter_type == 
ACB_ADAPTER_TYPE_D) ||
-   (acb->adapter_type == ACB_ADAPTER_TYPE_E)) {
+   if(acb->adapter_type >= ACB_ADAPTER_TYPE_B) {
return(arcmsr_Read_iop_rqbuffer_data_D(acb, prbuffer));
}
iop_data = (u_int8_t *)prbuffer->data;
@@ -1681,8 +1683,7 @@ static void arcmsr_Write_data_2iop_wqbuffer(struct Ada
u_int8_t *iop_data;
int32_t allxfer_len=0;
 
-   if((acb->adapter_type == ACB_ADAPTER_TYPE_C) || (acb->adapter_type == 
ACB_ADAPTER_TYPE_D) ||
-   (acb->adapter_type == ACB_ADAPTER_TYPE_E)) {
+   if(acb->adapter_type >= ACB_ADAPTER_TYPE_B) {
arcmsr_Write_data_2iop_wqbuffer_D(acb);
return;
}
@@ -2495,7 +2496,7 @@ static void arcmsr_iop_parking(struct AdapterControlBl
 **
 
 */
-u_int32_t arcmsr_iop_ioctlcmd(struct AdapterControlBlock *acb, u_int32_t 
ioctl_cmd, caddr_t 

svn commit: r326006 - in stable/10/sys/dev: hpt27xx hptnr

[Xin LI]

Author: delphij
Date: Mon Nov 20 06:49:05 2017
New Revision: 326006
URL: https://svnweb.freebsd.org/changeset/base/326006

Log:
  MFC r325383:
  
  Avoid calling get_controller_count() until attaching, this would avoid
  costly PCI config space operations that slows down systems without the
  hardware.
  
  Many thanks to HighPoint for continued support of FreeBSD!
  
  Submitted by: Steve Chang
  Reported by:  cperciva

Modified:
  stable/10/sys/dev/hpt27xx/hpt27xx_config.c
  stable/10/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
  stable/10/sys/dev/hptnr/hptnr_config.c
  stable/10/sys/dev/hptnr/hptnr_osm_bsd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/hpt27xx/hpt27xx_config.c
==
--- stable/10/sys/dev/hpt27xx/hpt27xx_config.c  Mon Nov 20 06:48:10 2017
(r326005)
+++ stable/10/sys/dev/hpt27xx/hpt27xx_config.c  Mon Nov 20 06:49:05 2017
(r326006)
@@ -60,7 +60,7 @@ int init_config(void)
 
 const char driver_name[] = "hpt27xx";
 const char driver_name_long[] = "RocketRAID 27xx controller driver";
-const char driver_ver[] = "v1.2.7";
+const char driver_ver[] = "v1.2.8";
 int  osm_max_targets = 0xff;
 
 

Modified: stable/10/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
==
--- stable/10/sys/dev/hpt27xx/hpt27xx_osm_bsd.c Mon Nov 20 06:48:10 2017
(r326005)
+++ stable/10/sys/dev/hpt27xx/hpt27xx_osm_bsd.c Mon Nov 20 06:49:05 2017
(r326006)
@@ -31,7 +31,7 @@
 #include 
 #include 
 
-static HIM *hpt_match(device_t dev)
+static HIM *hpt_match(device_t dev, int scan)
 {
PCI_ID pci_id;
HIM *him;
@@ -39,7 +39,7 @@ static HIM *hpt_match(device_t dev)
 
for (him = him_list; him; him = him->next) {
for (i=0; him->get_supported_device_id(i, _id); i++) {
-   if (him->get_controller_count)
+   if (scan && him->get_controller_count)
him->get_controller_count(_id,0,0);
if ((pci_get_vendor(dev) == pci_id.vid) &&
(pci_get_device(dev) == pci_id.did)){
@@ -54,7 +54,7 @@ static int hpt_probe(device_t dev)
 {
HIM *him;
 
-   him = hpt_match(dev);
+   him = hpt_match(dev, 0);
if (him != NULL) {
KdPrint(("hpt_probe: adapter at PCI %d:%d:%d, IRQ %d",
pci_get_bus(dev), pci_get_slot(dev), 
pci_get_function(dev), pci_get_irq(dev)
@@ -77,7 +77,7 @@ static int hpt_attach(device_t dev)

KdPrint(("hpt_attach(%d/%d/%d)", pci_get_bus(dev), pci_get_slot(dev), 
pci_get_function(dev)));
 
-   him = hpt_match(dev);
+   him = hpt_match(dev, 1);
hba->ext_type = EXT_TYPE_HBA;
hba->ldm_adapter.him = him;
pci_enable_busmaster(dev);

Modified: stable/10/sys/dev/hptnr/hptnr_config.c
==
--- stable/10/sys/dev/hptnr/hptnr_config.c  Mon Nov 20 06:48:10 2017
(r326005)
+++ stable/10/sys/dev/hptnr/hptnr_config.c  Mon Nov 20 06:49:05 2017
(r326006)
@@ -46,7 +46,7 @@ int init_config(void)
 
 const char driver_name[] = "hptnr";
 const char driver_name_long[] = "R750/DC7280 controller driver";
-const char driver_ver[] = "v1.1.4";
+const char driver_ver[] = "v1.1.5";
 int  osm_max_targets = 0xff;
 
 

Modified: stable/10/sys/dev/hptnr/hptnr_osm_bsd.c
==
--- stable/10/sys/dev/hptnr/hptnr_osm_bsd.c Mon Nov 20 06:48:10 2017
(r326005)
+++ stable/10/sys/dev/hptnr/hptnr_osm_bsd.c Mon Nov 20 06:49:05 2017
(r326006)
@@ -32,7 +32,7 @@
 #include 
 int msi = 0;
 int debug_flag = 0;
-static HIM *hpt_match(device_t dev)
+static HIM *hpt_match(device_t dev, int scan)
 {
PCI_ID pci_id;
HIM *him;
@@ -40,7 +40,7 @@ static HIM *hpt_match(device_t dev)
 
for (him = him_list; him; him = him->next) {
for (i=0; him->get_supported_device_id(i, _id); i++) {
-   if (him->get_controller_count)
+   if (scan && him->get_controller_count)
him->get_controller_count(_id,0,0);
if ((pci_get_vendor(dev) == pci_id.vid) &&
(pci_get_device(dev) == pci_id.did)){
@@ -56,7 +56,7 @@ static int hpt_probe(device_t dev)
 {
HIM *him;
 
-   him = hpt_match(dev);
+   him = hpt_match(dev, 0);
if (him != NULL) {
KdPrint(("hpt_probe: adapter at PCI %d:%d:%d, IRQ %d",
pci_get_bus(dev), pci_get_slot(dev), 
pci_get_function(dev), pci_get_irq(dev)
@@ -79,7 +79,7 @@ static int hpt_attach(device_t dev)

KdPrint(("hpt_attach(%d/%d/%d)", pci_get_bus(dev), pci_get_slot(dev), 
pci_get_function(dev)));
 
-   him = 

Re: svn commit: r323124 - in stable/10: crypto/openssh crypto/openssh/contrib crypto/openssh/contrib/cygwin crypto/openssh/contrib/redhat crypto/openssh/contrib/suse crypto/openssh/openbsd-compat cryp

[Xin LI]

Thanks!

On Fri, Sep 1, 2017 at 3:52 PM, Dag-Erling Smørgrav  wrote:
> Author: des
> Date: Fri Sep  1 22:52:18 2017
> New Revision: 323124
> URL: https://svnweb.freebsd.org/changeset/base/323124
>
> Log:
>   Upgrade OpenSSH to 7.3p1.
>
>   This is the last version of OpenSSH which does not break compatibility
>   more than we can live with in a stable branch.  Further commits will
>   follow to backport some bug fixes from newer versions.
>
>   The sshd breakage in the previous attempt was due to an upstream bug
>   (a 0 was changed to a 1 while refactoring send_rexec_state() in sshd.c)
>   which only manifested itself when sshd was built with SSH 1 support.
>
>   Approved by:  re@
>
> Added:
>   stable/10/crypto/openssh/.skipped-commit-ids
>  - copied unchanged from r323120, 
> stable/10/crypto/openssh/.skipped-commit-ids
>   stable/10/crypto/openssh/openbsd-compat/bsd-err.c
>  - copied unchanged from r323120, 
> stable/10/crypto/openssh/openbsd-compat/bsd-err.c
>   stable/10/crypto/openssh/platform-tracing.c
>  - copied unchanged from r323120, 
> stable/10/crypto/openssh/platform-tracing.c
>   stable/10/crypto/openssh/regress/cfginclude.sh
>  - copied unchanged from r323120, 
> stable/10/crypto/openssh/regress/cfginclude.sh
>   stable/10/crypto/openssh/regress/misc/
>  - copied from r323120, stable/10/crypto/openssh/regress/misc/
>   stable/10/crypto/openssh/regress/sshcfgparse.sh
>  - copied unchanged from r323120, 
> stable/10/crypto/openssh/regress/sshcfgparse.sh
>   stable/10/crypto/openssh/regress/unittests/utf8/
>  - copied from r323120, stable/10/crypto/openssh/regress/unittests/utf8/
>   stable/10/crypto/openssh/utf8.c
>  - copied unchanged from r323120, stable/10/crypto/openssh/utf8.c
>   stable/10/crypto/openssh/utf8.h
>  - copied unchanged from r323120, stable/10/crypto/openssh/utf8.h
> Deleted:
>   stable/10/crypto/openssh/.cvsignore
>   stable/10/crypto/openssh/openbsd-compat/.cvsignore
>   stable/10/crypto/openssh/openbsd-compat/regress/.cvsignore
>   stable/10/crypto/openssh/regress/.cvsignore
>   stable/10/crypto/openssh/roaming.h
>   stable/10/crypto/openssh/scard/
> Modified:
>   stable/10/crypto/openssh/ChangeLog
>   stable/10/crypto/openssh/INSTALL
>   stable/10/crypto/openssh/Makefile.in
>   stable/10/crypto/openssh/PROTOCOL
>   stable/10/crypto/openssh/PROTOCOL.agent
>   stable/10/crypto/openssh/PROTOCOL.certkeys
>   stable/10/crypto/openssh/PROTOCOL.chacha20poly1305
>   stable/10/crypto/openssh/README
>   stable/10/crypto/openssh/audit-linux.c
>   stable/10/crypto/openssh/auth-krb5.c
>   stable/10/crypto/openssh/auth-options.c
>   stable/10/crypto/openssh/auth-pam.c
>   stable/10/crypto/openssh/auth-pam.h
>   stable/10/crypto/openssh/auth-passwd.c
>   stable/10/crypto/openssh/auth-rh-rsa.c
>   stable/10/crypto/openssh/auth-rhosts.c
>   stable/10/crypto/openssh/auth.c
>   stable/10/crypto/openssh/auth.h
>   stable/10/crypto/openssh/auth2-chall.c
>   stable/10/crypto/openssh/auth2-hostbased.c
>   stable/10/crypto/openssh/auth2.c
>   stable/10/crypto/openssh/authfile.c
>   stable/10/crypto/openssh/canohost.c
>   stable/10/crypto/openssh/canohost.h
>   stable/10/crypto/openssh/channels.c
>   stable/10/crypto/openssh/cipher-bf1.c
>   stable/10/crypto/openssh/cipher.c
>   stable/10/crypto/openssh/clientloop.c
>   stable/10/crypto/openssh/compat.c
>   stable/10/crypto/openssh/config.h
>   stable/10/crypto/openssh/configure.ac
>   stable/10/crypto/openssh/contrib/cygwin/README
>   stable/10/crypto/openssh/contrib/redhat/openssh.spec
>   stable/10/crypto/openssh/contrib/ssh-copy-id
>   stable/10/crypto/openssh/contrib/suse/openssh.spec
>   stable/10/crypto/openssh/defines.h
>   stable/10/crypto/openssh/dh.c
>   stable/10/crypto/openssh/dh.h
>   stable/10/crypto/openssh/freebsd-configure.sh
>   stable/10/crypto/openssh/kex.c
>   stable/10/crypto/openssh/kex.h
>   stable/10/crypto/openssh/kexc25519.c
>   stable/10/crypto/openssh/kexdh.c
>   stable/10/crypto/openssh/kexdhc.c
>   stable/10/crypto/openssh/kexdhs.c
>   stable/10/crypto/openssh/kexgexs.c
>   stable/10/crypto/openssh/key.c
>   stable/10/crypto/openssh/log.c
>   stable/10/crypto/openssh/log.h
>   stable/10/crypto/openssh/mac.c
>   stable/10/crypto/openssh/mac.h
>   stable/10/crypto/openssh/misc.c
>   stable/10/crypto/openssh/misc.h
>   stable/10/crypto/openssh/moduli
>   stable/10/crypto/openssh/monitor.c
>   stable/10/crypto/openssh/monitor_fdpass.c
>   stable/10/crypto/openssh/monitor_wrap.c
>   stable/10/crypto/openssh/monitor_wrap.h
>   stable/10/crypto/openssh/mux.c
>   stable/10/crypto/openssh/myproposal.h
>   stable/10/crypto/openssh/opacket.h
>   stable/10/crypto/openssh/openbsd-compat/Makefile.in
>   stable/10/crypto/openssh/openbsd-compat/arc4random.c
>   stable/10/crypto/openssh/openbsd-compat/bindresvport.c
>   stable/10/crypto/openssh/openbsd-compat/bsd-asprintf.c
>   stable/10/crypto/openssh/openbsd-compat/bsd-misc.c
>   

svn commit: r322725 - stable/10/sys/mips/atheros

[Xin LI]

Author: delphij
Date: Sun Aug 20 19:21:06 2017
New Revision: 322725
URL: https://svnweb.freebsd.org/changeset/base/322725

Log:
  MFC r322527:
  
  Plug memory leak in arge_encap().
  
  Reported by:  Ilja Van Sprundel 
  Submitted by: Domagoj Stolfa 
  Reviewed by:  adrian
  Approved by:  re (kib)

Modified:
  stable/10/sys/mips/atheros/if_arge.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/mips/atheros/if_arge.c
==
--- stable/10/sys/mips/atheros/if_arge.cSun Aug 20 16:52:27 2017
(r322724)
+++ stable/10/sys/mips/atheros/if_arge.cSun Aug 20 19:21:06 2017
(r322725)
@@ -,6 +,7 @@ arge_encap(struct arge_softc *sc, struct mbuf **m_head
sc->stats.tx_pkts_unaligned++;
m = m_defrag(*m_head, M_NOWAIT);
if (m == NULL) {
+   m_freem(*m_head);
*m_head = NULL;
return (ENOBUFS);
}
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r322341 - in stable: 10/crypto/openssh 11/crypto/openssh

[Xin LI]

Author: delphij
Date: Thu Aug 10 06:36:37 2017
New Revision: 322341
URL: https://svnweb.freebsd.org/changeset/base/322341

Log:
  Apply upstream fix:
  
  Skip passwords longer than 1k in length so clients can't
  easily DoS sshd by sending very long passwords, causing it to spend CPU
  hashing them. feedback djm@, ok markus@.
  
  Brought to our attention by tomas.kuthan at oracle.com, shilei-c at
  360.cn and coredump at autistici.org
  
  Security: CVE-2016-6515
  Security: FreeBSD-SA-17:06.openssh

Modified:
  stable/10/crypto/openssh/auth-passwd.c

Changes in other areas also in this revision:
Modified:
  stable/11/crypto/openssh/auth-passwd.c

Modified: stable/10/crypto/openssh/auth-passwd.c
==
--- stable/10/crypto/openssh/auth-passwd.c  Thu Aug 10 05:38:31 2017
(r322340)
+++ stable/10/crypto/openssh/auth-passwd.c  Thu Aug 10 06:36:37 2017
(r322341)
@@ -66,6 +66,8 @@ extern login_cap_t *lc;
 #define DAY(24L * 60 * 60) /* 1 day in seconds */
 #define TWO_WEEKS  (2L * 7 * DAY)  /* 2 weeks in seconds */
 
+#define MAX_PASSWORD_LEN   1024
+
 void
 disable_forwarding(void)
 {
@@ -86,6 +88,9 @@ auth_password(Authctxt *authctxt, const char *password
 #if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
static int expire_checked = 0;
 #endif
+
+   if (strlen(password) > MAX_PASSWORD_LEN)
+   return 0;
 
 #ifndef HAVE_CYGWIN
if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES)
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r321907 - stable/10/sbin/init

[Xin LI]

Author: delphij
Date: Wed Aug  2 05:47:26 2017
New Revision: 321907
URL: https://svnweb.freebsd.org/changeset/base/321907

Log:
  MFC r320761:
  
   - Use strlcat() instead of strncat().
   - Use asprintf() and handle allocation errors.

Modified:
  stable/10/sbin/init/init.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sbin/init/init.c
==
--- stable/10/sbin/init/init.c  Wed Aug  2 05:30:41 2017(r321906)
+++ stable/10/sbin/init/init.c  Wed Aug  2 05:47:26 2017(r321907)
@@ -1278,8 +1278,8 @@ new_session(session_t *sprev, int session_index, struc
sp->se_index = session_index;
sp->se_flags |= SE_PRESENT;
 
-   sp->se_device = malloc(sizeof(_PATH_DEV) + strlen(typ->ty_name));
-   sprintf(sp->se_device, "%s%s", _PATH_DEV, typ->ty_name);
+   if (asprintf(>se_device, "%s%s", _PATH_DEV, typ->ty_name) < 0)
+   err(1, "asprintf");
 
/*
 * Attempt to open the device, if we get "device not configured"
@@ -1322,8 +1322,8 @@ setupargv(session_t *sp, struct ttyent *typ)
free(sp->se_getty_argv_space);
free(sp->se_getty_argv);
}
-   sp->se_getty = malloc(strlen(typ->ty_getty) + strlen(typ->ty_name) + 2);
-   sprintf(sp->se_getty, "%s %s", typ->ty_getty, typ->ty_name);
+   if (asprintf(>se_getty, "%s %s", typ->ty_getty, typ->ty_name) < 0)
+   err(1, "asprintf");
sp->se_getty_argv_space = strdup(sp->se_getty);
sp->se_getty_argv = construct_argv(sp->se_getty_argv_space);
if (sp->se_getty_argv == 0) {
@@ -1437,7 +1437,7 @@ start_window_system(session_t *sp)
if (sp->se_type) {
/* Don't use malloc after fork */
strcpy(term, "TERM=");
-   strncat(term, sp->se_type, sizeof(term) - 6);
+   strlcat(term, sp->se_type, sizeof(term));
env[0] = term;
env[1] = 0;
}
@@ -1501,7 +1501,7 @@ start_getty(session_t *sp)
if (sp->se_type) {
/* Don't use malloc after fork */
strcpy(term, "TERM=");
-   strncat(term, sp->se_type, sizeof(term) - 6);
+   strlcat(term, sp->se_type, sizeof(term));
env[0] = term;
env[1] = 0;
} else
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r321905 - stable/10/sys/sys

[Xin LI]

Author: delphij
Date: Wed Aug  2 05:17:47 2017
New Revision: 321905
URL: https://svnweb.freebsd.org/changeset/base/321905

Log:
  MFC r321713:
  
  Bump copyright year.

Modified:
  stable/10/sys/sys/copyright.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/sys/copyright.h
==
--- stable/10/sys/sys/copyright.h   Wed Aug  2 05:17:01 2017
(r321904)
+++ stable/10/sys/sys/copyright.h   Wed Aug  2 05:17:47 2017
(r321905)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (C) 1992-2016 The FreeBSD Project. All rights reserved.
+ * Copyright (C) 1992-2017 The FreeBSD Project. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r321071 - stable/10/lib/libstand

[Xin LI]

Author: delphij
Date: Mon Jul 17 06:46:57 2017
New Revision: 321071
URL: https://svnweb.freebsd.org/changeset/base/321071

Log:
  MFC r320468:
  
  Don't bother to set target for SEEK_END.
  
  While there also collapase SEEK_END into default case in lseek.

Modified:
  stable/10/lib/libstand/bzipfs.c
  stable/10/lib/libstand/gzipfs.c
  stable/10/lib/libstand/lseek.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libstand/bzipfs.c
==
--- stable/10/lib/libstand/bzipfs.c Mon Jul 17 06:45:13 2017
(r321070)
+++ stable/10/lib/libstand/bzipfs.c Mon Jul 17 06:46:57 2017
(r321071)
@@ -320,8 +320,6 @@ bzf_seek(struct open_file *f, off_t offset, int where)
 case SEEK_CUR:
target = offset + bzf->bzf_bzstream.total_out_lo32;
break;
-case SEEK_END:
-   target = -1;
 default:
errno = EINVAL;
return(-1);

Modified: stable/10/lib/libstand/gzipfs.c
==
--- stable/10/lib/libstand/gzipfs.c Mon Jul 17 06:45:13 2017
(r321070)
+++ stable/10/lib/libstand/gzipfs.c Mon Jul 17 06:46:57 2017
(r321071)
@@ -300,8 +300,6 @@ zf_seek(struct open_file *f, off_t offset, int where)
 case SEEK_CUR:
target = offset + zf->zf_zstream.total_out;
break;
-case SEEK_END:
-   target = -1;
 default:
errno = EINVAL;
return(-1);

Modified: stable/10/lib/libstand/lseek.c
==
--- stable/10/lib/libstand/lseek.c  Mon Jul 17 06:45:13 2017
(r321070)
+++ stable/10/lib/libstand/lseek.c  Mon Jul 17 06:46:57 2017
(r321071)
@@ -87,7 +87,6 @@ lseek(int fd, off_t offset, int where)
case SEEK_CUR:
f->f_offset += offset;
break;
-   case SEEK_END:
default:
errno = EOFFSET;
return (-1);
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r321069 - stable/10/libexec/rshd

[Xin LI]

Author: delphij
Date: Mon Jul 17 06:37:46 2017
New Revision: 321069
URL: https://svnweb.freebsd.org/changeset/base/321069

Log:
  MFC r320433:
  
  Use strlcpy() instead of strncpy() and nul-terminating.

Modified:
  stable/10/libexec/rshd/rshd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/libexec/rshd/rshd.c
==
--- stable/10/libexec/rshd/rshd.c   Mon Jul 17 06:36:42 2017
(r321068)
+++ stable/10/libexec/rshd/rshd.c   Mon Jul 17 06:37:46 2017
(r321069)
@@ -322,8 +322,7 @@ doit(struct sockaddr *fromp)
pam_err = pam_authenticate(pamh, 0);
if (pam_err == PAM_SUCCESS) {
if ((pam_err = pam_get_user(pamh, , NULL)) == PAM_SUCCESS) {
-   strncpy(luser, cp, sizeof(luser));
-   luser[sizeof(luser) - 1] = '\0';
+   strlcpy(luser, cp, sizeof(luser));
/* XXX truncation! */
}
pam_err = pam_acct_mgmt(pamh, 0);
@@ -364,9 +363,7 @@ doit(struct sockaddr *fromp)
if (lc != NULL && fromp->sa_family == AF_INET) {/*XXX*/
charremote_ip[MAXHOSTNAMELEN];
 
-   strncpy(remote_ip, numericname,
-   sizeof(remote_ip) - 1);
-   remote_ip[sizeof(remote_ip) - 1] = 0;
+   strlcpy(remote_ip, numericname, sizeof(remote_ip));
/* XXX truncation! */
if (!auth_hostok(lc, rhost, remote_ip)) {
syslog(LOG_INFO|LOG_AUTH,
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r321067 - in stable/10: share/man/man4 sys/dev/arcmsr

[Xin LI]

Author: delphij
Date: Mon Jul 17 06:28:34 2017
New Revision: 321067
URL: https://svnweb.freebsd.org/changeset/base/321067

Log:
  MFC r320986:
  
  Update arcmsr(4) to 1.40.00.00 in order to add support of
  ARC-1884 SATA RAID controllers.
  
  Many thanks to Areca for continuing to support FreeBSD.
  
  Submitted by: 黃清隆 

Modified:
  stable/10/share/man/man4/arcmsr.4
  stable/10/sys/dev/arcmsr/arcmsr.c
  stable/10/sys/dev/arcmsr/arcmsr.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/man/man4/arcmsr.4
==
--- stable/10/share/man/man4/arcmsr.4   Mon Jul 17 06:14:48 2017
(r321066)
+++ stable/10/share/man/man4/arcmsr.4   Mon Jul 17 06:28:34 2017
(r321067)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 4, 2015
+.Dd July 14, 2017
 .Dt ARCMSR 4
 .Os
 .Sh NAME
@@ -147,6 +147,8 @@ ARC-1880
 ARC-1882
 .It
 ARC-1883
+.It
+ARC-1884
 .El
 .Sh FILES
 .Bl -tag -width ".Pa /dev/arcmsr?" -compact

Modified: stable/10/sys/dev/arcmsr/arcmsr.c
==
--- stable/10/sys/dev/arcmsr/arcmsr.c   Mon Jul 17 06:14:48 2017
(r321066)
+++ stable/10/sys/dev/arcmsr/arcmsr.c   Mon Jul 17 06:28:34 2017
(r321067)
@@ -77,6 +77,7 @@
 ** 1.20.00.28   09/13/2013  Ching Huang Removed recursive mutex in 
arcmsr_abort_dr_ccbs
 ** 1.20.00.29   12/18/2013  Ching Huang Change simq allocation number, 
support ARC1883
 ** 1.30.00.00   11/30/2015  Ching Huang Added support ARC1203
+** 1.40.00.00   07/11/2017  Ching Huang Added support ARC1884
 
**
 */
 
@@ -148,7 +149,7 @@ __FBSDID("$FreeBSD$");
 #define arcmsr_callout_init(a) callout_init(a);
 #endif
 
-#define ARCMSR_DRIVER_VERSION  "arcmsr version 1.30.00.00 2015-11-30"
+#define ARCMSR_DRIVER_VERSION  "arcmsr version 1.40.00.00 2017-07-11"
 #include 
 /*
 **
@@ -185,6 +186,8 @@ static void arcmsr_rescanLun_cb(struct cam_periph *per
 static void arcmsr_polling_devmap(void *arg);
 static void arcmsr_srb_timeout(void *arg);
 static void arcmsr_hbd_postqueue_isr(struct AdapterControlBlock *acb);
+static void arcmsr_hbe_postqueue_isr(struct AdapterControlBlock *acb);
+void arcmsr_teardown_intr(device_t dev, struct AdapterControlBlock *acb);
 #ifdef ARCMSR_DEBUG1
 static void arcmsr_dump_data(struct AdapterControlBlock *acb);
 #endif
@@ -376,6 +379,12 @@ static u_int32_t arcmsr_disable_allintr( struct Adapte
CHIP_REG_WRITE32(HBD_MessageUnit, 0, pcief0_int_enable, 
ARCMSR_HBDMU_ALL_INT_DISABLE);
}
break;
+   case ACB_ADAPTER_TYPE_E: {
+   /* disable all outbound interrupt */
+   intmask_org = CHIP_REG_READ32(HBC_MessageUnit, 0, 
host_int_mask); /* disable outbound message0 int */
+   CHIP_REG_WRITE32(HBE_MessageUnit, 0, host_int_mask, 
intmask_org | ARCMSR_HBEMU_ALL_INTMASKENABLE);
+   }
+   break;
}
return (intmask_org);
 }
@@ -418,6 +427,13 @@ static void arcmsr_enable_allintr( struct AdapterContr
acb->outbound_int_enable = mask;
}
break;
+   case ACB_ADAPTER_TYPE_E: {
+   /* enable outbound Post Queue, outbound doorbell 
Interrupt */
+   mask = ~(ARCMSR_HBEMU_OUTBOUND_DOORBELL_ISR | 
ARCMSR_HBEMU_OUTBOUND_POSTQUEUE_ISR);
+   CHIP_REG_WRITE32(HBE_MessageUnit, 0, host_int_mask, 
intmask_org & mask);
+   acb->outbound_int_enable = ~(intmask_org & mask) & 
0x000f;
+   }
+   break;
}
 }
 /*
@@ -503,6 +519,28 @@ static u_int8_t arcmsr_hbd_wait_msgint_ready(struct Ad
return (FALSE);
 }
 /*
+**
+**
+*/
+static u_int8_t arcmsr_hbe_wait_msgint_ready(struct AdapterControlBlock *acb)
+{
+   u_int32_t Index, read_doorbell;
+   u_int8_t Retries = 0x00;
+   
+   do {
+   for(Index=0; Index < 100; Index++) {
+   read_doorbell = CHIP_REG_READ32(HBE_MessageUnit, 0, 
iobound_doorbell);
+   if((read_doorbell ^ acb->in_doorbell) & 
ARCMSR_HBEMU_IOP2DRV_MESSAGE_CMD_DONE) {
+   CHIP_REG_WRITE32(HBE_MessageUnit, 0, 
host_int_status, 0);/*clear interrupt*/
+   acb->in_doorbell = read_doorbell;
+   return TRUE;
+   }
+   UDELAY(1);
+   }/*max 1 seconds*/
+   }while(Retries++ < 20);/*max 20 sec*/
+   return (FALSE);
+}
+/*
 

svn commit: r320907 - in stable: 10/crypto/heimdal/lib/krb5 11/crypto/heimdal/lib/krb5

[Xin LI]

Author: delphij
Date: Wed Jul 12 07:26:07 2017
New Revision: 320907
URL: https://svnweb.freebsd.org/changeset/base/320907

Log:
  MFC r320906: MFV r320905: Import upstream fix for CVE-2017-11103.
  
  In _krb5_extract_ticket() the KDC-REP service name must be obtained from
  encrypted version stored in 'enc_part' instead of the unencrypted version
  stored in 'ticket'.  Use of the unecrypted version provides an
  opportunity for successful server impersonation and other attacks.
  
  Submitted by: hrs
  Obtained from:Heimdal
  Security: FreeBSD-SA-17:05.heimdal
  Security: CVE-2017-11103

Modified:
  stable/10/crypto/heimdal/lib/krb5/ticket.c
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/crypto/heimdal/lib/krb5/ticket.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/10/crypto/heimdal/lib/krb5/ticket.c
==
--- stable/10/crypto/heimdal/lib/krb5/ticket.c  Wed Jul 12 07:19:06 2017
(r320906)
+++ stable/10/crypto/heimdal/lib/krb5/ticket.c  Wed Jul 12 07:26:07 2017
(r320907)
@@ -713,8 +713,8 @@ _krb5_extract_ticket(krb5_context context,
 /* check server referral and save principal */
 ret = _krb5_principalname2krb5_principal (context,
  _principal,
- rep->kdc_rep.ticket.sname,
- rep->kdc_rep.ticket.realm);
+ rep->enc_part.sname,
+ rep->enc_part.srealm);
 if (ret)
goto out;
 if((flags & EXTRACT_TICKET_ALLOW_SERVER_MISMATCH) == 0){
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r320587 - stable/10/usr.sbin/rpc.lockd

[Xin LI]

Author: delphij
Date: Mon Jul  3 05:30:31 2017
New Revision: 320587
URL: https://svnweb.freebsd.org/changeset/base/320587

Log:
  MFC r320093: Check return value of seteuid() and bail out if we fail.

Modified:
  stable/10/usr.sbin/rpc.lockd/lock_proc.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/rpc.lockd/lock_proc.c
==
--- stable/10/usr.sbin/rpc.lockd/lock_proc.cMon Jul  3 05:22:10 2017
(r320586)
+++ stable/10/usr.sbin/rpc.lockd/lock_proc.cMon Jul  3 05:30:31 2017
(r320587)
@@ -283,7 +283,10 @@ get_client(host_addr, vers)
 
/* Regain root privileges, for bindresvport. */
old_euid = geteuid();
-   seteuid(0);
+   if (seteuid(0) != 0) {
+   syslog(LOG_ERR, "seteuid(0) failed");
+   return NULL;
+   }
 
/*
 * Bind the client FD to a reserved port.
@@ -292,7 +295,10 @@ get_client(host_addr, vers)
bindresvport(clnt_fd, NULL);
 
/* Drop root privileges again. */
-   seteuid(old_euid);
+   if (seteuid(old_euid) != 0) {
+   syslog(LOG_ERR, "seteuid(%d) failed", old_euid);
+   return NULL;
+   }
 
/* Success - update the cache entry */
clnt_cache_ptr[clnt_cache_next_to_use] = client;
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r320582 - stable/10/lib/libc/rpc

[Xin LI]

Author: delphij
Date: Mon Jul  3 02:14:42 2017
New Revision: 320582
URL: https://svnweb.freebsd.org/changeset/base/320582

Log:
  MFC r320494: Fix double free by reverting r300385 and r300624 which was
  false positive reported by cppcheck.

Modified:
  stable/10/lib/libc/rpc/getnetconfig.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/rpc/getnetconfig.c
==
--- stable/10/lib/libc/rpc/getnetconfig.c   Mon Jul  3 02:11:14 2017
(r320581)
+++ stable/10/lib/libc/rpc/getnetconfig.c   Mon Jul  3 02:14:42 2017
(r320582)
@@ -692,7 +692,7 @@ static struct netconfig *
 dup_ncp(struct netconfig *ncp)
 {
 struct netconfig   *p;
-char   *tmp, *tmp2;
+char   *tmp;
 u_int  i;
 
 if ((tmp=malloc(MAXNETCONFIGLINE)) == NULL)
@@ -701,7 +701,6 @@ dup_ncp(struct netconfig *ncp)
free(tmp);
return(NULL);
 }
-tmp2 = tmp;
 /*
  * First we dup all the data from matched netconfig buffer.  Then we
  * adjust some of the member pointer to a pre-allocated buffer where
@@ -723,7 +722,6 @@ dup_ncp(struct netconfig *ncp)
 if (p->nc_lookups == NULL) {
free(p->nc_netid);
free(p);
-   free(tmp2);
return(NULL);
 }
 for (i=0; i < p->nc_nlookups; i++) {
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r320325 - stable/10/lib/libc/rpc

[Xin LI]

Author: delphij
Date: Sun Jun 25 05:46:03 2017
New Revision: 320325
URL: https://svnweb.freebsd.org/changeset/base/320325

Log:
  MFC r320216: Fix use-after-free introduced in r300388.
  
  In r300388, endnetconfig() was called on nc_handle which would release
  the associated netconfig structure, which means tmpnconf->nc_netid
  would be a use-after-free.
  
  Solve this by doing endnetconfig() in return paths instead.
  
  Reported by:  jemalloc via kevlo
  Reviewed by:  cem, ngie (earlier version)

Modified:
  stable/10/lib/libc/rpc/rpcb_clnt.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/rpc/rpcb_clnt.c
==
--- stable/10/lib/libc/rpc/rpcb_clnt.c  Sun Jun 25 01:41:07 2017
(r320324)
+++ stable/10/lib/libc/rpc/rpcb_clnt.c  Sun Jun 25 05:46:03 2017
(r320325)
@@ -499,14 +499,15 @@ try_nconf:
hostname = IN6_LOCALHOST_STRING;
}
}
-   endnetconfig(nc_handle);
if (tmpnconf == NULL) {
+   endnetconfig(nc_handle);
rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
mutex_unlock(_lock);
return (NULL);
}
loopnconf = getnetconfigent(tmpnconf->nc_netid);
/* loopnconf is never freed */
+   endnetconfig(nc_handle);
}
mutex_unlock(_lock);
client = getclnthandle(hostname, loopnconf, NULL);
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r320303 - stable/10/usr.sbin/rpc.lockd

[Xin LI]

Author: delphij
Date: Sat Jun 24 07:44:05 2017
New Revision: 320303
URL: https://svnweb.freebsd.org/changeset/base/320303

Log:
  MFC r320183: Reduce code duplication in rpc.lockd.
  
  Reuse create_service code instead of duplicating it in
  lookup_addresses for kernel NLM.
  
  As a (good) side effect this also fixed a few issues that were
  already fixed in the former but never applied to the latter.
  
  Reviewed by:  kevlo

Modified:
  stable/10/usr.sbin/rpc.lockd/lockd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/rpc.lockd/lockd.c
==
--- stable/10/usr.sbin/rpc.lockd/lockd.cSat Jun 24 00:28:35 2017
(r320302)
+++ stable/10/usr.sbin/rpc.lockd/lockd.cSat Jun 24 07:44:05 2017
(r320303)
@@ -99,13 +99,12 @@ char localhost[] = "localhost";
 static int create_service(struct netconfig *nconf);
 static voidcomplete_service(struct netconfig *nconf, char *port_str);
 static voidclearout_service(void);
-void   lookup_addresses(struct netconfig *nconf);
+static voidout_of_mem(void) __dead2;
 void   init_nsm(void);
 void   nlm_prog_0(struct svc_req *, SVCXPRT *);
 void   nlm_prog_1(struct svc_req *, SVCXPRT *);
 void   nlm_prog_3(struct svc_req *, SVCXPRT *);
 void   nlm_prog_4(struct svc_req *, SVCXPRT *);
-void   out_of_mem(void);
 void   usage(void);
 
 void sigalarm_handler(void);
@@ -148,7 +147,6 @@ main(int argc, char **argv)
break;
case 'h':
++nhosts;
-   hosts_bak = hosts;
hosts_bak = realloc(hosts, nhosts * sizeof(char *));
if (hosts_bak == NULL) {
if (hosts != NULL) {
@@ -176,7 +174,6 @@ main(int argc, char **argv)
svcport_str = strdup(optarg);
break;
default:
-   case '?':
usage();
/* NOTREACHED */
}
@@ -231,7 +228,6 @@ main(int argc, char **argv)
hosts[0] = "*";
nhosts = 1;
} else {
-   hosts_bak = hosts;
if (have_v6) {
hosts_bak = realloc(hosts, (nhosts + 2) *
sizeof(char *));
@@ -313,7 +309,7 @@ main(int argc, char **argv)
if (have_v6 == 0 && strcmp(nconf->nc_protofmly, 
"inet6") == 0) {
/* DO NOTHING */
} else {
-   lookup_addresses(nconf);
+   create_service(nconf);
}
}
}
@@ -486,9 +482,14 @@ main(int argc, char **argv)
 
 /*
  * This routine creates and binds sockets on the appropriate
- * addresses. It gets called one time for each transport.
+ * addresses if lockd for user NLM, or perform a lookup of
+ * addresses for the kernel to create transports.
+ *
+ * It gets called one time for each transport.
+ *
  * It returns 0 upon success, 1 for ingore the call and -1 to indicate
  * bind failed with EADDRINUSE.
+ *
  * Any file descriptors that have been created are stored in sock_fd and
  * the total count of them is maintained in sock_fdcnt.
  */
@@ -532,20 +533,23 @@ create_service(struct netconfig *nconf)
nhostsbak = nhosts;
while (nhostsbak > 0) {
--nhostsbak;
-   sock_fd = realloc(sock_fd, (sock_fdcnt + 1) * sizeof(int));
-   if (sock_fd == NULL)
-   out_of_mem();
-   sock_fd[sock_fdcnt++] = -1; /* Set invalid for now. */
mallocd_res = 0;
hints.ai_flags = AI_PASSIVE;
 
-   /*  
-* XXX - using RPC library internal functions.
-*/
-   if ((fd = __rpc_nconf2fd(nconf)) < 0) {
-   syslog(LOG_ERR, "cannot create socket for %s",
-   nconf->nc_netid);
-   continue;
+   if (!kernel_lockd) {
+   sock_fd = realloc(sock_fd, (sock_fdcnt + 1) * 
sizeof(int));
+   if (sock_fd == NULL)
+   out_of_mem();
+   sock_fd[sock_fdcnt++] = -1; /* Set invalid for now. 
*/
+
+   /*  
+   * XXX - using RPC library internal functions.
+   */
+   if ((fd = __rpc_nconf2fd(nconf)) < 0) {
+   syslog(LOG_ERR, "cannot create socket for %s",
+   nconf->nc_netid);
+   continue;
+   }
}
 
switch (hints.ai_family) {
@@ -559,7 +563,8 @@ 

svn commit: r319966 - stable/10/usr.sbin/rpc.lockd

[Xin LI]

Author: delphij
Date: Thu Jun 15 04:37:23 2017
New Revision: 319966
URL: https://svnweb.freebsd.org/changeset/base/319966

Log:
  MFC r319852:
  
  Fix buffer lengths.
  
  After r319369, the RPC code validates caller supplied buffer length in
  taddr2uaddr.  When no -h is specified, the sizeof(ai_addr) is used,
  which is always smaller than the required size and therefore uaddr
  would be NULL, causing the kernel to copyin() from userland NULL
  and fail with EFAULT.

Modified:
  stable/10/usr.sbin/rpc.lockd/lockd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/rpc.lockd/lockd.c
==
--- stable/10/usr.sbin/rpc.lockd/lockd.cThu Jun 15 03:58:23 2017
(r319965)
+++ stable/10/usr.sbin/rpc.lockd/lockd.cThu Jun 15 04:37:23 2017
(r319966)
@@ -906,8 +906,7 @@ lookup_addresses(struct netconfig *nconf)
sin->sin_port = htons(0);
sin->sin_addr.s_addr = 
htonl(INADDR_ANY);
res->ai_addr = (struct 
sockaddr*) sin;
-   res->ai_addrlen = (socklen_t)
-   sizeof(res->ai_addr);
+   res->ai_addrlen = sizeof(struct 
sockaddr_in);
break;
case AF_INET6:
sin6 = malloc(sizeof(struct 
sockaddr_in6));
@@ -917,7 +916,7 @@ lookup_addresses(struct netconfig *nconf)
sin6->sin6_port = htons(0);
sin6->sin6_addr = in6addr_any;
res->ai_addr = (struct 
sockaddr*) sin6;
-   res->ai_addrlen = (socklen_t) 
sizeof(res->ai_addr);
+   res->ai_addrlen = sizeof(struct 
sockaddr_in6);
break;
default:
break;
@@ -942,7 +941,7 @@ lookup_addresses(struct netconfig *nconf)
}
}
 
-   servaddr.len = servaddr.maxlen = res->ai_addr->sa_len;
+   servaddr.len = servaddr.maxlen = res->ai_addrlen;
servaddr.buf = res->ai_addr;
uaddr = taddr2uaddr(nconf, );
 
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r319615 - in stable/10: lib/libc/rpc lib/libc/xdr sys/rpc sys/xdr usr.sbin/rpcbind

[Xin LI]

Author: delphij
Date: Tue Jun  6 07:22:26 2017
New Revision: 319615
URL: https://svnweb.freebsd.org/changeset/base/319615

Log:
  MFC r319369:
  
   * limit size of buffers to RPC_MAXDATASIZE
   * don't leak memory
   * be more picky about bad parameters
  
  From:
  
  
https://raw.githubusercontent.com/guidovranken/rpcbomb/master/libtirpc_patch.txt
  https://github.com/guidovranken/rpcbomb/blob/master/rpcbind_patch.txt
  
  via NetBSD.

Modified:
  stable/10/lib/libc/rpc/rpc_generic.c
  stable/10/lib/libc/rpc/rpcb_prot.c
  stable/10/lib/libc/rpc/rpcb_st_xdr.c
  stable/10/lib/libc/xdr/xdr.c
  stable/10/sys/rpc/rpc_generic.c
  stable/10/sys/rpc/rpcb_clnt.c
  stable/10/sys/rpc/rpcb_prot.c
  stable/10/sys/xdr/xdr.c
  stable/10/usr.sbin/rpcbind/rpcb_svc_com.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/rpc/rpc_generic.c
==
--- stable/10/lib/libc/rpc/rpc_generic.cTue Jun  6 07:21:33 2017
(r319614)
+++ stable/10/lib/libc/rpc/rpc_generic.cTue Jun  6 07:22:26 2017
(r319615)
@@ -610,6 +610,8 @@ __rpc_taddr2uaddr_af(int af, const struct netbuf *nbuf
 
switch (af) {
case AF_INET:
+   if (nbuf->len < sizeof(*sin))
+   return NULL;
sin = nbuf->buf;
if (inet_ntop(af, >sin_addr, namebuf, sizeof namebuf)
== NULL)
@@ -621,6 +623,8 @@ __rpc_taddr2uaddr_af(int af, const struct netbuf *nbuf
break;
 #ifdef INET6
case AF_INET6:
+   if (nbuf->len < sizeof(*sin6))
+   return NULL;
sin6 = nbuf->buf;
if (inet_ntop(af, >sin6_addr, namebuf6, sizeof namebuf6)
== NULL)
@@ -659,6 +663,10 @@ __rpc_uaddr2taddr_af(int af, const char *uaddr)
 
port = 0;
sin = NULL;
+
+   if (uaddr == NULL)
+   return NULL;
+
addrstr = strdup(uaddr);
if (addrstr == NULL)
return NULL;

Modified: stable/10/lib/libc/rpc/rpcb_prot.c
==
--- stable/10/lib/libc/rpc/rpcb_prot.c  Tue Jun  6 07:21:33 2017
(r319614)
+++ stable/10/lib/libc/rpc/rpcb_prot.c  Tue Jun  6 07:22:26 2017
(r319615)
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
 #include "un-namespace.h"
 
 bool_t
@@ -62,13 +63,13 @@ xdr_rpcb(XDR *xdrs, RPCB *objp)
if (!xdr_rpcvers(xdrs, >r_vers)) {
return (FALSE);
}
-   if (!xdr_string(xdrs, >r_netid, (u_int)~0)) {
+   if (!xdr_string(xdrs, >r_netid, RPC_MAXDATASIZE)) {
return (FALSE);
}
-   if (!xdr_string(xdrs, >r_addr, (u_int)~0)) {
+   if (!xdr_string(xdrs, >r_addr, RPC_MAXDATASIZE)) {
return (FALSE);
}
-   if (!xdr_string(xdrs, >r_owner, (u_int)~0)) {
+   if (!xdr_string(xdrs, >r_owner, RPC_MAXDATASIZE)) {
return (FALSE);
}
return (TRUE);
@@ -162,19 +163,19 @@ xdr_rpcblist(XDR *xdrs, RPCBLIST **rp)
 bool_t
 xdr_rpcb_entry(XDR *xdrs, rpcb_entry *objp)
 {
-   if (!xdr_string(xdrs, >r_maddr, (u_int)~0)) {
+   if (!xdr_string(xdrs, >r_maddr, RPC_MAXDATASIZE)) {
return (FALSE);
}
-   if (!xdr_string(xdrs, >r_nc_netid, (u_int)~0)) {
+   if (!xdr_string(xdrs, >r_nc_netid, RPC_MAXDATASIZE)) {
return (FALSE);
}
if (!xdr_u_int32_t(xdrs, >r_nc_semantics)) {
return (FALSE);
}
-   if (!xdr_string(xdrs, >r_nc_protofmly, (u_int)~0)) {
+   if (!xdr_string(xdrs, >r_nc_protofmly, RPC_MAXDATASIZE)) {
return (FALSE);
}
-   if (!xdr_string(xdrs, >r_nc_proto, (u_int)~0)) {
+   if (!xdr_string(xdrs, >r_nc_proto, RPC_MAXDATASIZE)) {
return (FALSE);
}
return (TRUE);
@@ -289,7 +290,7 @@ xdr_rpcb_rmtcallres(XDR *xdrs, struct rpcb_rmtcallres 
bool_t dummy;
struct r_rpcb_rmtcallres *objp = (struct r_rpcb_rmtcallres *)(void *)p;
 
-   if (!xdr_string(xdrs, >addr, (u_int)~0)) {
+   if (!xdr_string(xdrs, >addr, RPC_MAXDATASIZE)) {
return (FALSE);
}
if (!xdr_u_int(xdrs, >results.results_len)) {

Modified: stable/10/lib/libc/rpc/rpcb_st_xdr.c
==
--- stable/10/lib/libc/rpc/rpcb_st_xdr.cTue Jun  6 07:21:33 2017
(r319614)
+++ stable/10/lib/libc/rpc/rpcb_st_xdr.cTue Jun  6 07:22:26 2017
(r319615)
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
 #include 
+#include 
 #include "un-namespace.h"
 
 /* Link list of all the stats about getport and getaddr */
@@ -63,7 +64,7 @@ xdr_rpcbs_addrlist(XDR *xdrs, rpcbs_addrlist *objp)
if (!xdr_int(xdrs, >failure)) {
   

svn commit: r319291 - in stable/10: kerberos5/lib/libroken lib/libc/stdlib sys/libkern

[Xin LI]

Author: delphij
Date: Wed May 31 06:26:37 2017
New Revision: 319291
URL: https://svnweb.freebsd.org/changeset/base/319291

Log:
  MFC r318514-r318515, r318517, r318917
  
  r318514:
  Use size_t.
  
  Inspired by:  OpenBSD src/lib/libc/stdlib/qsort.c,v 1.11
  
  r318515:
  The current qsort(3) implementation ignores the sizes of partitions, and
  always perform recursion on the left partition, then use a tail call to
  handle the right partition.  In the worst case this could require O(N)
  levels of recursions.
  
  Reduce the possible recursion level to log2(N) by always recursing on the
  smaller partition instead.
  
  Obtained from:PostgreSQL 9d6077abf9d6efd992a59f05ef5aba981ea32096
  
  r318517:
  Sync qsort.c with userland r318515.
  
  (Note that MIN macro is removed in favor of sys/param.h's version).
  
  PR:   213922
  
  r318917:
  Disconnect heimdal version of qsort.c from build because we are already
  using libc's version of qsort.
  
  PR:   bin/213922

Modified:
  stable/10/kerberos5/lib/libroken/Makefile
  stable/10/lib/libc/stdlib/qsort.c
  stable/10/sys/libkern/qsort.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/kerberos5/lib/libroken/Makefile
==
--- stable/10/kerberos5/lib/libroken/Makefile   Wed May 31 06:19:12 2017
(r319290)
+++ stable/10/kerberos5/lib/libroken/Makefile   Wed May 31 06:26:37 2017
(r319291)
@@ -53,7 +53,6 @@ SRCS= base64.c \
parse_bytes.c \
parse_time.c \
parse_units.c \
-   qsort.c \
rand.c \
realloc.c \
resolve.c \

Modified: stable/10/lib/libc/stdlib/qsort.c
==
--- stable/10/lib/libc/stdlib/qsort.c   Wed May 31 06:19:12 2017
(r319290)
+++ stable/10/lib/libc/stdlib/qsort.c   Wed May 31 06:26:37 2017
(r319291)
@@ -41,7 +41,7 @@ typedef intcmp_t(void *, const void *, const void 
*
 typedef int cmp_t(const void *, const void *);
 #endif
 static inline char *med3(char *, char *, char *, cmp_t *, void *);
-static inline void  swapfunc(char *, char *, int, int, int);
+static inline void  swapfunc(char *, char *, size_t, int, int);
 
 #defineMIN(a, b)   ((a) < (b) ? a : b)
 
@@ -49,7 +49,7 @@ static inline void swapfunc(char *, char *, int, int,
  * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
  */
 #defineswapcode(TYPE, parmi, parmj, n) {   \
-   long i = (n) / sizeof (TYPE);   \
+   size_t i = (n) / sizeof (TYPE); \
TYPE *pi = (TYPE *) (parmi);\
TYPE *pj = (TYPE *) (parmj);\
do {\
@@ -64,7 +64,7 @@ static inline void swapfunc(char *, char *, int, int,
es % sizeof(TYPE) ? 2 : es == sizeof(TYPE) ? 0 : 1;
 
 static inline void
-swapfunc( char *a, char *b, int n, int swaptype_long, int swaptype_int)
+swapfunc(char *a, char *b, size_t n, int swaptype_long, int swaptype_int)
 {
if (swaptype_long <= 1)
swapcode(long, a, b, n)
@@ -117,7 +117,7 @@ qsort(void *a, size_t n, size_t es, cmp_t *cmp)
 #endif
 {
char *pa, *pb, *pc, *pd, *pl, *pm, *pn;
-   size_t d, r;
+   size_t d1, d2;
int cmp_result;
int swaptype_long, swaptype_int, swap_cnt;
 
@@ -137,7 +137,8 @@ loop:   SWAPINIT(long, a, es);
pl = a;
pn = (char *)a + (n - 1) * es;
if (n > 40) {
-   d = (n / 8) * es;
+   size_t d = (n / 8) * es;
+
pl = med3(pl, pl + d, pl + 2 * d, cmp, thunk);
pm = med3(pm - d, pm, pm + d, cmp, thunk);
pn = med3(pn - 2 * d, pn - d, pn, cmp, thunk);
@@ -182,21 +183,43 @@ loop: SWAPINIT(long, a, es);
}
 
pn = (char *)a + n * es;
-   r = MIN(pa - (char *)a, pb - pa);
-   vecswap(a, pb - r, r);
-   r = MIN(pd - pc, pn - pd - es);
-   vecswap(pb, pn - r, r);
-   if ((r = pb - pa) > es)
+   d1 = MIN(pa - (char *)a, pb - pa);
+   vecswap(a, pb - d1, d1);
+   d1 = MIN(pd - pc, pn - pd - es);
+   vecswap(pb, pn - d1, d1);
+
+   d1 = pb - pa;
+   d2 = pd - pc;
+   if (d1 <= d2) {
+   /* Recurse on left partition, then iterate on right partition */
+   if (d1 > es) {
 #ifdef I_AM_QSORT_R
-   qsort_r(a, r / es, es, thunk, cmp);
+   qsort_r(a, d1 / es, es, thunk, cmp);
 #else
-   qsort(a, r / es, es, cmp);
+   qsort(a, d1 / es, es, cmp);
 #endif
-   if ((r = pd - pc) > es) {
-   /* Iterate rather than recurse to save stack space */
-   a = pn - r;
-   n = r / es;
-   goto 

svn commit: r319290 - stable/10/lib/libc/stdlib

[Xin LI]

Author: delphij
Date: Wed May 31 06:19:12 2017
New Revision: 319290
URL: https://svnweb.freebsd.org/changeset/base/319290

Log:
  Partial MFC r288030 (rodrigc):
  
  Use ANSI C prototypes.  Eliminates -Wold-style-definition warnings.

Modified:
  stable/10/lib/libc/stdlib/qsort.c

Modified: stable/10/lib/libc/stdlib/qsort.c
==
--- stable/10/lib/libc/stdlib/qsort.c   Wed May 31 06:13:33 2017
(r319289)
+++ stable/10/lib/libc/stdlib/qsort.c   Wed May 31 06:19:12 2017
(r319290)
@@ -64,9 +64,7 @@ static inline void swapfunc(char *, char *, int, int,
es % sizeof(TYPE) ? 2 : es == sizeof(TYPE) ? 0 : 1;
 
 static inline void
-swapfunc(a, b, n, swaptype_long, swaptype_int)
-   char *a, *b;
-   int n, swaptype_long, swaptype_int;
+swapfunc( char *a, char *b, int n, int swaptype_long, int swaptype_int)
 {
if (swaptype_long <= 1)
swapcode(long, a, b, n)
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r319289 - stable/10/lib/libc/stdlib

[Xin LI]

Author: delphij
Date: Wed May 31 06:13:33 2017
New Revision: 319289
URL: https://svnweb.freebsd.org/changeset/base/319289

Log:
  MFC r279663,r279666 (pfg):
  
  r279663:
  
  qsort(3): enhance to handle 32-bit aligned data on 64-bit systems
  
  Implement a small enhancement to the original qsort implementation:
  If the data is 32 bit aligned we can side-step the long type
  version and use int instead.
  
  The change brings a modest but significant improvement in
  32 bit workloads.
  
  r279666:
  
  qsort(3): small style(9) cleanups.
  
  Basically spaces vs. tabs.
  No functional change.

Modified:
  stable/10/lib/libc/stdlib/qsort.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/stdlib/qsort.c
==
--- stable/10/lib/libc/stdlib/qsort.c   Wed May 31 06:08:11 2017
(r319288)
+++ stable/10/lib/libc/stdlib/qsort.c   Wed May 31 06:13:33 2017
(r319289)
@@ -41,47 +41,55 @@ typedef int  cmp_t(void *, const void *, const void 
*
 typedef int cmp_t(const void *, const void *);
 #endif
 static inline char *med3(char *, char *, char *, cmp_t *, void *);
-static inline void  swapfunc(char *, char *, int, int);
+static inline void  swapfunc(char *, char *, int, int, int);
 
-#define min(a, b)  (a) < (b) ? a : b
+#defineMIN(a, b)   ((a) < (b) ? a : b)
 
 /*
  * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
  */
-#define swapcode(TYPE, parmi, parmj, n) {  \
-   long i = (n) / sizeof (TYPE);   \
-   TYPE *pi = (TYPE *) (parmi);\
-   TYPE *pj = (TYPE *) (parmj);\
+#defineswapcode(TYPE, parmi, parmj, n) {   \
+   long i = (n) / sizeof (TYPE);   \
+   TYPE *pi = (TYPE *) (parmi);\
+   TYPE *pj = (TYPE *) (parmj);\
do {\
TYPEt = *pi;\
*pi++ = *pj;\
*pj++ = t;  \
-} while (--i > 0); \
+   } while (--i > 0);  \
 }
 
-#define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
-   es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
+#defineSWAPINIT(TYPE, a, es) swaptype_ ## TYPE =   \
+   ((char *)a - (char *)0) % sizeof(TYPE) ||   \
+   es % sizeof(TYPE) ? 2 : es == sizeof(TYPE) ? 0 : 1;
 
 static inline void
-swapfunc(a, b, n, swaptype)
+swapfunc(a, b, n, swaptype_long, swaptype_int)
char *a, *b;
-   int n, swaptype;
+   int n, swaptype_long, swaptype_int;
 {
-   if(swaptype <= 1)
+   if (swaptype_long <= 1)
swapcode(long, a, b, n)
+   else if (swaptype_int <= 1)
+   swapcode(int, a, b, n)
else
swapcode(char, a, b, n)
 }
 
-#define swap(a, b) \
-   if (swaptype == 0) {\
+#defineswap(a, b)  \
+   if (swaptype_long == 0) {   \
long t = *(long *)(a);  \
*(long *)(a) = *(long *)(b);\
*(long *)(b) = t;   \
+   } else if (swaptype_int == 0) { \
+   int t = *(int *)(a);\
+   *(int *)(a) = *(int *)(b);  \
+   *(int *)(b) = t;\
} else  \
-   swapfunc(a, b, es, swaptype)
+   swapfunc(a, b, es, swaptype_long, swaptype_int)
 
-#define vecswap(a, b, n)   if ((n) > 0) swapfunc(a, b, n, swaptype)
+#definevecswap(a, b, n)\
+   if ((n) > 0) swapfunc(a, b, n, swaptype_long, swaptype_int)
 
 #ifdef I_AM_QSORT_R
 #defineCMP(t, x, y) (cmp((t), (x), (y)))
@@ -98,14 +106,14 @@ __unused
 {
return CMP(thunk, a, b) < 0 ?
   (CMP(thunk, b, c) < 0 ? b : (CMP(thunk, a, c) < 0 ? c : a ))
-  :(CMP(thunk, b, c) > 0 ? b : (CMP(thunk, a, c) < 0 ? a : c ));
+ :(CMP(thunk, b, c) > 0 ? b : (CMP(thunk, a, c) < 0 ? a : c ));
 }
 
 #ifdef I_AM_QSORT_R
 void
 qsort_r(void *a, size_t n, size_t es, void *thunk, cmp_t *cmp)
 #else
-#define thunk NULL
+#definethunk NULL
 void
 qsort(void *a, size_t n, size_t es, cmp_t *cmp)
 #endif
@@ -113,9 +121,10 @@ qsort(void *a, size_t n, size_t es, cmp_t *cmp)
char *pa, *pb, *pc, *pd, *pl, *pm, *pn;
size_t d, r;
int cmp_result;
-   int swaptype, swap_cnt;
+   int swaptype_long, swaptype_int, swap_cnt;
 
-loop:  SWAPINIT(a, es);
+loop:  SWAPINIT(long, a, es);
+   SWAPINIT(int, a, es);
  

svn commit: r319288 - stable/10/lib/libz

[Xin LI]

Author: delphij
Date: Wed May 31 06:08:11 2017
New Revision: 319288
URL: https://svnweb.freebsd.org/changeset/base/319288

Log:
  MFC r316649:
  
  Add missing double quote to fix r316635 commit.

Modified:
  stable/10/lib/libz/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libz/Makefile
==
--- stable/10/lib/libz/Makefile Wed May 31 06:07:19 2017(r319287)
+++ stable/10/lib/libz/Makefile Wed May 31 06:08:11 2017(r319288)
@@ -39,7 +39,7 @@ SRCS+=uncompr.c
 SRCS+= zopen.c
 SRCS+= zutil.c
 
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
 CFLAGS+=   -DUNALIGNED_OK
 .endif
 
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r319286 - stable/10/sys/libkern

[Xin LI]

Author: delphij
Date: Wed May 31 06:00:14 2017
New Revision: 319286
URL: https://svnweb.freebsd.org/changeset/base/319286

Log:
  MFC r311989 (cem):
  
  libkern: Remove obsolete 'register' keyword

Modified:
  stable/10/sys/libkern/bcmp.c
  stable/10/sys/libkern/bsearch.c
  stable/10/sys/libkern/iconv_ucs.c
  stable/10/sys/libkern/iconv_xlat16.c
  stable/10/sys/libkern/qdivrem.c
  stable/10/sys/libkern/qsort.c
  stable/10/sys/libkern/random.c
  stable/10/sys/libkern/scanc.c
  stable/10/sys/libkern/strcmp.c
  stable/10/sys/libkern/strncpy.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/libkern/bcmp.c
==
--- stable/10/sys/libkern/bcmp.cWed May 31 05:52:32 2017
(r319285)
+++ stable/10/sys/libkern/bcmp.cWed May 31 06:00:14 2017
(r319286)
@@ -44,7 +44,7 @@ typedef const unsigned long   *culp;
 int
 bcmp(b1, b2, length)
const void *b1, *b2;
-   register size_t length;
+   size_t length;
 {
 #if BYTE_ORDER == LITTLE_ENDIAN
/*

Modified: stable/10/sys/libkern/bsearch.c
==
--- stable/10/sys/libkern/bsearch.c Wed May 31 05:52:32 2017
(r319285)
+++ stable/10/sys/libkern/bsearch.c Wed May 31 06:00:14 2017
(r319286)
@@ -54,16 +54,16 @@ __FBSDID("$FreeBSD$");
  */
 void *
 bsearch(key, base0, nmemb, size, compar)
-   register const void *key;
+   const void *key;
const void *base0;
size_t nmemb;
-   register size_t size;
-   register int (*compar)(const void *, const void *);
+   size_t size;
+   int (*compar)(const void *, const void *);
 {
-   register const char *base = base0;
-   register size_t lim;
-   register int cmp;
-   register const void *p;
+   const char *base = base0;
+   size_t lim;
+   int cmp;
+   const void *p;
 
for (lim = nmemb; lim != 0; lim >>= 1) {
p = base + (lim >> 1) * size;

Modified: stable/10/sys/libkern/iconv_ucs.c
==
--- stable/10/sys/libkern/iconv_ucs.c   Wed May 31 05:52:32 2017
(r319285)
+++ stable/10/sys/libkern/iconv_ucs.c   Wed May 31 06:00:14 2017
(r319286)
@@ -523,14 +523,14 @@ ucs4_to_utf8(uint32_t ucs4, char *dst, size_t *utf8wid
 }
 
 static uint32_t
-encode_surrogate(register uint32_t code)
+encode_surrogate(uint32_t code)
 {
return code - 0x1) << 6) & 0x3ff) |
((code - 0x1) & 0x3ff) | 0xd800dc00);
 }
 
 static uint32_t
-decode_surrogate(register const u_char *ucs)
+decode_surrogate(const u_char *ucs)
 {
return ucs[0] & 0x3) << 18) | (ucs[1] << 10) |
((ucs[2] & 0x3) << 8) | ucs[3]) + 0x1);

Modified: stable/10/sys/libkern/iconv_xlat16.c
==
--- stable/10/sys/libkern/iconv_xlat16.cWed May 31 05:52:32 2017
(r319285)
+++ stable/10/sys/libkern/iconv_xlat16.cWed May 31 06:00:14 2017
(r319286)
@@ -298,10 +298,10 @@ iconv_xlat16_name(struct iconv_converter_class *dcp)
 }
 
 static int
-iconv_xlat16_tolower(void *d2p, register int c)
+iconv_xlat16_tolower(void *d2p, int c)
 {
 struct iconv_xlat16 *dp = (struct iconv_xlat16*)d2p;
-   register int c1, c2, out;
+   int c1, c2, out;
 
if (c < 0x100) {
c1 = C2I1(c << 8);
@@ -323,10 +323,10 @@ iconv_xlat16_tolower(void *d2p, register int c)
 }
 
 static int
-iconv_xlat16_toupper(void *d2p, register int c)
+iconv_xlat16_toupper(void *d2p, int c)
 {
 struct iconv_xlat16 *dp = (struct iconv_xlat16*)d2p;
-   register int c1, c2, out;
+   int c1, c2, out;
 
if (c < 0x100) {
c1 = C2I1(c << 8);

Modified: stable/10/sys/libkern/qdivrem.c
==
--- stable/10/sys/libkern/qdivrem.c Wed May 31 05:52:32 2017
(r319285)
+++ stable/10/sys/libkern/qdivrem.c Wed May 31 06:00:14 2017
(r319286)
@@ -59,9 +59,9 @@ typedef u_long digit;
  * We may assume len >= 0.  NOTE THAT THIS WRITES len+1 DIGITS.
  */
 static void
-__shl(register digit *p, register int len, register int sh)
+__shl(digit *p, int len, int sh)
 {
-   register int i;
+   int i;
 
for (i = 0; i < len; i++)
p[i] = LHALF(p[i] << sh) | (p[i + 1] >> (HALF_BITS - sh));
@@ -82,7 +82,7 @@ __qdivrem(uq, vq, arq)
 {
union uu tmp;
digit *u, *v, *q;
-   register digit v1, v2;
+   digit v1, v2;
u_long qhat, rhat, t;
int m, n, d, j, i;
digit uspace[5], vspace[5], qspace[5];
@@ -192,7 +192,7 @@ __qdivrem(uq, vq, arq)
v1 = v[1];  /* for D3 -- note that v[1..n] are constant */
v2 = v[2];  /* for D3 */
do {
-  

svn commit: r319283 - stable/10/lib/libz

[Xin LI]

Author: delphij
Date: Wed May 31 05:38:57 2017
New Revision: 319283
URL: https://svnweb.freebsd.org/changeset/base/319283

Log:
  MFC r316635:
  
  Enable 16-bit longest_match for x86.
  
  This gives a ~2% improvement in compression tests.

Modified:
  stable/10/lib/libz/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libz/Makefile
==
--- stable/10/lib/libz/Makefile Wed May 31 05:37:51 2017(r319282)
+++ stable/10/lib/libz/Makefile Wed May 31 05:38:57 2017(r319283)
@@ -39,19 +39,9 @@ SRCS+=   uncompr.c
 SRCS+= zopen.c
 SRCS+= zutil.c
 
-#.if ${MACHINE_ARCH} == "i386" && ${MACHINE_CPU:M*i686*}
-#.PATH:${ZLIBSRC}/contrib/asm686
-#SRCS+=match.S
-#CFLAGS+=  -DASMV -DNO_UNDERLINE
-#ACFLAGS+= -Wa,--noexecstack
-#.endif
-
-#.if ${MACHINE_ARCH} == "amd64"
-#.PATH:${ZLIBSRC}/contrib/gcc_gvmat64
-#SRCS+=gvmat64.S
-#CFLAGS+=  -DASMV -DNO_UNDERLINE
-#ACFLAGS+= -Wa,--noexecstack
-#.endif
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64
+CFLAGS+=   -DUNALIGNED_OK
+.endif
 
 VERSION_DEF=   ${.CURDIR}/Versions.def
 SYMBOL_MAPS=   ${.CURDIR}/Symbol.map
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r319281 - stable/10/usr.bin/gzip

[Xin LI]

Author: delphij
Date: Wed May 31 05:33:32 2017
New Revision: 319281
URL: https://svnweb.freebsd.org/changeset/base/319281

Log:
  MFC r313327:
  
  Reflect actual NetBSD revision we already have.

Modified:
  stable/10/usr.bin/gzip/unxz.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/gzip/unxz.c
==
--- stable/10/usr.bin/gzip/unxz.c   Wed May 31 05:29:20 2017
(r319280)
+++ stable/10/usr.bin/gzip/unxz.c   Wed May 31 05:33:32 2017
(r319281)
@@ -1,4 +1,4 @@
-/* $NetBSD: unxz.c,v 1.5 2011/09/30 01:32:21 christos Exp $*/
+/* $NetBSD: unxz.c,v 1.6 2016/01/29 15:19:01 christos Exp $*/
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r319278 - in stable/10: lib/libc/sys sys/sys sys/vm

[Xin LI]

Author: delphij
Date: Wed May 31 05:11:28 2017
New Revision: 319278
URL: https://svnweb.freebsd.org/changeset/base/319278

Log:
  MFC r315272, r315370
  
  r315272:
  Implement INHERIT_ZERO for minherit(2).
  
  INHERIT_ZERO is an OpenBSD feature.
  
  When a page is marked as such, it would be zeroed
  upon fork().
  
  This would be used in new arc4random(3) functions.
  
  PR:   182610
  Reviewed by:  kib (earlier version)
  Differential Revision:https://reviews.freebsd.org/D427
  
  r315370:
  The adj_free and max_free values of new_entry will be calculated and
  assigned by subsequent vm_map_entry_link(), therefore, remove the
  pointless copying.
  
  Submitted by: alc

Modified:
  stable/10/lib/libc/sys/minherit.2
  stable/10/sys/sys/mman.h
  stable/10/sys/vm/vm.h
  stable/10/sys/vm/vm_map.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/sys/minherit.2
==
--- stable/10/lib/libc/sys/minherit.2   Wed May 31 05:10:03 2017
(r319277)
+++ stable/10/lib/libc/sys/minherit.2   Wed May 31 05:11:28 2017
(r319278)
@@ -29,7 +29,7 @@
 .\"
 .\"@(#)minherit.2  8.1 (Berkeley) 6/9/93
 .\"
-.Dd October 30, 2007
+.Dd March 15, 2017
 .Dt MINHERIT 2
 .Os
 .Sh NAME
@@ -91,6 +91,11 @@ it will no longer be shared in the parent
 after the parent forks and there is no way to get the previous
 shared-backing-store mapping without unmapping and remapping the address
 space in the parent.
+.It Dv INHERIT_ZERO
+This option causes the address space in question to be mapped as new
+anonymous pages,
+which would be initialized to all zero bytes,
+in the child process.
 .El
 .Sh RETURN VALUES
 .Rv -std minherit
@@ -130,6 +135,13 @@ system call first appeared in
 .Ox
 and then in
 .Fx 2.2 .
+.Pp
+The
+.Dv INHERIT_ZERO
+support first appeared in
+.Ox 5.6
+and then in
+.Fx 12.0 .
 .Sh BUGS
 Once you set inheritance to
 .Dv MAP_PRIVATE

Modified: stable/10/sys/sys/mman.h
==
--- stable/10/sys/sys/mman.hWed May 31 05:10:03 2017(r319277)
+++ stable/10/sys/sys/mman.hWed May 31 05:11:28 2017(r319278)
@@ -43,6 +43,7 @@
 #define INHERIT_SHARE  0
 #define INHERIT_COPY   1
 #define INHERIT_NONE   2
+#define INHERIT_ZERO   3
 #endif
 
 /*

Modified: stable/10/sys/vm/vm.h
==
--- stable/10/sys/vm/vm.h   Wed May 31 05:10:03 2017(r319277)
+++ stable/10/sys/vm/vm.h   Wed May 31 05:11:28 2017(r319278)
@@ -68,6 +68,7 @@ typedef char vm_inherit_t;/* inheritance codes */
 #defineVM_INHERIT_SHARE((vm_inherit_t) 0)
 #defineVM_INHERIT_COPY ((vm_inherit_t) 1)
 #defineVM_INHERIT_NONE ((vm_inherit_t) 2)
+#defineVM_INHERIT_ZERO ((vm_inherit_t) 3)
 #defineVM_INHERIT_DEFAULT  VM_INHERIT_COPY
 
 typedef u_char vm_prot_t;  /* protection codes */

Modified: stable/10/sys/vm/vm_map.c
==
--- stable/10/sys/vm/vm_map.c   Wed May 31 05:10:03 2017(r319277)
+++ stable/10/sys/vm/vm_map.c   Wed May 31 05:11:28 2017(r319278)
@@ -2240,6 +2240,7 @@ vm_map_inherit(vm_map_t map, vm_offset_t start, vm_off
case VM_INHERIT_NONE:
case VM_INHERIT_COPY:
case VM_INHERIT_SHARE:
+   case VM_INHERIT_ZERO:
break;
default:
return (KERN_INVALID_ARGUMENT);
@@ -3397,6 +3398,34 @@ vmspace_fork(struct vmspace *vm1, vm_ooffset_t *fork_c
vmspace_map_entry_forked(vm1, vm2, new_entry);
vm_map_copy_entry(old_map, new_map, old_entry,
new_entry, fork_charge);
+   break;
+
+   case VM_INHERIT_ZERO:
+   /*
+* Create a new anonymous mapping entry modelled from
+* the old one.
+*/
+   new_entry = vm_map_entry_create(new_map);
+   memset(new_entry, 0, sizeof(*new_entry));
+
+   new_entry->start = old_entry->start;
+   new_entry->end = old_entry->end;
+   new_entry->avail_ssize = old_entry->avail_ssize;
+   new_entry->eflags = old_entry->eflags &
+   ~(MAP_ENTRY_USER_WIRED | MAP_ENTRY_IN_TRANSITION |
+   MAP_ENTRY_VN_WRITECNT);
+   new_entry->protection = old_entry->protection;
+   new_entry->max_protection = old_entry->max_protection;
+   new_entry->inheritance = VM_INHERIT_ZERO;
+
+   vm_map_entry_link(new_map, new_map->header.prev,
+   new_entry);
+   

svn commit: r316442 - stable/10/usr.bin/sed

[Xin LI]

Author: delphij
Date: Mon Apr  3 06:14:23 2017
New Revision: 316442
URL: https://svnweb.freebsd.org/changeset/base/316442

Log:
  MFC r312404, r312519, r313277:
  
  Use S_ISREG instead of manual & (also it's better to compare the
  result from & and the pattern instead of just assuming it's one bit
  value).
  
  Pointed out by Tianjie Mao .

Modified:
  stable/10/usr.bin/sed/main.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/sed/main.c
==
--- stable/10/usr.bin/sed/main.cMon Apr  3 06:13:05 2017
(r316441)
+++ stable/10/usr.bin/sed/main.cMon Apr  3 06:14:23 2017
(r316442)
@@ -391,7 +391,7 @@ mf_fgets(SPACE *sp, enum e_spflag spflag
if (inplace != NULL) {
if (lstat(fname, ) != 0)
err(1, "%s", fname);
-   if (!(sb.st_mode & S_IFREG))
+   if (!S_ISREG(sb.st_mode))
errx(1, "%s: %s %s", fname,
"in-place editing only",
"works for regular files");
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r316440 - stable/10/share/man/man4

[Xin LI]

Author: delphij
Date: Mon Apr  3 06:09:12 2017
New Revision: 316440
URL: https://svnweb.freebsd.org/changeset/base/316440

Log:
  MFC r315619: pet manlint.

Modified:
  stable/10/share/man/man4/cpuctl.4
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/man/man4/cpuctl.4
==
--- stable/10/share/man/man4/cpuctl.4   Mon Apr  3 06:07:40 2017
(r316439)
+++ stable/10/share/man/man4/cpuctl.4   Mon Apr  3 06:09:12 2017
(r316440)
@@ -160,7 +160,11 @@ field should point to the firmware image
 .Pp
 For additional information refer to
 .Pa cpuctl.h .
-.Sh RETURN VALUES
+.Sh FILES
+.Bl -tag -width /dev/cpuctl -compact
+.It Pa /dev/cpuctl
+.El
+.Sh ERRORS
 .Bl -tag -width Er
 .It Bq Er ENXIO
 The operation requested is not supported by the device (e.g., unsupported
@@ -172,10 +176,6 @@ No physical memory was available to comp
 .It Bq Er EFAULT
 The firmware image address points outside the process address space.
 .El
-.Sh FILES
-.Bl -tag -width /dev/cpuctl -compact
-.It Pa /dev/cpuctl
-.El
 .Sh SEE ALSO
 .Xr hwpmc 4 ,
 .Xr cpucontrol 8
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r316069 - in stable/10: contrib/ntp contrib/ntp/adjtimed contrib/ntp/clockstuff contrib/ntp/html contrib/ntp/include contrib/ntp/include/isc contrib/ntp/kernel contrib/ntp/kernel/sys co...

[Xin LI]

Author: delphij
Date: Tue Mar 28 04:48:55 2017
New Revision: 316069
URL: https://svnweb.freebsd.org/changeset/base/316069

Log:
  MFC r315871: MFV r315791: ntp 4.2.8p10.

Added:
  stable/10/contrib/ntp/sntp/harden/
 - copied from r315871, head/contrib/ntp/sntp/harden/
  stable/10/contrib/ntp/sntp/m4/ntp_harden.m4
 - copied unchanged from r315871, head/contrib/ntp/sntp/m4/ntp_harden.m4
  stable/10/contrib/ntp/sntp/scripts/genHardFlags
 - copied unchanged from r315871, head/contrib/ntp/sntp/scripts/genHardFlags
Deleted:
  stable/10/contrib/ntp/compile
  stable/10/contrib/ntp/config.guess
  stable/10/contrib/ntp/config.sub
  stable/10/contrib/ntp/depcomp
  stable/10/contrib/ntp/install-sh
  stable/10/contrib/ntp/ltmain.sh
  stable/10/contrib/ntp/missing
  stable/10/contrib/ntp/sntp/compile
  stable/10/contrib/ntp/sntp/config.guess
  stable/10/contrib/ntp/sntp/config.sub
  stable/10/contrib/ntp/sntp/depcomp
  stable/10/contrib/ntp/sntp/install-sh
  stable/10/contrib/ntp/sntp/ltmain.sh
  stable/10/contrib/ntp/sntp/missing
  stable/10/contrib/ntp/tests/
  stable/10/contrib/ntp/ylwrap
Modified:
  stable/10/contrib/ntp/COPYRIGHT
  stable/10/contrib/ntp/ChangeLog
  stable/10/contrib/ntp/CommitLog
  stable/10/contrib/ntp/Makefile.in
  stable/10/contrib/ntp/NEWS
  stable/10/contrib/ntp/aclocal.m4
  stable/10/contrib/ntp/adjtimed/Makefile.am
  stable/10/contrib/ntp/adjtimed/Makefile.in
  stable/10/contrib/ntp/clockstuff/Makefile.am
  stable/10/contrib/ntp/clockstuff/Makefile.in
  stable/10/contrib/ntp/config.h.in
  stable/10/contrib/ntp/configure
  stable/10/contrib/ntp/configure.ac
  stable/10/contrib/ntp/html/copyright.html
  stable/10/contrib/ntp/include/Makefile.in
  stable/10/contrib/ntp/include/isc/Makefile.in
  stable/10/contrib/ntp/include/libssl_compat.h
  stable/10/contrib/ntp/include/ntp_crypto.h
  stable/10/contrib/ntp/include/ntp_fp.h
  stable/10/contrib/ntp/include/ntp_md5.h
  stable/10/contrib/ntp/include/ntp_stdlib.h
  stable/10/contrib/ntp/include/ntpd.h
  stable/10/contrib/ntp/include/ssl_applink.c
  stable/10/contrib/ntp/kernel/Makefile.in
  stable/10/contrib/ntp/kernel/sys/Makefile.in
  stable/10/contrib/ntp/lib/isc/inet_pton.c
  stable/10/contrib/ntp/libntp/Makefile.am
  stable/10/contrib/ntp/libntp/Makefile.in
  stable/10/contrib/ntp/libntp/a_md5encrypt.c
  stable/10/contrib/ntp/libntp/audio.c
  stable/10/contrib/ntp/libntp/authkeys.c
  stable/10/contrib/ntp/libntp/emalloc.c
  stable/10/contrib/ntp/libntp/libssl_compat.c
  stable/10/contrib/ntp/libntp/ntp_intres.c
  stable/10/contrib/ntp/libntp/recvbuff.c
  stable/10/contrib/ntp/libntp/ssl_init.c
  stable/10/contrib/ntp/libntp/statestr.c
  stable/10/contrib/ntp/libntp/work_fork.c
  stable/10/contrib/ntp/libparse/Makefile.am
  stable/10/contrib/ntp/libparse/Makefile.in
  stable/10/contrib/ntp/libparse/clk_trimtsip.c
  stable/10/contrib/ntp/libparse/gpstolfp.c
  stable/10/contrib/ntp/ntpd/Makefile.am
  stable/10/contrib/ntp/ntpd/Makefile.in
  stable/10/contrib/ntp/ntpd/invoke-ntp.conf.texi
  stable/10/contrib/ntp/ntpd/invoke-ntp.keys.texi
  stable/10/contrib/ntp/ntpd/invoke-ntpd.texi
  stable/10/contrib/ntp/ntpd/ntp.conf.5man
  stable/10/contrib/ntp/ntpd/ntp.conf.5mdoc
  stable/10/contrib/ntp/ntpd/ntp.conf.html
  stable/10/contrib/ntp/ntpd/ntp.conf.man.in
  stable/10/contrib/ntp/ntpd/ntp.conf.mdoc.in
  stable/10/contrib/ntp/ntpd/ntp.keys.5man
  stable/10/contrib/ntp/ntpd/ntp.keys.5mdoc
  stable/10/contrib/ntp/ntpd/ntp.keys.html
  stable/10/contrib/ntp/ntpd/ntp.keys.man.in
  stable/10/contrib/ntp/ntpd/ntp.keys.mdoc.in
  stable/10/contrib/ntp/ntpd/ntp_config.c
  stable/10/contrib/ntp/ntpd/ntp_control.c
  stable/10/contrib/ntp/ntpd/ntp_crypto.c
  stable/10/contrib/ntp/ntpd/ntp_io.c
  stable/10/contrib/ntp/ntpd/ntp_loopfilter.c
  stable/10/contrib/ntp/ntpd/ntp_parser.c
  stable/10/contrib/ntp/ntpd/ntp_parser.h
  stable/10/contrib/ntp/ntpd/ntp_peer.c
  stable/10/contrib/ntp/ntpd/ntp_proto.c
  stable/10/contrib/ntp/ntpd/ntp_restrict.c
  stable/10/contrib/ntp/ntpd/ntp_scanner.c
  stable/10/contrib/ntp/ntpd/ntpd-opts.c
  stable/10/contrib/ntp/ntpd/ntpd-opts.h
  stable/10/contrib/ntp/ntpd/ntpd.1ntpdman
  stable/10/contrib/ntp/ntpd/ntpd.1ntpdmdoc
  stable/10/contrib/ntp/ntpd/ntpd.c
  stable/10/contrib/ntp/ntpd/ntpd.html
  stable/10/contrib/ntp/ntpd/ntpd.man.in
  stable/10/contrib/ntp/ntpd/ntpd.mdoc.in
  stable/10/contrib/ntp/ntpd/refclock_datum.c
  stable/10/contrib/ntp/ntpd/refclock_gpsdjson.c
  stable/10/contrib/ntp/ntpd/refclock_jjy.c
  stable/10/contrib/ntp/ntpd/refclock_mx4200.c
  stable/10/contrib/ntp/ntpd/refclock_nmea.c
  stable/10/contrib/ntp/ntpd/refclock_oncore.c
  stable/10/contrib/ntp/ntpd/refclock_parse.c
  stable/10/contrib/ntp/ntpdate/Makefile.am
  stable/10/contrib/ntp/ntpdate/Makefile.in
  stable/10/contrib/ntp/ntpdate/ntpdate.c
  stable/10/contrib/ntp/ntpdc/Makefile.am
  stable/10/contrib/ntp/ntpdc/Makefile.in
  stable/10/contrib/ntp/ntpdc/invoke-ntpdc.texi
  stable/10/contrib/ntp/ntpdc/ntpdc-opts.c
  

svn commit: r315227 - in stable/10: lib/libc/gen sys/libkern

[Xin LI]

Author: delphij
Date: Tue Mar 14 06:12:51 2017
New Revision: 315227
URL: https://svnweb.freebsd.org/changeset/base/315227

Log:
  MFC r315225:
  
  Discard first 3072 bytes of RC4 keystream, this is a bandaid
  that allows us to work on switching to a more modern PRNG.
  
  Submitted by: Steven Chamberlain 
  Approved by:  so

Modified:
  stable/10/lib/libc/gen/arc4random.c
  stable/10/sys/libkern/arc4random.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/gen/arc4random.c
==
--- stable/10/lib/libc/gen/arc4random.c Tue Mar 14 06:10:40 2017
(r315226)
+++ stable/10/lib/libc/gen/arc4random.c Tue Mar 14 06:12:51 2017
(r315227)
@@ -172,7 +172,7 @@ arc4_stir(void)
 * Discard early keystream, as per recommendations in:
 * "(Not So) Random Shuffles of RC4" by Ilya Mironov.
 */
-   for (i = 0; i < 1024; i++)
+   for (i = 0; i < 3072; i++)
(void)arc4_getbyte();
arc4_count = 160;
 }

Modified: stable/10/sys/libkern/arc4random.c
==
--- stable/10/sys/libkern/arc4random.c  Tue Mar 14 06:10:40 2017
(r315226)
+++ stable/10/sys/libkern/arc4random.c  Tue Mar 14 06:12:51 2017
(r315227)
@@ -80,9 +80,9 @@ arc4_randomstir (void)
/*
 * Throw away the first N words of output, as suggested in the
 * paper "Weaknesses in the Key Scheduling Algorithm of RC4"
-* by Fluher, Mantin, and Shamir.  (N = 256 in our case.)
+* by Fluher, Mantin, and Shamir.  (N = 768 in our case.)
 */
-   for (n = 0; n < 256*4; n++)
+   for (n = 0; n < 768*4; n++)
arc4_randbyte();
mtx_unlock(_mtx);
 }
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r313796 - in stable/10: contrib/zlib contrib/zlib/contrib contrib/zlib/test lib/libz

[Xin LI]

Author: delphij
Date: Thu Feb 16 06:16:50 2017
New Revision: 313796
URL: https://svnweb.freebsd.org/changeset/base/313796

Log:
  MFC r311285,312335: zlib 1.2.11.

Modified:
  stable/10/contrib/zlib/ChangeLog
  stable/10/contrib/zlib/README
  stable/10/contrib/zlib/adler32.c
  stable/10/contrib/zlib/compress.c
  stable/10/contrib/zlib/contrib/README.contrib
  stable/10/contrib/zlib/crc32.c
  stable/10/contrib/zlib/deflate.c
  stable/10/contrib/zlib/deflate.h
  stable/10/contrib/zlib/gzguts.h
  stable/10/contrib/zlib/gzlib.c
  stable/10/contrib/zlib/gzread.c
  stable/10/contrib/zlib/gzwrite.c
  stable/10/contrib/zlib/infback.c
  stable/10/contrib/zlib/inffast.c
  stable/10/contrib/zlib/inflate.c
  stable/10/contrib/zlib/inflate.h
  stable/10/contrib/zlib/inftrees.c
  stable/10/contrib/zlib/test/example.c
  stable/10/contrib/zlib/test/infcover.c
  stable/10/contrib/zlib/test/minigzip.c
  stable/10/contrib/zlib/trees.c
  stable/10/contrib/zlib/uncompr.c
  stable/10/contrib/zlib/zconf.h
  stable/10/contrib/zlib/zconf.h.in
  stable/10/contrib/zlib/zlib.3
  stable/10/contrib/zlib/zlib.h
  stable/10/contrib/zlib/zlib.map
  stable/10/contrib/zlib/zutil.c
  stable/10/contrib/zlib/zutil.h
  stable/10/lib/libz/Symbol.map
  stable/10/lib/libz/Versions.def
  stable/10/lib/libz/zlib.pc
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/zlib/ChangeLog
==
--- stable/10/contrib/zlib/ChangeLogThu Feb 16 06:16:23 2017
(r313795)
+++ stable/10/contrib/zlib/ChangeLogThu Feb 16 06:16:50 2017
(r313796)
@@ -1,10 +1,53 @@
 
 ChangeLog file for zlib
 
+Changes in 1.2.11 (15 Jan 2017)
+- Fix deflate stored bug when pulling last block from window
+- Permit immediate deflateParams changes before any deflate input
+
+Changes in 1.2.10 (2 Jan 2017)
+- Avoid warnings on snprintf() return value
+- Fix bug in deflate_stored() for zero-length input
+- Fix bug in gzwrite.c that produced corrupt gzip files
+- Remove files to be installed before copying them in Makefile.in
+- Add warnings when compiling with assembler code
+
+Changes in 1.2.9 (31 Dec 2016)
+- Fix contrib/minizip to permit unzipping with desktop API [Zouzou]
+- Improve contrib/blast to return unused bytes
+- Assure that gzoffset() is correct when appending
+- Improve compress() and uncompress() to support large lengths
+- Fix bug in test/example.c where error code not saved
+- Remedy Coverity warning [Randers-Pehrson]
+- Improve speed of gzprintf() in transparent mode
+- Fix inflateInit2() bug when windowBits is 16 or 32
+- Change DEBUG macro to ZLIB_DEBUG
+- Avoid uninitialized access by gzclose_w()
+- Allow building zlib outside of the source directory
+- Fix bug that accepted invalid zlib header when windowBits is zero
+- Fix gzseek() problem on MinGW due to buggy _lseeki64 there
+- Loop on write() calls in gzwrite.c in case of non-blocking I/O
+- Add --warn (-w) option to ./configure for more compiler warnings
+- Reject a window size of 256 bytes if not using the zlib wrapper
+- Fix bug when level 0 used with Z_HUFFMAN or Z_RLE
+- Add --debug (-d) option to ./configure to define ZLIB_DEBUG
+- Fix bugs in creating a very large gzip header
+- Add uncompress2() function, which returns the input size used
+- Assure that deflateParams() will not switch functions mid-block
+- Dramatically speed up deflation for level 0 (storing)
+- Add gzfread(), duplicating the interface of fread()
+- Add gzfwrite(), duplicating the interface of fwrite()
+- Add deflateGetDictionary() function
+- Use snprintf() for later versions of Microsoft C
+- Fix *Init macros to use z_ prefix when requested
+- Replace as400 with os400 for OS/400 support [Monnerat]
+- Add crc32_z() and adler32_z() functions with size_t lengths
+- Update Visual Studio project files [AraHaan]
+
 Changes in 1.2.8 (28 Apr 2013)
 - Update contrib/minizip/iowin32.c for Windows RT [Vollant]
 - Do not force Z_CONST for C++
-- Clean up contrib/vstudio [Ro�]
+- Clean up contrib/vstudio [Roß]
 - Correct spelling error in zlib.h
 - Fix mixed line endings in contrib/vstudio
 
@@ -34,7 +77,7 @@ Changes in 1.2.7.1 (24 Mar 2013)
 - Clean up the usage of z_const and respect const usage within zlib
 - Clean up examples/gzlog.[ch] comparisons of different types
 - Avoid shift equal to bits in type (caused endless loop)
-- Fix unintialized value bug in gzputc() introduced by const patches
+- Fix uninitialized value bug in gzputc() introduced by const patches
 - Fix memory allocation error in examples/zran.c [Nor]
 - Fix bug where gzopen(), gzclose() would write an empty file
 - Fix bug in gzclose() when gzwrite() runs out of memory
@@ -194,7 +237,7 @@ Changes in 1.2.5.2 (17 Dec 2011)
 - Add a transparent write mode to gzopen() when 'T' is in the mode
 - Update python link in zlib man page
 - Get inffixed.h and MAKEFIXED result to match
-- Add a ./config --solo option to make zlib subset with no libary 

svn commit: r313534 - stable/10

[Xin LI]

Author: delphij
Date: Fri Feb 10 06:58:18 2017
New Revision: 313534
URL: https://svnweb.freebsd.org/changeset/base/313534

Log:
  MFC r274583: Default to use 10 seconds as nap interval instead of 1.
  (the mergeinfo portion; actual code changes were committed from wrong
  directory).

Modified:
Directory Properties:
  stable/10/   (props changed)
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r313533 - stable/10/usr.sbin/watchdogd

[Xin LI]

Author: delphij
Date: Fri Feb 10 06:53:48 2017
New Revision: 313533
URL: https://svnweb.freebsd.org/changeset/base/313533

Log:
  MFC r274583: Default to use 10 seconds as nap interval instead of 1.

Modified:
  stable/10/usr.sbin/watchdogd/watchdogd.8
  stable/10/usr.sbin/watchdogd/watchdogd.c

Modified: stable/10/usr.sbin/watchdogd/watchdogd.8
==
--- stable/10/usr.sbin/watchdogd/watchdogd.8Fri Feb 10 06:34:52 2017
(r313532)
+++ stable/10/usr.sbin/watchdogd/watchdogd.8Fri Feb 10 06:53:48 2017
(r313533)
@@ -80,7 +80,7 @@ reboot if there are problems with the sc
 The
 .Fl s Ar sleep
 argument can be used to control the sleep period between each execution
-of the check and defaults to one second.
+of the check and defaults to 10 seconds.
 .Pp
 The
 .Fl t Ar timeout

Modified: stable/10/usr.sbin/watchdogd/watchdogd.c
==
--- stable/10/usr.sbin/watchdogd/watchdogd.cFri Feb 10 06:34:52 2017
(r313532)
+++ stable/10/usr.sbin/watchdogd/watchdogd.cFri Feb 10 06:53:48 2017
(r313533)
@@ -80,7 +80,7 @@ static u_int timeout = WD_TO_128SEC;
 static u_int exit_timeout = WD_TO_NEVER;
 static u_int pretimeout = 0;
 static u_int timeout_sec;
-static u_int nap = 1;
+static u_int nap = 10;
 static int passive = 0;
 static int is_daemon = 0;
 static int is_dry_run = 0;  /* do not arm the watchdog, only
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r313324 - stable/10/usr.bin/mail

[Xin LI]

Author: delphij
Date: Mon Feb  6 05:34:47 2017
New Revision: 313324
URL: https://svnweb.freebsd.org/changeset/base/313324

Log:
  MFC r312663: When creating record file, use umask 077 instead of the default.

Modified:
  stable/10/usr.bin/mail/send.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/mail/send.c
==
--- stable/10/usr.bin/mail/send.c   Mon Feb  6 05:29:35 2017
(r313323)
+++ stable/10/usr.bin/mail/send.c   Mon Feb  6 05:34:47 2017
(r313324)
@@ -566,8 +566,13 @@ savemail(char name[], FILE *fi)
char buf[BUFSIZ];
int i;
time_t now;
+   mode_t saved_umask;
 
-   if ((fo = Fopen(name, "a")) == NULL) {
+   saved_umask = umask(077);
+   fo = Fopen(name, "a");
+   umask(saved_umask);
+
+   if (fo == NULL) {
warn("%s", name);
return (-1);
}
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r313320 - stable/10/usr.bin/mail

[Xin LI]

Author: delphij
Date: Mon Feb  6 05:24:17 2017
New Revision: 313320
URL: https://svnweb.freebsd.org/changeset/base/313320

Log:
  MFC r312664: Always initialize 'c'.

Modified:
  stable/10/usr.bin/mail/send.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/mail/send.c
==
--- stable/10/usr.bin/mail/send.c   Mon Feb  6 05:22:55 2017
(r313319)
+++ stable/10/usr.bin/mail/send.c   Mon Feb  6 05:24:17 2017
(r313320)
@@ -59,7 +59,7 @@ sendmessage(struct message *mp, FILE *ob
FILE *ibuf;
char *cp, *cp2, line[LINESIZE];
int ishead, infld, ignoring, dostat, firstline;
-   int c, length, prefixlen;
+   int c = 0, length, prefixlen;
 
/*
 * Compute the prefix string, without trailing whitespace
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r312863 - stable/10/crypto/openssl/crypto/evp

[Xin LI]

Author: delphij
Date: Fri Jan 27 07:45:06 2017
New Revision: 312863
URL: https://svnweb.freebsd.org/changeset/base/312863

Log:
  Backport OpenSSL commit 56336b6c7a75ed28067cadedd8ac46572348bc2f:
  
  crypto/evp: harden RC4_MD5 cipher.
  
  Originally a crash in 32-bit build was reported CHACHA20-POLY1305
  cipher. The crash is triggered by truncated packet and is result
  of excessive hashing to the edge of accessible memory (or bogus
  MAC value is produced if x86 MD5 assembly module is involved). Since
  hash operation is read-only it is not considered to be exploitable
  beyond a DoS condition.
  
  Thanks to Robert Święcki for report.
  
  This is a direct commit to stable/10.
  
  Security: CVE-2017-3731

Modified:
  stable/10/crypto/openssl/crypto/evp/e_rc4_hmac_md5.c

Modified: stable/10/crypto/openssl/crypto/evp/e_rc4_hmac_md5.c
==
--- stable/10/crypto/openssl/crypto/evp/e_rc4_hmac_md5.cFri Jan 27 
05:59:26 2017(r312862)
+++ stable/10/crypto/openssl/crypto/evp/e_rc4_hmac_md5.cFri Jan 27 
07:45:06 2017(r312863)
@@ -267,6 +267,8 @@ static int rc4_hmac_md5_ctrl(EVP_CIPHER_
 len = p[arg - 2] << 8 | p[arg - 1];
 
 if (!ctx->encrypt) {
+if (len < MD5_DIGEST_LENGTH)
+return -1;
 len -= MD5_DIGEST_LENGTH;
 p[arg - 2] = len >> 8;
 p[arg - 1] = len;
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r312518 - in stable/10: contrib/xz contrib/xz/src/common contrib/xz/src/liblzma/api/lzma contrib/xz/src/liblzma/check contrib/xz/src/liblzma/common contrib/xz/src/liblzma/delta contrib/...

[Xin LI]

Author: delphij
Date: Fri Jan 20 06:40:12 2017
New Revision: 312518
URL: https://svnweb.freebsd.org/changeset/base/312518

Log:
  MFC r311504: MFV r311477: xz 5.2.3.

Modified:
  stable/10/contrib/xz/ChangeLog
  stable/10/contrib/xz/THANKS
  stable/10/contrib/xz/src/common/tuklib_cpucores.c
  stable/10/contrib/xz/src/common/tuklib_physmem.c
  stable/10/contrib/xz/src/liblzma/api/lzma/version.h
  stable/10/contrib/xz/src/liblzma/check/check.h
  stable/10/contrib/xz/src/liblzma/common/alone_decoder.c
  stable/10/contrib/xz/src/liblzma/common/alone_encoder.c
  stable/10/contrib/xz/src/liblzma/common/auto_decoder.c
  stable/10/contrib/xz/src/liblzma/common/block_decoder.c
  stable/10/contrib/xz/src/liblzma/common/block_encoder.c
  stable/10/contrib/xz/src/liblzma/common/common.h
  stable/10/contrib/xz/src/liblzma/common/index.c
  stable/10/contrib/xz/src/liblzma/common/index_decoder.c
  stable/10/contrib/xz/src/liblzma/common/index_encoder.c
  stable/10/contrib/xz/src/liblzma/common/stream_decoder.c
  stable/10/contrib/xz/src/liblzma/common/stream_encoder.c
  stable/10/contrib/xz/src/liblzma/common/stream_encoder_mt.c
  stable/10/contrib/xz/src/liblzma/delta/delta_common.c
  stable/10/contrib/xz/src/liblzma/delta/delta_decoder.c
  stable/10/contrib/xz/src/liblzma/delta/delta_encoder.c
  stable/10/contrib/xz/src/liblzma/delta/delta_private.h
  stable/10/contrib/xz/src/liblzma/lz/lz_decoder.c
  stable/10/contrib/xz/src/liblzma/lz/lz_decoder.h
  stable/10/contrib/xz/src/liblzma/lz/lz_encoder.c
  stable/10/contrib/xz/src/liblzma/lz/lz_encoder.h
  stable/10/contrib/xz/src/liblzma/lzma/lzma2_decoder.c
  stable/10/contrib/xz/src/liblzma/lzma/lzma2_encoder.c
  stable/10/contrib/xz/src/liblzma/lzma/lzma_decoder.c
  stable/10/contrib/xz/src/liblzma/lzma/lzma_encoder.c
  stable/10/contrib/xz/src/liblzma/lzma/lzma_encoder.h
  stable/10/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_fast.c
  stable/10/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_normal.c
  stable/10/contrib/xz/src/liblzma/lzma/lzma_encoder_presets.c
  stable/10/contrib/xz/src/liblzma/lzma/lzma_encoder_private.h
  stable/10/contrib/xz/src/liblzma/simple/arm.c
  stable/10/contrib/xz/src/liblzma/simple/armthumb.c
  stable/10/contrib/xz/src/liblzma/simple/ia64.c
  stable/10/contrib/xz/src/liblzma/simple/powerpc.c
  stable/10/contrib/xz/src/liblzma/simple/simple_coder.c
  stable/10/contrib/xz/src/liblzma/simple/simple_private.h
  stable/10/contrib/xz/src/liblzma/simple/sparc.c
  stable/10/contrib/xz/src/liblzma/simple/x86.c
  stable/10/contrib/xz/src/xz/args.c
  stable/10/contrib/xz/src/xz/coder.c
  stable/10/contrib/xz/src/xz/file_io.c
  stable/10/contrib/xz/src/xz/file_io.h
  stable/10/contrib/xz/src/xz/main.c
  stable/10/contrib/xz/src/xz/private.h
  stable/10/lib/liblzma/config.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/xz/ChangeLog
==
--- stable/10/contrib/xz/ChangeLog  Fri Jan 20 06:38:56 2017
(r312517)
+++ stable/10/contrib/xz/ChangeLog  Fri Jan 20 06:40:12 2017
(r312518)
@@ -1,3 +1,563 @@
+commit 3d566cd519017eee1a400e7961ff14058dfaf33c
+Author: Lasse Collin 
+Date:   2016-12-30 13:26:36 +0200
+
+Bump version and soname for 5.2.3.
+
+ src/liblzma/Makefile.am| 2 +-
+ src/liblzma/api/lzma/version.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 053e624fe33795e779ff736f16ce44a129c829b5
+Author: Lasse Collin 
+Date:   2016-12-30 13:25:10 +0200
+
+Update NEWS for 5.2.3.
+
+ NEWS | 39 +++
+ 1 file changed, 39 insertions(+)
+
+commit cae412b2b77d7fd88d187ed7659331709311f80d
+Author: Lasse Collin 
+Date:   2015-04-01 14:45:25 +0300
+
+xz: Fix the Capsicum rights on user_abort_pipe.
+
+ src/xz/file_io.c | 6 +-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+commit 9ccbae41000572193b9a09e7102f9e84dc6d96de
+Author: Lasse Collin 
+Date:   2016-12-28 21:05:22 +0200
+
+Mention potential sandboxing bugs in INSTALL.
+
+ INSTALL | 5 -
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit e013a337d3de77cce24360dffe956ea2339489b6
+Author: Lasse Collin 
+Date:   2016-11-21 20:24:50 +0200
+
+liblzma: Avoid multiple definitions of lzma_coder structures.
+
+Only one definition was visible in a translation unit.
+It avoided a few casts and temp variables but seems that
+this hack doesn't work with link-time optimizations in compilers
+as it's not C99/C11 compliant.
+
+Fixes:
+http://www.mail-archive.com/xz-devel@tukaani.org/msg00279.html
+
+ src/liblzma/common/alone_decoder.c |  44 +
+ src/liblzma/common/alone_encoder.c |  34 ---
+ src/liblzma/common/auto_decoder.c  |  35 ---
+ src/liblzma/common/block_decoder.c   

svn commit: r312403 - in stable/10: lib/libstand sys/boot/libstand32 sys/boot/userboot/libstand

[Xin LI]

Author: delphij
Date: Thu Jan 19 07:29:52 2017
New Revision: 312403
URL: https://svnweb.freebsd.org/changeset/base/312403

Log:
  MFC r293040,293341,293435:
  
  Reduce libstand Makefile duplication.
  
  PR:   216251

Modified:
  stable/10/lib/libstand/Makefile
  stable/10/sys/boot/libstand32/Makefile
  stable/10/sys/boot/userboot/libstand/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libstand/Makefile
==
--- stable/10/lib/libstand/Makefile Thu Jan 19 06:48:03 2017
(r312402)
+++ stable/10/lib/libstand/Makefile Thu Jan 19 07:29:52 2017
(r312403)
@@ -9,16 +9,20 @@
 .include 
 MK_SSP=no
 
+LIBSTAND_SRC?= ${.CURDIR}
+LIBSTAND_CPUARCH?=${MACHINE_CPUARCH}
+LIBC_SRC=  ${LIBSTAND_SRC}/../libc
+
 LIB=   stand
 NO_PROFILE=
 NO_PIC=
-INCS=  stand.h
-MAN=   libstand.3
+INCS?= stand.h
+MAN?=  libstand.3
 
 WARNS?=0
 
 CFLAGS+= -ffreestanding -Wformat
-CFLAGS+= -I${.CURDIR}
+CFLAGS+= -I${LIBSTAND_SRC}
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 CFLAGS+=   -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float
@@ -50,12 +54,12 @@ SRCS+=  gzguts.h zutil.h __main.c assert.
 # private (pruned) versions of libc string functions
 SRCS+= strcasecmp.c
 
-.PATH: ${.CURDIR}/../libc/net
+.PATH: ${LIBC_SRC}/net
 
 SRCS+= ntoh.c
 
 # string functions from libc
-.PATH: ${.CURDIR}/../libc/string
+.PATH: ${LIBC_SRC}/string
 .if ${MACHINE_CPUARCH} != "ia64"
 SRCS+= bcmp.c bcopy.c bzero.c ffs.c memccpy.c memchr.c memcmp.c memcpy.c \
memmove.c memset.c qdivrem.c strcat.c strchr.c strcmp.c strcpy.c \
@@ -63,60 +67,60 @@ SRCS+=  bcmp.c bcopy.c bzero.c ffs.c memc
strpbrk.c strrchr.c strsep.c strspn.c strstr.c strtok.c swab.c
 .endif
 .if ${MACHINE_CPUARCH} == "arm"
-.PATH: ${.CURDIR}/../libc/arm/gen
+.PATH: ${LIBC_SRC}/arm/gen
 
 .if ${MK_ARM_EABI} == "no"
 SRCS+= divsi3.S
 .else
 # Compiler support functions
-.PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/
+.PATH: ${LIBSTAND_SRC}/../../contrib/compiler-rt/lib/
 # __clzsi2 and ctzsi2 for various builtin functions
 SRCS+= clzsi2.c ctzsi2.c
 # Divide and modulus functions called by the compiler
 SRCS+=  divmoddi4.c  divmodsi4.c  divdi3.c  divsi3.c  moddi3.c  modsi3.c
 SRCS+= udivmoddi4.c udivmodsi4.c udivdi3.c udivsi3.c umoddi3.c umodsi3.c
 
-.PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/arm/
+.PATH: ${LIBSTAND_SRC}/../../contrib/compiler-rt/lib/arm/
 SRCS+= aeabi_idivmod.S aeabi_ldivmod.S aeabi_uidivmod.S aeabi_uldivmod.S
 SRCS+= aeabi_memcmp.S aeabi_memcpy.S aeabi_memmove.S aeabi_memset.S
 .endif
 
 .endif
 .if ${MACHINE_CPUARCH} == "ia64"
-.PATH: ${.CURDIR}/../libc/ia64/string
+.PATH: ${LIBC_SRC}/ia64/string
 SRCS+= bcmp.c bcopy.S bzero.S ffs.S memccpy.c memchr.c memcmp.c memcpy.S \
memmove.S memset.c strcat.c strchr.c strcmp.c strcpy.c strcspn.c \
strlcat.c strlcpy.c \
strlen.c strncat.c strncmp.c strncpy.c strpbrk.c strrchr.c strsep.c \
strspn.c strstr.c strtok.c swab.c
 
-.PATH: ${.CURDIR}/../libc/ia64/gen
+.PATH: ${LIBC_SRC}/ia64/gen
 SRCS+= __divdi3.S __divsi3.S __moddi3.S __modsi3.S
 SRCS+= __udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S
 .endif
 .if ${MACHINE_CPUARCH} == "powerpc"
-.PATH: ${.CURDIR}/../libc/quad
+.PATH: ${LIBC_SRC}/quad
 SRCS+= ashldi3.c ashrdi3.c
-.PATH: ${.CURDIR}/../libc/powerpc/gen
+.PATH: ${LIBC_SRC}/powerpc/gen
 SRCS+= syncicache.c
 .endif
 
 # uuid functions from libc
-.PATH: ${.CURDIR}/../libc/uuid
+.PATH: ${LIBC_SRC}/uuid
 SRCS+= uuid_equal.c uuid_is_nil.c
 
 # _setjmp/_longjmp
 .if ${MACHINE_ARCH} == "powerpc64"
-.PATH: ${.CURDIR}/powerpc
+.PATH: ${LIBSTAND_SRC}/powerpc
 .else
-.PATH: ${.CURDIR}/${MACHINE_CPUARCH}
+.PATH: ${LIBSTAND_SRC}/${LIBSTAND_CPUARCH}
 .endif
 SRCS+= _setjmp.S
 
 # decompression functionality from libbz2
 # NOTE: to actually test this functionality after libbz2 upgrade compile
 # loader(8) with LOADER_BZIP2_SUPPORT defined
-.PATH: ${.CURDIR}/../../contrib/bzip2
+.PATH: ${LIBSTAND_SRC}/../../contrib/bzip2
 CFLAGS+= -DBZ_NO_STDIO -DBZ_NO_COMPRESS
 SRCS+= libstand_bzlib_private.h
 
@@ -134,8 +138,8 @@ libstand_bzlib_private.h: bzlib_private.
${.ALLSRC} > ${.TARGET}
 
 # decompression functionality from libz
-.PATH: ${.CURDIR}/../../contrib/zlib
-CFLAGS+=-DHAVE_MEMCPY -I${.CURDIR}/../../contrib/zlib
+.PATH: ${LIBSTAND_SRC}/../../contrib/zlib
+CFLAGS+=-DHAVE_MEMCPY -I${LIBSTAND_SRC}/../../contrib/zlib
 SRCS+= adler32.c crc32.c libstand_zutil.h libstand_gzguts.h
 
 .for file in infback.c inffast.c inflate.c inftrees.c zutil.c

Modified: stable/10/sys/boot/libstand32/Makefile
==
--- stable/10/sys/boot/libstand32/Makefile  Thu Jan 19 06:48:03 2017
(r312402)
+++ stable/10/sys/boot/libstand32/Makefile  Thu Jan 19 07:29:52 

svn commit: r311756 - stable/10/usr.sbin/jail

[Xin LI]

Author: delphij
Date: Mon Jan  9 06:07:44 2017
New Revision: 311756
URL: https://svnweb.freebsd.org/changeset/base/311756

Log:
  MFC r310614: Don't assign rtjp twice.

Modified:
  stable/10/usr.sbin/jail/jail.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/jail/jail.c
==
--- stable/10/usr.sbin/jail/jail.c  Mon Jan  9 06:05:57 2017
(r311755)
+++ stable/10/usr.sbin/jail/jail.c  Mon Jan  9 06:07:44 2017
(r311756)
@@ -806,8 +806,7 @@ rdtun_params(struct cfjail *j, int dofai
if (jailparam_get(rtparams, nrt,
bool_param(j->intparams[IP_ALLOW_DYING]) ? JAIL_DYING : 0) > 0) {
rtjp = rtparams + 1;
-   for (jp = j->jp, rtjp = rtparams + 1; rtjp < rtparams + nrt;
-jp++) {
+   for (jp = j->jp; rtjp < rtparams + nrt; jp++) {
if (JP_RDTUN(jp) && strcmp(jp->jp_name, "jid")) {
if (!((jp->jp_flags & (JP_BOOL | JP_NOBOOL)) &&
jp->jp_valuelen == 0 &&
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r311753 - stable/10/usr.sbin/pstat

[Xin LI]

Author: delphij
Date: Mon Jan  9 05:58:48 2017
New Revision: 311753
URL: https://svnweb.freebsd.org/changeset/base/311753

Log:
  MFC r310611:
  
   - pstat(8) does not accept any arguments other than getopt() args,
 so don't bother to adjust argc/argv after getopt() loop.
   - Make a string pointer constant.

Modified:
  stable/10/usr.sbin/pstat/pstat.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/pstat/pstat.c
==
--- stable/10/usr.sbin/pstat/pstat.cMon Jan  9 05:57:31 2017
(r311752)
+++ stable/10/usr.sbin/pstat/pstat.cMon Jan  9 05:58:48 2017
(r311753)
@@ -174,8 +174,6 @@ main(int argc, char *argv[])
default:
usage();
}
-   argc -= optind;
-   argv += optind;
 
/*
 * Initialize symbol names list.
@@ -339,7 +337,7 @@ static void
 ttyprt(struct xtty *xt)
 {
int i, j;
-   char *name;
+   const char *name;
 
if (xt->xt_size != sizeof *xt)
errx(1, "struct xtty size mismatch");
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r311747 - stable/10/libexec/talkd

[Xin LI]

Author: delphij
Date: Mon Jan  9 05:44:19 2017
New Revision: 311747
URL: https://svnweb.freebsd.org/changeset/base/311747

Log:
  MFC r310608: Avoid use after free.

Modified:
  stable/10/libexec/talkd/table.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/libexec/talkd/table.c
==
--- stable/10/libexec/talkd/table.c Mon Jan  9 05:41:47 2017
(r311746)
+++ stable/10/libexec/talkd/table.c Mon Jan  9 05:44:19 2017
(r311747)
@@ -82,14 +82,15 @@ static TABLE_ENTRY *table = NIL;
 CTL_MSG *
 find_match(CTL_MSG *request)
 {
-   TABLE_ENTRY *ptr;
+   TABLE_ENTRY *ptr, *next;
time_t current_time;
 
gettimeofday(, NULL);
current_time = tp.tv_sec;
if (debug)
print_request("find_match", request);
-   for (ptr = table; ptr != NIL; ptr = ptr->next) {
+   for (ptr = table; ptr != NIL; ptr = next) {
+   next = ptr->next;
if ((ptr->time - current_time) > MAX_LIFE) {
/* the entry is too old */
if (debug)
@@ -115,7 +116,7 @@ find_match(CTL_MSG *request)
 CTL_MSG *
 find_request(CTL_MSG *request)
 {
-   TABLE_ENTRY *ptr;
+   TABLE_ENTRY *ptr, *next;
time_t current_time;
 
gettimeofday(, NULL);
@@ -126,7 +127,8 @@ find_request(CTL_MSG *request)
 */
if (debug)
print_request("find_request", request);
-   for (ptr = table; ptr != NIL; ptr = ptr->next) {
+   for (ptr = table; ptr != NIL; ptr = next) {
+   next = ptr->next;
if ((ptr->time - current_time) > MAX_LIFE) {
/* the entry is too old */
if (debug)
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r309867 - stable/10/bin/kenv

[Xin LI]

Author: delphij
Date: Mon Dec 12 02:14:42 2016
New Revision: 309867
URL: https://svnweb.freebsd.org/changeset/base/309867

Log:
  MFC r309238,309239:
  
  r309238: Plug a potential memory leak.
  r309239: style(9).

Modified:
  stable/10/bin/kenv/kenv.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/bin/kenv/kenv.c
==
--- stable/10/bin/kenv/kenv.c   Mon Dec 12 02:13:35 2016(r309866)
+++ stable/10/bin/kenv/kenv.c   Mon Dec 12 02:14:42 2016(r309867)
@@ -63,7 +63,6 @@ main(int argc, char **argv)
char *env, *eq, *val;
int ch, error;
 
-   error = 0;
val = NULL;
env = NULL;
while ((ch = getopt(argc, argv, "hNquv")) != -1) {
@@ -128,7 +127,7 @@ main(int argc, char **argv)
 static int
 kdumpenv(void)
 {
-   char *buf, *cp;
+   char *buf, *bp, *cp;
int buflen, envlen;
 
envlen = kenv(KENV_DUMP, NULL, NULL, 0);
@@ -136,10 +135,9 @@ kdumpenv(void)
return (-1);
for (;;) {
buflen = envlen * 120 / 100;
-   buf = malloc(buflen + 1);
+   buf = calloc(1, buflen + 1);
if (buf == NULL)
return (-1);
-   memset(buf, 0, buflen + 1); /* Be defensive */
envlen = kenv(KENV_DUMP, NULL, buf, buflen);
if (envlen < 0) {
free(buf);
@@ -151,21 +149,23 @@ kdumpenv(void)
break;
}
 
-   for (; *buf != '\0'; buf += strlen(buf) + 1) {
+   for (bp = buf; *bp != '\0'; bp += strlen(bp) + 1) {
if (hflag) {
-   if (strncmp(buf, "hint.", 5) != 0)
+   if (strncmp(bp, "hint.", 5) != 0)
continue;
}
-   cp = strchr(buf, '=');
+   cp = strchr(bp, '=');
if (cp == NULL)
continue;
*cp++ = '\0';
if (Nflag)
-   printf("%s\n", buf);
+   printf("%s\n", bp);
else
-   printf("%s=\"%s\"\n", buf, cp);
-   buf = cp;
+   printf("%s=\"%s\"\n", bp, cp);
+   bp = cp;
}
+
+   free(buf);
return (0);
 }
 
@@ -190,7 +190,7 @@ ksetenv(const char *env, char *val)
 {
int ret;
 
-   ret = kenv(KENV_SET, env, val, strlen(val)+1);
+   ret = kenv(KENV_SET, env, val, strlen(val) + 1);
if (ret == 0)
printf("%s=\"%s\"\n", env, val);
return (ret);
@@ -200,7 +200,7 @@ static int
 kunsetenv(const char *env)
 {
int ret;
-   
+
ret = kenv(KENV_UNSET, env, NULL, 0);
return (ret);
 }
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r309862 - stable/10/usr.bin/sort

[Xin LI]

Author: delphij
Date: Mon Dec 12 00:47:12 2016
New Revision: 309862
URL: https://svnweb.freebsd.org/changeset/base/309862

Log:
  MFC r309232-309234:
  
  r309232: Fix an obvious typo.
  r309233: Eliminate variables that are computed, assigned but
   never used.
  r309234: pages and psize are always assigned, so there is no
   need to initialize them as zero.

Modified:
  stable/10/usr.bin/sort/bwstring.c
  stable/10/usr.bin/sort/sort.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/sort/bwstring.c
==
--- stable/10/usr.bin/sort/bwstring.c   Mon Dec 12 00:45:43 2016
(r309861)
+++ stable/10/usr.bin/sort/bwstring.c   Mon Dec 12 00:47:12 2016
(r309862)
@@ -910,7 +910,6 @@ bws_month_score(const struct bwstring *s
 
if (MB_CUR_MAX == 1) {
const unsigned char *end, *s;
-   size_t len;
 
s = s0->data.cstr;
end = s + s0->len;
@@ -918,8 +917,6 @@ bws_month_score(const struct bwstring *s
while (isblank(*s) && s < end)
++s;
 
-   len = strlen((const char*)s);
-
for (int i = 11; i >= 0; --i) {
if (cmonths[i] &&
(s == (unsigned char*)strstr((const char*)s, 
(char*)(cmonths[i]
@@ -928,7 +925,6 @@ bws_month_score(const struct bwstring *s
 
} else {
const wchar_t *end, *s;
-   size_t len;
 
s = s0->data.wstr;
end = s + s0->len;
@@ -936,8 +932,6 @@ bws_month_score(const struct bwstring *s
while (iswblank(*s) && s < end)
++s;
 
-   len = wcslen(s);
-
for (int i = 11; i >= 0; --i) {
if (wmonths[i] && (s == wcsstr(s, wmonths[i])))
return (i);

Modified: stable/10/usr.bin/sort/sort.c
==
--- stable/10/usr.bin/sort/sort.c   Mon Dec 12 00:45:43 2016
(r309861)
+++ stable/10/usr.bin/sort/sort.c   Mon Dec 12 00:47:12 2016
(r309862)
@@ -209,14 +209,10 @@ sort_modifier_empty(struct sort_mods *sm
 static void
 usage(bool opt_err)
 {
-   struct option *o;
FILE *out;
 
-   out = stdout;
-   o = &(long_options[0]);
+   out = opt_err ? stderr : stdout;
 
-   if (opt_err)
-   out = stderr;
fprintf(out, getstr(12), getprogname());
if (opt_err)
exit(2);
@@ -271,8 +267,6 @@ set_hw_params(void)
 {
long pages, psize;
 
-   pages = psize = 0;
-
 #if defined(SORT_THREADS)
ncpu = 1;
 #endif
@@ -280,7 +274,7 @@ set_hw_params(void)
pages = sysconf(_SC_PHYS_PAGES);
if (pages < 1) {
perror("sysconf pages");
-   psize = 1;
+   pages = 1;
}
psize = sysconf(_SC_PAGESIZE);
if (psize < 1) {
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r309848 - in stable/10: contrib/file contrib/file/doc contrib/file/magic contrib/file/magic/Magdir contrib/file/python contrib/file/src lib/libmagic

[Xin LI]

Author: delphij
Date: Sun Dec 11 07:37:20 2016
New Revision: 309848
URL: https://svnweb.freebsd.org/changeset/base/309848

Log:
  MFC r308420: MFV r308392: file 5.29.

Added:
  stable/10/contrib/file/magic/Magdir/algol68
 - copied unchanged from r308420, head/contrib/file/magic/Magdir/algol68
  stable/10/contrib/file/magic/Magdir/application
 - copied unchanged from r308420, head/contrib/file/magic/Magdir/application
  stable/10/contrib/file/magic/Magdir/apt
 - copied unchanged from r308420, head/contrib/file/magic/Magdir/apt
  stable/10/contrib/file/magic/Magdir/psl
 - copied unchanged from r308420, head/contrib/file/magic/Magdir/psl
Modified:
  stable/10/contrib/file/ChangeLog
  stable/10/contrib/file/TODO
  stable/10/contrib/file/config.guess
  stable/10/contrib/file/config.sub
  stable/10/contrib/file/configure
  stable/10/contrib/file/configure.ac
  stable/10/contrib/file/doc/file.man
  stable/10/contrib/file/doc/magic.man
  stable/10/contrib/file/ltmain.sh
  stable/10/contrib/file/magic/Magdir/animation
  stable/10/contrib/file/magic/Magdir/apple
  stable/10/contrib/file/magic/Magdir/bioinformatics
  stable/10/contrib/file/magic/Magdir/c-lang
  stable/10/contrib/file/magic/Magdir/claris
  stable/10/contrib/file/magic/Magdir/commands
  stable/10/contrib/file/magic/Magdir/compress
  stable/10/contrib/file/magic/Magdir/cups
  stable/10/contrib/file/magic/Magdir/editors
  stable/10/contrib/file/magic/Magdir/filesystems
  stable/10/contrib/file/magic/Magdir/fonts
  stable/10/contrib/file/magic/Magdir/gcc
  stable/10/contrib/file/magic/Magdir/gnu
  stable/10/contrib/file/magic/Magdir/images
  stable/10/contrib/file/magic/Magdir/jpeg
  stable/10/contrib/file/magic/Magdir/msdos
  stable/10/contrib/file/magic/Magdir/pgp
  stable/10/contrib/file/magic/Magdir/python
  stable/10/contrib/file/magic/Magdir/ruby
  stable/10/contrib/file/magic/Magdir/sgml
  stable/10/contrib/file/magic/Magdir/sql
  stable/10/contrib/file/magic/Makefile.am
  stable/10/contrib/file/magic/Makefile.in
  stable/10/contrib/file/python/magic.py
  stable/10/contrib/file/src/apprentice.c
  stable/10/contrib/file/src/ascmagic.c
  stable/10/contrib/file/src/cdf.c
  stable/10/contrib/file/src/cdf.h
  stable/10/contrib/file/src/compress.c
  stable/10/contrib/file/src/der.c
  stable/10/contrib/file/src/file.c
  stable/10/contrib/file/src/file.h
  stable/10/contrib/file/src/funcs.c
  stable/10/contrib/file/src/magic.c
  stable/10/contrib/file/src/readcdf.c
  stable/10/contrib/file/src/readelf.c
  stable/10/contrib/file/src/softmagic.c
  stable/10/lib/libmagic/config.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/file/ChangeLog
==
--- stable/10/contrib/file/ChangeLogSun Dec 11 07:33:02 2016
(r309847)
+++ stable/10/contrib/file/ChangeLogSun Dec 11 07:37:20 2016
(r309848)
@@ -1,3 +1,32 @@
+2016-10-25  10:40  Christos Zoulas 
+   
+   * release 5.28
+
+2016-10-24  11:20  Christos Zoulas 
+
+   * der getlength overflow (Jonas Wagner)
+   * multiple magic file load failure (Christoph Biedl)
+
+2016-10-17  11:26  Christos Zoulas 
+
+   * CDF parsing improvements (Guy Helmer)
+
+2016-07-20   7:26  Christos Zoulas 
+
+   * Add support for signed indirect offsets
+
+2016-07-18   7:41  Christos Zoulas 
+
+   * cat /dev/null | file - should print empty (Christoph Biedl)
+
+2016-07-05  15:20  Christos Zoulas 
+
+   * Bump string size from 64 to 96.
+
+2016-06-13  20:20  Christos Zoulas 
+
+   * PR/556: Fix separators on annotations.
+
 2016-06-13  19:40  Christos Zoulas 
 
* release 5.28

Modified: stable/10/contrib/file/TODO
==
--- stable/10/contrib/file/TODO Sun Dec 11 07:33:02 2016(r309847)
+++ stable/10/contrib/file/TODO Sun Dec 11 07:37:20 2016(r309848)
@@ -6,7 +6,6 @@ file, not here. More speculative materia
 listed in the BUGS section of the man page had been fixed!)
 
 ---
-
 It would be nice to simplify file considerably. For example,
 reimplement the apprentice and non-pattern magic methods in Python,
 and compile the magic patterns to a giant regex (or something similar;
@@ -15,8 +14,23 @@ small amount of C is needed (because fas
 required for soft magic, not the more detailed information given by
 hard-wired routines). In this regard, note that hplip, which is
 BSD-licensed, has a magic reimplementation in Python.
-
+---
 Read the kerberos magic entry for more ideas.
-
+---
 Write a string merger to make magic entry sizes dynamic.
 Strings will be converted to offsets from the string table.
+---
+Programming language support, we can introduce the concept of a group
+of rules where n rules need to 

svn commit: r309789 - stable/10/usr.bin/gzip

[Xin LI]

Author: delphij
Date: Sat Dec 10 06:27:45 2016
New Revision: 309789
URL: https://svnweb.freebsd.org/changeset/base/309789

Log:
  MFC r309184:
  
  style(9) indent changes, no actual code change.

Modified:
  stable/10/usr.bin/gzip/unpack.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/gzip/unpack.c
==
--- stable/10/usr.bin/gzip/unpack.c Sat Dec 10 06:24:26 2016
(r309788)
+++ stable/10/usr.bin/gzip/unpack.c Sat Dec 10 06:27:45 2016
(r309789)
@@ -68,22 +68,22 @@
  * leaf nodes count.
  */
 typedef struct {
-   int symbol_size;/* Size of the symbol table */
-   int treelevels; /* Levels for the huffman tree */
+   int symbol_size;/* Size of the symbol table */
+   int treelevels; /* Levels for the huffman tree */
 
-   int *symbolsin; /* Table of leaf symbols count in
-  each level */
-   int *inodesin;  /* Table of internal nodes count in
-  each level */
-
-   char*symbol;/* The symbol table */
-   char*symbol_eob;/* Pointer to the EOB symbol */
-   char**tree; /* Decoding huffman tree (pointers to
-  first symbol of each tree level */
-
-   off_t   uncompressed_size; /* Uncompressed size */
-   FILE*fpIn;  /* Input stream */
-   FILE*fpOut; /* Output stream */
+   int*symbolsin;  /* Table of leaf symbols count in each
+* level */
+   int*inodesin;   /* Table of internal nodes count in
+* each level */
+
+   char   *symbol; /* The symbol table */
+   char   *symbol_eob; /* Pointer to the EOB symbol */
+   char  **tree;   /* Decoding huffman tree (pointers to
+* first symbol of each tree level */
+
+   off_t   uncompressed_size;  /* Uncompressed size */
+   FILE   *fpIn;   /* Input stream */
+   FILE   *fpOut;  /* Output stream */
 } unpack_descriptor_t;
 
 /*
@@ -122,7 +122,7 @@ unpackd_fill_inodesin(const unpack_descr
if (level < unpackd->treelevels) {
unpackd_fill_inodesin(unpackd, level + 1);
unpackd->inodesin[level] = (unpackd->inodesin[level + 1] +
- unpackd->symbolsin[level + 1]) / 2;
+   unpackd->symbolsin[level + 1]) / 2;
} else
unpackd->inodesin[level] = 0;
 }
@@ -163,7 +163,7 @@ unpack_parse_header(int in, int out, cha
 
accepted_bytes(bytes_in, PACK_HEADER_LENGTH);
 
-   /* Obtain uncompressed length (bytes 2,3,4,5)*/
+   /* Obtain uncompressed length (bytes 2,3,4,5) */
unpackd->uncompressed_size = 0;
for (i = 2; i <= 5; i++) {
unpackd->uncompressed_size <<= 8;
@@ -187,7 +187,7 @@ unpack_parse_header(int in, int out, cha
unpackd->symbolsin =
calloc(unpackd->treelevels, sizeof(*(unpackd->symbolsin)));
unpackd->tree =
-   calloc(unpackd->treelevels, (sizeof (*(unpackd->tree;
+   calloc(unpackd->treelevels, (sizeof(*(unpackd->tree;
if (unpackd->inodesin == NULL || unpackd->symbolsin == NULL ||
unpackd->tree == NULL)
maybe_err("calloc");
@@ -196,7 +196,7 @@ unpack_parse_header(int in, int out, cha
unpackd->treelevels--;
 
/* Read the levels symbol count table and calculate total */
-   unpackd->symbol_size = 1;   /* EOB */
+   unpackd->symbol_size = 1;   /* EOB */
for (i = 0; i <= unpackd->treelevels; i++) {
if ((thisbyte = fgetc(unpackd->fpIn)) == EOF)
maybe_err("File appears to be truncated");
@@ -310,7 +310,7 @@ finished:
 static off_t
 unpack(int in, int out, char *pre, size_t prelen, off_t *bytes_in)
 {
-   unpack_descriptor_t unpackd;
+   unpack_descriptor_t unpackd;
 
in = dup(in);
if (in == -1)
@@ -326,4 +326,3 @@ unpack(int in, int out, char *pre, size_
/* If we reached here, the unpack was successful */
return (unpackd.uncompressed_size);
 }
-
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r309008 - in stable/10: contrib/ntp contrib/ntp/html contrib/ntp/html/drivers contrib/ntp/include contrib/ntp/lib/isc contrib/ntp/libntp contrib/ntp/libparse contrib/ntp/ntpd contrib/nt...

[Xin LI]

Author: delphij
Date: Tue Nov 22 16:23:20 2016
New Revision: 309008
URL: https://svnweb.freebsd.org/changeset/base/309008

Log:
  MFC r308957: MFV r308954:
  
  ntp 4.2.8p9.
  
  Approved by:  so

Added:
  stable/10/contrib/ntp/include/libssl_compat.h
 - copied unchanged from r308957, head/contrib/ntp/include/libssl_compat.h
  stable/10/contrib/ntp/libntp/libssl_compat.c
 - copied unchanged from r308957, head/contrib/ntp/libntp/libssl_compat.c
  stable/10/contrib/ntp/sntp/unity/ulib_setup.c
 - copied unchanged from r308957, head/contrib/ntp/sntp/unity/ulib_setup.c
  stable/10/contrib/ntp/sntp/unity/ulib_teardown.c
 - copied unchanged from r308957, 
head/contrib/ntp/sntp/unity/ulib_teardown.c
Modified:
  stable/10/contrib/ntp/ChangeLog
  stable/10/contrib/ntp/CommitLog
  stable/10/contrib/ntp/NEWS
  stable/10/contrib/ntp/configure
  stable/10/contrib/ntp/html/drivers/driver40-ja.html
  stable/10/contrib/ntp/html/drivers/driver40.html
  stable/10/contrib/ntp/html/miscopt.html
  stable/10/contrib/ntp/include/Makefile.am
  stable/10/contrib/ntp/include/Makefile.in
  stable/10/contrib/ntp/include/ntp.h
  stable/10/contrib/ntp/include/ntp_intres.h
  stable/10/contrib/ntp/include/ntpd.h
  stable/10/contrib/ntp/lib/isc/netaddr.c
  stable/10/contrib/ntp/libntp/Makefile.am
  stable/10/contrib/ntp/libntp/Makefile.in
  stable/10/contrib/ntp/libntp/a_md5encrypt.c
  stable/10/contrib/ntp/libntp/audio.c
  stable/10/contrib/ntp/libntp/ntp_calendar.c
  stable/10/contrib/ntp/libntp/ntp_intres.c
  stable/10/contrib/ntp/libntp/ssl_init.c
  stable/10/contrib/ntp/libntp/work_fork.c
  stable/10/contrib/ntp/libparse/clk_hopf6021.c
  stable/10/contrib/ntp/ntpd/complete.conf.in
  stable/10/contrib/ntp/ntpd/invoke-ntp.conf.texi
  stable/10/contrib/ntp/ntpd/invoke-ntp.keys.texi
  stable/10/contrib/ntp/ntpd/invoke-ntpd.texi
  stable/10/contrib/ntp/ntpd/keyword-gen-utd
  stable/10/contrib/ntp/ntpd/keyword-gen.c
  stable/10/contrib/ntp/ntpd/ntp.conf.5man
  stable/10/contrib/ntp/ntpd/ntp.conf.5mdoc
  stable/10/contrib/ntp/ntpd/ntp.conf.def
  stable/10/contrib/ntp/ntpd/ntp.conf.html
  stable/10/contrib/ntp/ntpd/ntp.conf.man.in
  stable/10/contrib/ntp/ntpd/ntp.conf.mdoc.in
  stable/10/contrib/ntp/ntpd/ntp.keys.5man
  stable/10/contrib/ntp/ntpd/ntp.keys.5mdoc
  stable/10/contrib/ntp/ntpd/ntp.keys.html
  stable/10/contrib/ntp/ntpd/ntp.keys.man.in
  stable/10/contrib/ntp/ntpd/ntp.keys.mdoc.in
  stable/10/contrib/ntp/ntpd/ntp_config.c
  stable/10/contrib/ntp/ntpd/ntp_control.c
  stable/10/contrib/ntp/ntpd/ntp_crypto.c
  stable/10/contrib/ntp/ntpd/ntp_keyword.h
  stable/10/contrib/ntp/ntpd/ntp_loopfilter.c
  stable/10/contrib/ntp/ntpd/ntp_parser.c
  stable/10/contrib/ntp/ntpd/ntp_parser.h
  stable/10/contrib/ntp/ntpd/ntp_peer.c
  stable/10/contrib/ntp/ntpd/ntp_proto.c
  stable/10/contrib/ntp/ntpd/ntp_refclock.c
  stable/10/contrib/ntp/ntpd/ntpd-opts.c
  stable/10/contrib/ntp/ntpd/ntpd-opts.h
  stable/10/contrib/ntp/ntpd/ntpd.1ntpdman
  stable/10/contrib/ntp/ntpd/ntpd.1ntpdmdoc
  stable/10/contrib/ntp/ntpd/ntpd.html
  stable/10/contrib/ntp/ntpd/ntpd.man.in
  stable/10/contrib/ntp/ntpd/ntpd.mdoc.in
  stable/10/contrib/ntp/ntpd/refclock_gpsdjson.c
  stable/10/contrib/ntp/ntpd/refclock_jjy.c
  stable/10/contrib/ntp/ntpd/refclock_jupiter.c
  stable/10/contrib/ntp/ntpdc/invoke-ntpdc.texi
  stable/10/contrib/ntp/ntpdc/ntpdc-opts.c
  stable/10/contrib/ntp/ntpdc/ntpdc-opts.h
  stable/10/contrib/ntp/ntpdc/ntpdc.1ntpdcman
  stable/10/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc
  stable/10/contrib/ntp/ntpdc/ntpdc.html
  stable/10/contrib/ntp/ntpdc/ntpdc.man.in
  stable/10/contrib/ntp/ntpdc/ntpdc.mdoc.in
  stable/10/contrib/ntp/ntpq/invoke-ntpq.texi
  stable/10/contrib/ntp/ntpq/ntpq-opts.c
  stable/10/contrib/ntp/ntpq/ntpq-opts.h
  stable/10/contrib/ntp/ntpq/ntpq.1ntpqman
  stable/10/contrib/ntp/ntpq/ntpq.1ntpqmdoc
  stable/10/contrib/ntp/ntpq/ntpq.c
  stable/10/contrib/ntp/ntpq/ntpq.html
  stable/10/contrib/ntp/ntpq/ntpq.man.in
  stable/10/contrib/ntp/ntpq/ntpq.mdoc.in
  stable/10/contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd.html
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd.man.in
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in
  stable/10/contrib/ntp/packageinfo.sh
  stable/10/contrib/ntp/scripts/build/genAuthors.in
  stable/10/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
  stable/10/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
  stable/10/contrib/ntp/scripts/calc_tickadj/calc_tickadj.html
  stable/10/contrib/ntp/scripts/calc_tickadj/calc_tickadj.man.in
  stable/10/contrib/ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in
  stable/10/contrib/ntp/scripts/calc_tickadj/invoke-calc_tickadj.texi
  stable/10/contrib/ntp/scripts/invoke-plot_summary.texi
  

svn commit: r308200 - in stable: 10/crypto/openssl/ssl 9/crypto/openssl/ssl

[Xin LI]

Author: delphij
Date: Wed Nov  2 07:09:31 2016
New Revision: 308200
URL: https://svnweb.freebsd.org/changeset/base/308200

Log:
  Backport OpenSSL commit af58be768ebb690f78530f796e92b8ae5c9a4401:
  
Don't allow too many consecutive warning alerts
  
Certain warning alerts are ignored if they are received. This can mean that
no progress will be made if one peer continually sends those warning alerts.
Implement a count so that we abort the connection if we receive too many.
  
Issue reported by Shi Lei.
  
  This is a direct commit to stable/10 and stable/9.
  
  Security: CVE-2016-8610

Modified:
  stable/10/crypto/openssl/ssl/d1_pkt.c
  stable/10/crypto/openssl/ssl/s3_pkt.c
  stable/10/crypto/openssl/ssl/ssl.h
  stable/10/crypto/openssl/ssl/ssl3.h
  stable/10/crypto/openssl/ssl/ssl_locl.h

Changes in other areas also in this revision:
Modified:
  stable/9/crypto/openssl/ssl/d1_pkt.c
  stable/9/crypto/openssl/ssl/s3_pkt.c
  stable/9/crypto/openssl/ssl/ssl.h
  stable/9/crypto/openssl/ssl/ssl3.h
  stable/9/crypto/openssl/ssl/ssl_locl.h

Modified: stable/10/crypto/openssl/ssl/d1_pkt.c
==
--- stable/10/crypto/openssl/ssl/d1_pkt.c   Wed Nov  2 06:58:47 2016
(r308199)
+++ stable/10/crypto/openssl/ssl/d1_pkt.c   Wed Nov  2 07:09:31 2016
(r308200)
@@ -924,6 +924,13 @@ int dtls1_read_bytes(SSL *s, int type, u
 goto start;
 }
 
+/*
+ * Reset the count of consecutive warning alerts if we've got a non-empty
+ * record that isn't an alert.
+ */
+if (rr->type != SSL3_RT_ALERT && rr->length != 0)
+s->s3->alert_count = 0;
+
 /* we now have a packet which can be read and processed */
 
 if (s->s3->change_cipher_spec /* set when we receive ChangeCipherSpec,
@@ -1190,6 +1197,14 @@ int dtls1_read_bytes(SSL *s, int type, u
 
 if (alert_level == SSL3_AL_WARNING) {
 s->s3->warn_alert = alert_descr;
+
+s->s3->alert_count++;
+if (s->s3->alert_count == MAX_WARN_ALERT_COUNT) {
+al = SSL_AD_UNEXPECTED_MESSAGE;
+SSLerr(SSL_F_DTLS1_READ_BYTES, SSL_R_TOO_MANY_WARN_ALERTS);
+goto f_err;
+}
+
 if (alert_descr == SSL_AD_CLOSE_NOTIFY) {
 #ifndef OPENSSL_NO_SCTP
 /*

Modified: stable/10/crypto/openssl/ssl/s3_pkt.c
==
--- stable/10/crypto/openssl/ssl/s3_pkt.c   Wed Nov  2 06:58:47 2016
(r308199)
+++ stable/10/crypto/openssl/ssl/s3_pkt.c   Wed Nov  2 07:09:31 2016
(r308200)
@@ -1057,6 +1057,13 @@ int ssl3_read_bytes(SSL *s, int type, un
 return (ret);
 }
 
+/*
+ * Reset the count of consecutive warning alerts if we've got a non-empty
+ * record that isn't an alert.
+ */
+if (rr->type != SSL3_RT_ALERT && rr->length != 0)
+s->s3->alert_count = 0;
+
 /* we now have a packet which can be read and processed */
 
 if (s->s3->change_cipher_spec /* set when we receive ChangeCipherSpec,
@@ -1271,6 +1278,14 @@ int ssl3_read_bytes(SSL *s, int type, un
 
 if (alert_level == SSL3_AL_WARNING) {
 s->s3->warn_alert = alert_descr;
+
+s->s3->alert_count++;
+if (s->s3->alert_count == MAX_WARN_ALERT_COUNT) {
+al = SSL_AD_UNEXPECTED_MESSAGE;
+SSLerr(SSL_F_SSL3_READ_BYTES, SSL_R_TOO_MANY_WARN_ALERTS);
+goto f_err;
+}
+
 if (alert_descr == SSL_AD_CLOSE_NOTIFY) {
 s->shutdown |= SSL_RECEIVED_SHUTDOWN;
 return (0);

Modified: stable/10/crypto/openssl/ssl/ssl.h
==
--- stable/10/crypto/openssl/ssl/ssl.h  Wed Nov  2 06:58:47 2016
(r308199)
+++ stable/10/crypto/openssl/ssl/ssl.h  Wed Nov  2 07:09:31 2016
(r308200)
@@ -2717,6 +2717,7 @@ void ERR_load_SSL_strings(void);
 # define SSL_R_TLS_HEARTBEAT_PENDING  366
 # define SSL_R_TLS_ILLEGAL_EXPORTER_LABEL 367
 # define SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST 157
+# define SSL_R_TOO_MANY_WARN_ALERTS   409
 # define SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST 233
 # define SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG234
 # define SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER235

Modified: stable/10/crypto/openssl/ssl/ssl3.h
==
--- stable/10/crypto/openssl/ssl/ssl3.h Wed Nov  2 06:58:47 2016
(r308199)
+++ stable/10/crypto/openssl/ssl/ssl3.h Wed Nov  2 07:09:31 2016
(r308200)
@@ -587,6 +587,8 @@ typedef struct ssl3_state_st {
 char is_probably_safari;
 #   endif   /* !OPENSSL_NO_EC */
 #  endif/* !OPENSSL_NO_TLSEXT */
+/* 

svn commit: r308199 - stable/10/crypto/openssh

[Xin LI]

Author: delphij
Date: Wed Nov  2 06:58:47 2016
New Revision: 308199
URL: https://svnweb.freebsd.org/changeset/base/308199

Log:
  MFC r308197: MFV r308196:
  
  Fix OpenSSH remote Denial of Service vulnerability.
  
  Security: CVE-2016-8858

Modified:
  stable/10/crypto/openssh/kex.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/crypto/openssh/kex.c
==
--- stable/10/crypto/openssh/kex.c  Wed Nov  2 06:56:35 2016
(r308198)
+++ stable/10/crypto/openssh/kex.c  Wed Nov  2 06:58:47 2016
(r308199)
@@ -468,6 +468,7 @@ kex_input_kexinit(int type, u_int32_t se
if (kex == NULL)
return SSH_ERR_INVALID_ARGUMENT;
 
+   ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, NULL);
ptr = sshpkt_ptr(ssh, );
if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0)
return r;
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r305649 - stable/10/usr.sbin/portsnap/portsnap

[Xin LI]

Author: delphij
Date: Fri Sep  9 06:59:49 2016
New Revision: 305649
URL: https://svnweb.freebsd.org/changeset/base/305649

Log:
  MFC r305469:
  
  Ensure that we always open only files that is named by explicitly
  using shell redirections instead of having gzip(1) to decide what
  file to open.
  
  Issue reported in the "non-cryptanalytic attacks against freebsd
  update components" anonymous gist.
  
  Reviewed by:  allanjude, emaste

Modified:
  stable/10/usr.sbin/portsnap/portsnap/portsnap.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/portsnap/portsnap/portsnap.sh
==
--- stable/10/usr.sbin/portsnap/portsnap/portsnap.shFri Sep  9 06:59:01 
2016(r305648)
+++ stable/10/usr.sbin/portsnap/portsnap/portsnap.shFri Sep  9 06:59:49 
2016(r305649)
@@ -646,7 +646,7 @@ fetch_index_sanity() {
 # Verify a list of files
 fetch_snapshot_verify() {
while read F; do
-   if [ "`gunzip -c snap/${F} | ${SHA256} -q`" != ${F} ]; then
+   if [ "`gunzip -c < snap/${F}.gz | ${SHA256} -q`" != ${F} ]; then
echo "snapshot corrupt."
return 1
fi
@@ -681,7 +681,7 @@ fetch_snapshot() {
cut -f 2 -d '|' tINDEX.new | fetch_snapshot_verify || return 1
 # Extract the index
rm -f INDEX.new
-   gunzip -c snap/`look INDEX tINDEX.new |
+   gunzip -c < snap/`look INDEX tINDEX.new |
cut -f 2 -d '|'`.gz > INDEX.new
fetch_index_sanity || return 1
 # Verify the snapshot contents
@@ -777,7 +777,7 @@ fetch_update() {
 
 # Extract the index
echo -n "Extracting index... " 1>${QUIETREDIR}
-   gunzip -c files/`look INDEX tINDEX.new |
+   gunzip -c < files/`look INDEX tINDEX.new |
cut -f 2 -d '|'`.gz > INDEX.new
fetch_index_sanity || return 1
 
@@ -897,7 +897,7 @@ extract_make_index() {
echo -n "$1 not provided by portsnap server; "
echo "$2 not being generated."
else
-   gunzip -c "${WORKDIR}/files/`look $1 ${WORKDIR}/tINDEX |
+   gunzip -c < "${WORKDIR}/files/`look $1 ${WORKDIR}/tINDEX |
cut -f 2 -d '|'`.gz" |
cat - ${LOCALDESC} |
${MKINDEX} /dev/stdin > ${PORTSDIR}/$2
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r303301 - in stable: 10/usr.bin/bsdiff/bspatch 9/usr.bin/bsdiff/bspatch

[Xin LI]

Author: delphij
Date: Mon Jul 25 14:53:04 2016
New Revision: 303301
URL: https://svnweb.freebsd.org/changeset/base/303301

Log:
  Fix bspatch heap overflow vulnerability.
  
  Obtained from:Chromium
  Reported by:  Lu Tung-Pin
  Security: FreeBSD-SA-16:25.bspatch

Modified:
  stable/10/usr.bin/bsdiff/bspatch/bspatch.c

Changes in other areas also in this revision:
Modified:
  stable/9/usr.bin/bsdiff/bspatch/bspatch.c

Modified: stable/10/usr.bin/bsdiff/bspatch/bspatch.c
==
--- stable/10/usr.bin/bsdiff/bspatch/bspatch.c  Mon Jul 25 14:52:12 2016
(r303300)
+++ stable/10/usr.bin/bsdiff/bspatch/bspatch.c  Mon Jul 25 14:53:04 2016
(r303301)
@@ -155,6 +155,10 @@ int main(int argc,char * argv[])
};
 
/* Sanity-check */
+   if ((ctrl[0] < 0) || (ctrl[1] < 0))
+   errx(1,"Corrupt patch\n");
+
+   /* Sanity-check */
if(newpos+ctrl[0]>newsize)
errx(1,"Corrupt patch\n");
 
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r303280 - stable/10/usr.bin/mail

[Xin LI]

Author: delphij
Date: Mon Jul 25 00:46:01 2016
New Revision: 303280
URL: https://svnweb.freebsd.org/changeset/base/303280

Log:
  MFC r302542:
  
  Use _PATH_DEVNULL instead of hardcoding.

Modified:
  stable/10/usr.bin/mail/collect.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/mail/collect.c
==
--- stable/10/usr.bin/mail/collect.cSun Jul 24 23:40:33 2016
(r303279)
+++ stable/10/usr.bin/mail/collect.cMon Jul 25 00:46:01 2016
(r303280)
@@ -339,9 +339,9 @@ cont:
int nullfd, tempfd, rc;
char tempname2[PATHSIZE];
 
-   if ((nullfd = open("/dev/null", O_RDONLY, 0))
+   if ((nullfd = open(_PATH_DEVNULL, O_RDONLY, 0))
== -1) {
-   warn("/dev/null");
+   warn(_PATH_DEVNULL);
break;
}
 
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r302555 - in stable/10: contrib/file contrib/file/doc contrib/file/magic contrib/file/magic/Magdir contrib/file/src lib/libmagic

[Xin LI]

Author: delphij
Date: Mon Jul 11 07:35:58 2016
New Revision: 302555
URL: https://svnweb.freebsd.org/changeset/base/302555

Log:
  MFC r302221,30:
  
  MFV r302218: file 5.28.
  
  Relnotes: yes

Added:
  stable/10/contrib/file/magic/Magdir/ber
 - copied unchanged from r302221, head/contrib/file/magic/Magdir/ber
  stable/10/contrib/file/magic/Magdir/coverage
 - copied unchanged from r302221, head/contrib/file/magic/Magdir/coverage
  stable/10/contrib/file/magic/Magdir/pc88
 - copied unchanged from r302221, head/contrib/file/magic/Magdir/pc88
  stable/10/contrib/file/magic/Magdir/pc98
 - copied unchanged from r302221, head/contrib/file/magic/Magdir/pc98
  stable/10/contrib/file/magic/Magdir/x68000
 - copied unchanged from r302221, head/contrib/file/magic/Magdir/x68000
Deleted:
  stable/10/contrib/file/src/magic.h
Modified:
  stable/10/contrib/file/ChangeLog
  stable/10/contrib/file/config.h.in
  stable/10/contrib/file/configure
  stable/10/contrib/file/configure.ac
  stable/10/contrib/file/doc/file.man
  stable/10/contrib/file/magic/Magdir/c-lang
  stable/10/contrib/file/magic/Magdir/console
  stable/10/contrib/file/magic/Magdir/database
  stable/10/contrib/file/magic/Magdir/elf
  stable/10/contrib/file/magic/Magdir/msdos
  stable/10/contrib/file/magic/Magdir/msx
  stable/10/contrib/file/magic/Magdir/perl
  stable/10/contrib/file/magic/Makefile.am
  stable/10/contrib/file/magic/Makefile.in
  stable/10/contrib/file/src/Makefile.am
  stable/10/contrib/file/src/Makefile.in
  stable/10/contrib/file/src/apprentice.c
  stable/10/contrib/file/src/cdf.c
  stable/10/contrib/file/src/compress.c
  stable/10/contrib/file/src/der.c
  stable/10/contrib/file/src/file.c
  stable/10/contrib/file/src/softmagic.c
  stable/10/lib/libmagic/Makefile
  stable/10/lib/libmagic/config.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/file/ChangeLog
==
--- stable/10/contrib/file/ChangeLogMon Jul 11 07:28:15 2016
(r302554)
+++ stable/10/contrib/file/ChangeLogMon Jul 11 07:35:58 2016
(r302555)
@@ -1,3 +1,15 @@
+2016-06-13  19:40  Christos Zoulas 
+
+   * release 5.28
+   * fix leak on allocation failure
+
+2016-06-01   1:20  Christos Zoulas 
+
+   * PR/555: Avoid overflow for offset > nbytes
+   * PR/550: Segv on DER parsing:
+   - use the correct variable for length
+   - set offset to 0 on failure.
+
 2016-05-13  12:00  Christos Zoulas 

* release 5.27

Modified: stable/10/contrib/file/config.h.in
==
--- stable/10/contrib/file/config.h.in  Mon Jul 11 07:28:15 2016
(r302554)
+++ stable/10/contrib/file/config.h.in  Mon Jul 11 07:35:58 2016
(r302555)
@@ -328,6 +328,9 @@
 # endif
 #endif
 
+/* Enable zlib compression support */
+#undef ZLIBSUPPORT
+
 /* Enable large inode numbers on Mac OS X 10.5.  */
 #ifndef _DARWIN_USE_64_BIT_INODE
 # define _DARWIN_USE_64_BIT_INODE 1

Modified: stable/10/contrib/file/configure
==
--- stable/10/contrib/file/configureMon Jul 11 07:28:15 2016
(r302554)
+++ stable/10/contrib/file/configureMon Jul 11 07:35:58 2016
(r302555)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for file 5.27.
+# Generated by GNU Autoconf 2.69 for file 5.28.
 #
 # Report bugs to .
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='file'
 PACKAGE_TARNAME='file'
-PACKAGE_VERSION='5.27'
-PACKAGE_STRING='file 5.27'
+PACKAGE_VERSION='5.28'
+PACKAGE_STRING='file 5.28'
 PACKAGE_BUGREPORT='chris...@astron.com'
 PACKAGE_URL=''
 
@@ -766,6 +766,7 @@ enable_option_checking
 enable_silent_rules
 enable_elf
 enable_elf_core
+enable_zlib
 enable_fsect_man5
 enable_dependency_tracking
 enable_static
@@ -1327,7 +1328,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures file 5.27 to adapt to many kinds of systems.
+\`configure' configures file 5.28 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1397,7 +1398,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of file 5.27:";;
+ short | recursive ) echo "Configuration of file 5.28:";;
esac
   cat <<\_ACEOF
 
@@ -1409,6 +1410,7 @@ Optional Features:
   --disable-silent-rules  verbose build output (undo: "make V=0")
   --disable-elfdisable builtin ELF support
   --disable-elf-core   disable ELF core file support
+  

svn commit: r302385 - in stable/10/contrib/expat: . doc examples lib tests tests/benchmark xmlwf

[Xin LI]

Author: delphij
Date: Thu Jul  7 04:59:58 2016
New Revision: 302385
URL: https://svnweb.freebsd.org/changeset/base/302385

Log:
  MFC r302305: MFV r302260: expat 2.2.0.

Added:
  stable/10/contrib/expat/configure.ac
 - copied unchanged from r302305, head/contrib/expat/configure.ac
  stable/10/contrib/expat/doc/xmlwf.xml
 - copied unchanged from r302305, head/contrib/expat/doc/xmlwf.xml
Deleted:
  stable/10/contrib/expat/configure.in
  stable/10/contrib/expat/doc/xmlwf.sgml
Modified:
  stable/10/contrib/expat/COPYING
  stable/10/contrib/expat/Changes
  stable/10/contrib/expat/MANIFEST
  stable/10/contrib/expat/Makefile.in
  stable/10/contrib/expat/README
  stable/10/contrib/expat/doc/expat.png   (contents, props changed)
  stable/10/contrib/expat/doc/reference.html
  stable/10/contrib/expat/doc/xmlwf.1
  stable/10/contrib/expat/examples/elements.c
  stable/10/contrib/expat/examples/outline.c
  stable/10/contrib/expat/expat_config.h.in
  stable/10/contrib/expat/lib/expat.h
  stable/10/contrib/expat/lib/expat_external.h
  stable/10/contrib/expat/lib/internal.h
  stable/10/contrib/expat/lib/xmlparse.c
  stable/10/contrib/expat/lib/xmlrole.c
  stable/10/contrib/expat/lib/xmltok.c
  stable/10/contrib/expat/lib/xmltok.h
  stable/10/contrib/expat/lib/xmltok_impl.c
  stable/10/contrib/expat/tests/benchmark/README.txt
  stable/10/contrib/expat/tests/chardata.c
  stable/10/contrib/expat/tests/minicheck.c
  stable/10/contrib/expat/tests/minicheck.h
  stable/10/contrib/expat/tests/runtests.c
  stable/10/contrib/expat/tests/xmltest.sh
  stable/10/contrib/expat/xmlwf/codepage.c
  stable/10/contrib/expat/xmlwf/readfilemap.c
  stable/10/contrib/expat/xmlwf/unixfilemap.c
  stable/10/contrib/expat/xmlwf/xmlfile.c
  stable/10/contrib/expat/xmlwf/xmlwf.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/expat/COPYING
==
--- stable/10/contrib/expat/COPYING Thu Jul  7 03:39:18 2016
(r302384)
+++ stable/10/contrib/expat/COPYING Thu Jul  7 04:59:58 2016
(r302385)
@@ -1,6 +1,5 @@
-Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
-   and Clark Cooper
-Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.
+Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
+Copyright (c) 2001-2016 Expat maintainers
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

Modified: stable/10/contrib/expat/Changes
==
--- stable/10/contrib/expat/Changes Thu Jul  7 03:39:18 2016
(r302384)
+++ stable/10/contrib/expat/Changes Thu Jul  7 04:59:58 2016
(r302385)
@@ -1,3 +1,67 @@
+Release 2.2.0 Tue June 21 2016
+Security fixes:
+#537  CVE-2016-0718 -- Fix crash on malformed input
+  CVE-2016-4472 -- Improve insufficient fix to CVE-2015-1283 /
+   CVE-2015-2716 introduced with Expat 2.1.1
+#499  CVE-2016-5300 -- Use more entropy for hash initialization
+   than the original fix to CVE-2012-0876
+#519  CVE-2012-6702 -- Resolve troublesome internal call to srand
+   that was introduced with Expat 2.1.0
+   when addressing CVE-2012-0876 (issue #496)
+
+Bug fixes:
+  Fix uninitialized reads of size 1
+(e.g. in little2_updatePosition)
+  Fix detection of UTF-8 character boundaries
+
+Other changes:
+#532  Fix compilation for Visual Studio 2010 (keyword "C99")
+  Autotools: Resolve use of "$<" to better support bmake
+  Autotools: Add QA script "qa.sh" (and make target "qa")
+  Autotools: Respect CXXFLAGS if given
+  Autotools: Fix "make run-xmltest"
+  Autotools: Have "make run-xmltest" check for expected output
+ p90  CMake: Fix static build (BUILD_shared=OFF) on Windows
+#536  CMake: Add soversion, support -DNO_SONAME=yes to bypass
+#323  CMake: Add suffix "d" to differentiate debug from release
+  CMake: Define WIN32 with CMake on Windows
+  Annotate memory allocators for GCC
+  Address all currently known compile warnings
+  Make sure that API symbols remain visible despite
+-fvisibility=hidden
+  Remove executable flag from source files
+  Resolve COMPILED_FROM_DSP in favor of WIN32
+
+Special thanks to:
+Björn Lindahl
+Christian Heimes
+Cristian Rodríguez
+Daniel Krügler
+Gustavo Grieco
+

svn commit: r301824 - stable/10/release/scripts

[Xin LI]

Author: delphij
Date: Sat Jun 11 05:53:50 2016
New Revision: 301824
URL: https://svnweb.freebsd.org/changeset/base/301824

Log:
  MFC r301584: Apply mergemaster r255428:
  
  Pass -n (do not emit comments) when saving mtree information for future
  mergemaster(8) runs.

Modified:
  stable/10/release/scripts/mm-mtree.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/release/scripts/mm-mtree.sh
==
--- stable/10/release/scripts/mm-mtree.sh   Sat Jun 11 03:59:44 2016
(r301823)
+++ stable/10/release/scripts/mm-mtree.sh   Sat Jun 11 05:53:50 2016
(r301824)
@@ -147,7 +147,7 @@ find -d ${TEMPROOT} -type d -empty -dele
 
 # Build the mtree database in a temporary location.
 MTREENEW=`mktemp -t mergemaster.mtree`
-mtree -ci -p ${TEMPROOT} -k size,md5digest > ${MTREENEW} 2>/dev/null
+mtree -nci -p ${TEMPROOT} -k size,md5digest > ${MTREENEW} 2>/dev/null
 
 if [ -s "${MTREENEW}" ]; then
   echo "*** Saving mtree database for future upgrades"
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r300899 - in stable/10: contrib/file contrib/file/doc contrib/file/magic contrib/file/magic/Magdir contrib/file/python contrib/file/src contrib/file/tests lib/libmagic

[Xin LI]

Author: delphij
Date: Sat May 28 06:17:35 2016
New Revision: 300899
URL: https://svnweb.freebsd.org/changeset/base/300899

Log:
  MFC r298192,299234,299238,299736:
  
  file 5.27.

Added:
  stable/10/contrib/file/magic/Magdir/bioinformatics
 - copied unchanged from r298192, 
head/contrib/file/magic/Magdir/bioinformatics
  stable/10/contrib/file/magic/Magdir/coff
 - copied unchanged from r298192, head/contrib/file/magic/Magdir/coff
  stable/10/contrib/file/magic/Magdir/der
 - copied unchanged from r298192, head/contrib/file/magic/Magdir/der
  stable/10/contrib/file/magic/Magdir/finger
 - copied unchanged from r298192, head/contrib/file/magic/Magdir/finger
  stable/10/contrib/file/magic/Magdir/flif
 - copied unchanged from r298192, head/contrib/file/magic/Magdir/flif
  stable/10/contrib/file/magic/Magdir/microfocus
 - copied unchanged from r298192, head/contrib/file/magic/Magdir/microfocus
  stable/10/contrib/file/magic/Magdir/polyml
 - copied unchanged from r298192, head/contrib/file/magic/Magdir/polyml
  stable/10/contrib/file/magic/Magdir/vacuum-cleaner
 - copied unchanged from r298192, 
head/contrib/file/magic/Magdir/vacuum-cleaner
  stable/10/contrib/file/src/der.c
 - copied, changed from r298192, head/contrib/file/src/der.c
  stable/10/contrib/file/src/der.h
 - copied unchanged from r298192, head/contrib/file/src/der.h
  stable/10/contrib/file/src/dprintf.c
 - copied unchanged from r298192, head/contrib/file/src/dprintf.c
Modified:
  stable/10/contrib/file/ChangeLog
  stable/10/contrib/file/README
  stable/10/contrib/file/config.h.in
  stable/10/contrib/file/configure
  stable/10/contrib/file/configure.ac
  stable/10/contrib/file/doc/file.man
  stable/10/contrib/file/doc/libmagic.man
  stable/10/contrib/file/magic/Magdir/android
  stable/10/contrib/file/magic/Magdir/animation
  stable/10/contrib/file/magic/Magdir/apple
  stable/10/contrib/file/magic/Magdir/archive
  stable/10/contrib/file/magic/Magdir/audio
  stable/10/contrib/file/magic/Magdir/c-lang
  stable/10/contrib/file/magic/Magdir/cafebabe
  stable/10/contrib/file/magic/Magdir/commands
  stable/10/contrib/file/magic/Magdir/compress
  stable/10/contrib/file/magic/Magdir/console
  stable/10/contrib/file/magic/Magdir/database
  stable/10/contrib/file/magic/Magdir/filesystems
  stable/10/contrib/file/magic/Magdir/fonts
  stable/10/contrib/file/magic/Magdir/fortran
  stable/10/contrib/file/magic/Magdir/hitachi-sh
  stable/10/contrib/file/magic/Magdir/images
  stable/10/contrib/file/magic/Magdir/intel
  stable/10/contrib/file/magic/Magdir/java
  stable/10/contrib/file/magic/Magdir/lisp
  stable/10/contrib/file/magic/Magdir/mach
  stable/10/contrib/file/magic/Magdir/macintosh
  stable/10/contrib/file/magic/Magdir/misctools
  stable/10/contrib/file/magic/Magdir/modem
  stable/10/contrib/file/magic/Magdir/msdos
  stable/10/contrib/file/magic/Magdir/msvc
  stable/10/contrib/file/magic/Magdir/msx
  stable/10/contrib/file/magic/Magdir/netbsd
  stable/10/contrib/file/magic/Magdir/os2
  stable/10/contrib/file/magic/Magdir/psdbms
  stable/10/contrib/file/magic/Magdir/python
  stable/10/contrib/file/magic/Magdir/sendmail
  stable/10/contrib/file/magic/Magdir/sgml
  stable/10/contrib/file/magic/Magdir/sinclair
  stable/10/contrib/file/magic/Magdir/sql
  stable/10/contrib/file/magic/Magdir/terminfo
  stable/10/contrib/file/magic/Magdir/windows
  stable/10/contrib/file/magic/Magdir/wordprocessors
  stable/10/contrib/file/magic/Magdir/xenix
  stable/10/contrib/file/magic/Makefile.am
  stable/10/contrib/file/magic/Makefile.in
  stable/10/contrib/file/python/README
  stable/10/contrib/file/python/magic.py
  stable/10/contrib/file/python/setup.py
  stable/10/contrib/file/src/Makefile.am
  stable/10/contrib/file/src/Makefile.in
  stable/10/contrib/file/src/apprentice.c
  stable/10/contrib/file/src/ascmagic.c
  stable/10/contrib/file/src/cdf.c
  stable/10/contrib/file/src/cdf.h
  stable/10/contrib/file/src/compress.c
  stable/10/contrib/file/src/file.c
  stable/10/contrib/file/src/file.h
  stable/10/contrib/file/src/file_opts.h
  stable/10/contrib/file/src/fmtcheck.c
  stable/10/contrib/file/src/funcs.c
  stable/10/contrib/file/src/magic.c
  stable/10/contrib/file/src/magic.h
  stable/10/contrib/file/src/magic.h.in
  stable/10/contrib/file/src/print.c
  stable/10/contrib/file/src/readcdf.c
  stable/10/contrib/file/src/readelf.c
  stable/10/contrib/file/src/readelf.h
  stable/10/contrib/file/src/softmagic.c
  stable/10/contrib/file/tests/Makefile.am
  stable/10/contrib/file/tests/Makefile.in
  stable/10/lib/libmagic/Makefile
  stable/10/lib/libmagic/config.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/file/ChangeLog
==
--- stable/10/contrib/file/ChangeLogSat May 28 03:34:00 2016
(r300898)
+++ stable/10/contrib/file/ChangeLogSat May 28 06:17:35 2016
(r300899)
@@ -1,3 +1,62 @@
+2016-05-13  

svn commit: r299236 - in stable/10: contrib/file contrib/file/doc contrib/file/magic contrib/file/magic/Magdir contrib/file/python contrib/file/src lib/libmagic

[Xin LI]

Author: delphij
Date: Sun May  8 18:09:30 2016
New Revision: 299236
URL: https://svnweb.freebsd.org/changeset/base/299236

Log:
  Revert r298920 until we have addressed all known regressions on head/ after
  settle.  file is now downgraded to 5.25.
  
  PR:   bin/209211
  Requested by: Tomoaki AOKI
  Relnotes: yes

Deleted:
  stable/10/contrib/file/magic/Magdir/bioinformatics
  stable/10/contrib/file/magic/Magdir/coff
  stable/10/contrib/file/magic/Magdir/der
  stable/10/contrib/file/magic/Magdir/finger
  stable/10/contrib/file/magic/Magdir/flif
  stable/10/contrib/file/magic/Magdir/microfocus
  stable/10/contrib/file/magic/Magdir/polyml
  stable/10/contrib/file/magic/Magdir/vacuum-cleaner
  stable/10/contrib/file/src/der.c
  stable/10/contrib/file/src/der.h
  stable/10/contrib/file/src/dprintf.c
Modified:
  stable/10/contrib/file/ChangeLog
  stable/10/contrib/file/README
  stable/10/contrib/file/config.h.in
  stable/10/contrib/file/configure
  stable/10/contrib/file/configure.ac
  stable/10/contrib/file/doc/file.man
  stable/10/contrib/file/doc/libmagic.man
  stable/10/contrib/file/magic/Magdir/android
  stable/10/contrib/file/magic/Magdir/animation
  stable/10/contrib/file/magic/Magdir/apple
  stable/10/contrib/file/magic/Magdir/archive
  stable/10/contrib/file/magic/Magdir/audio
  stable/10/contrib/file/magic/Magdir/c-lang
  stable/10/contrib/file/magic/Magdir/cafebabe
  stable/10/contrib/file/magic/Magdir/commands
  stable/10/contrib/file/magic/Magdir/compress
  stable/10/contrib/file/magic/Magdir/console
  stable/10/contrib/file/magic/Magdir/database
  stable/10/contrib/file/magic/Magdir/filesystems
  stable/10/contrib/file/magic/Magdir/fonts
  stable/10/contrib/file/magic/Magdir/fortran
  stable/10/contrib/file/magic/Magdir/hitachi-sh
  stable/10/contrib/file/magic/Magdir/images
  stable/10/contrib/file/magic/Magdir/intel
  stable/10/contrib/file/magic/Magdir/java
  stable/10/contrib/file/magic/Magdir/lisp
  stable/10/contrib/file/magic/Magdir/mach
  stable/10/contrib/file/magic/Magdir/macintosh
  stable/10/contrib/file/magic/Magdir/misctools
  stable/10/contrib/file/magic/Magdir/modem
  stable/10/contrib/file/magic/Magdir/msdos
  stable/10/contrib/file/magic/Magdir/msvc
  stable/10/contrib/file/magic/Magdir/msx
  stable/10/contrib/file/magic/Magdir/netbsd
  stable/10/contrib/file/magic/Magdir/psdbms
  stable/10/contrib/file/magic/Magdir/python
  stable/10/contrib/file/magic/Magdir/sendmail
  stable/10/contrib/file/magic/Magdir/sgml
  stable/10/contrib/file/magic/Magdir/sinclair
  stable/10/contrib/file/magic/Magdir/sql
  stable/10/contrib/file/magic/Magdir/terminfo
  stable/10/contrib/file/magic/Magdir/windows
  stable/10/contrib/file/magic/Magdir/wordprocessors
  stable/10/contrib/file/magic/Makefile.am
  stable/10/contrib/file/magic/Makefile.in
  stable/10/contrib/file/python/README
  stable/10/contrib/file/python/magic.py
  stable/10/contrib/file/python/setup.py
  stable/10/contrib/file/src/Makefile.am
  stable/10/contrib/file/src/Makefile.in
  stable/10/contrib/file/src/apprentice.c
  stable/10/contrib/file/src/ascmagic.c
  stable/10/contrib/file/src/compress.c
  stable/10/contrib/file/src/file.c
  stable/10/contrib/file/src/file.h
  stable/10/contrib/file/src/file_opts.h
  stable/10/contrib/file/src/fmtcheck.c
  stable/10/contrib/file/src/funcs.c
  stable/10/contrib/file/src/magic.c
  stable/10/contrib/file/src/magic.h
  stable/10/contrib/file/src/print.c
  stable/10/contrib/file/src/readcdf.c
  stable/10/contrib/file/src/readelf.c
  stable/10/contrib/file/src/readelf.h
  stable/10/contrib/file/src/softmagic.c
  stable/10/lib/libmagic/Makefile
  stable/10/lib/libmagic/config.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/file/ChangeLog
==
--- stable/10/contrib/file/ChangeLogSun May  8 17:52:12 2016
(r299235)
+++ stable/10/contrib/file/ChangeLogSun May  8 18:09:30 2016
(r299236)
@@ -1,49 +1,3 @@
-2016-04-16  18:34  Christos Zoulas 
-   
-   * release 5.25
-
-2016-03-31  13:50  Christos Zoulas 
-
-   * make the number of bytes read from files configurable.
-
-2016-03-21  13:40  Christos Zoulas 
-
-   * Add bounds checks for DER code (discovered by Thomas Jarosch)
-   * Change indirect recursion limit to indirect use count and
- bump from 15 to 50 to prevent abuse.
-
-2016-03-13  20:39  Christos Zoulas 
-
-   * Add -00 which prints filename\0description\0
-
-2016-03-01  13:28  Christos Zoulas 
-
-   * Fix ID3 indirect parsing
-
-2016-01-19  10:18  Christos Zoulas 
-
-   * add DER parsing capability
-
-2015-11-13  10:35  Christos Zoulas 
-
-   * provide dprintf(3) for the OS's that don't have it.
-
-2015-11-11  16:25  Christos Zoulas 
-
-  

svn commit: r298920 - in stable/10: contrib/file contrib/file/doc contrib/file/magic contrib/file/magic/Magdir contrib/file/python contrib/file/src lib/libmagic

[Xin LI]

Author: delphij
Date: Mon May  2 05:46:47 2016
New Revision: 298920
URL: https://svnweb.freebsd.org/changeset/base/298920

Log:
  MFC r298192: MFV r298178:
  
  Update file to 5.26.
  
  Relnotes: yes

Added:
  stable/10/contrib/file/magic/Magdir/bioinformatics
 - copied unchanged from r298192, 
head/contrib/file/magic/Magdir/bioinformatics
  stable/10/contrib/file/magic/Magdir/coff
 - copied unchanged from r298192, head/contrib/file/magic/Magdir/coff
  stable/10/contrib/file/magic/Magdir/der
 - copied unchanged from r298192, head/contrib/file/magic/Magdir/der
  stable/10/contrib/file/magic/Magdir/finger
 - copied unchanged from r298192, head/contrib/file/magic/Magdir/finger
  stable/10/contrib/file/magic/Magdir/flif
 - copied unchanged from r298192, head/contrib/file/magic/Magdir/flif
  stable/10/contrib/file/magic/Magdir/microfocus
 - copied unchanged from r298192, head/contrib/file/magic/Magdir/microfocus
  stable/10/contrib/file/magic/Magdir/polyml
 - copied unchanged from r298192, head/contrib/file/magic/Magdir/polyml
  stable/10/contrib/file/magic/Magdir/vacuum-cleaner
 - copied unchanged from r298192, 
head/contrib/file/magic/Magdir/vacuum-cleaner
  stable/10/contrib/file/src/der.c
 - copied unchanged from r298192, head/contrib/file/src/der.c
  stable/10/contrib/file/src/der.h
 - copied unchanged from r298192, head/contrib/file/src/der.h
  stable/10/contrib/file/src/dprintf.c
 - copied unchanged from r298192, head/contrib/file/src/dprintf.c
Modified:
  stable/10/contrib/file/ChangeLog
  stable/10/contrib/file/README
  stable/10/contrib/file/config.h.in
  stable/10/contrib/file/configure
  stable/10/contrib/file/configure.ac
  stable/10/contrib/file/doc/file.man
  stable/10/contrib/file/doc/libmagic.man
  stable/10/contrib/file/magic/Magdir/android
  stable/10/contrib/file/magic/Magdir/animation
  stable/10/contrib/file/magic/Magdir/apple
  stable/10/contrib/file/magic/Magdir/archive
  stable/10/contrib/file/magic/Magdir/audio
  stable/10/contrib/file/magic/Magdir/c-lang
  stable/10/contrib/file/magic/Magdir/cafebabe
  stable/10/contrib/file/magic/Magdir/commands
  stable/10/contrib/file/magic/Magdir/compress
  stable/10/contrib/file/magic/Magdir/console
  stable/10/contrib/file/magic/Magdir/database
  stable/10/contrib/file/magic/Magdir/filesystems
  stable/10/contrib/file/magic/Magdir/fonts
  stable/10/contrib/file/magic/Magdir/fortran
  stable/10/contrib/file/magic/Magdir/hitachi-sh
  stable/10/contrib/file/magic/Magdir/images
  stable/10/contrib/file/magic/Magdir/intel
  stable/10/contrib/file/magic/Magdir/java
  stable/10/contrib/file/magic/Magdir/lisp
  stable/10/contrib/file/magic/Magdir/mach
  stable/10/contrib/file/magic/Magdir/macintosh
  stable/10/contrib/file/magic/Magdir/misctools
  stable/10/contrib/file/magic/Magdir/modem
  stable/10/contrib/file/magic/Magdir/msdos
  stable/10/contrib/file/magic/Magdir/msvc
  stable/10/contrib/file/magic/Magdir/msx
  stable/10/contrib/file/magic/Magdir/netbsd
  stable/10/contrib/file/magic/Magdir/psdbms
  stable/10/contrib/file/magic/Magdir/python
  stable/10/contrib/file/magic/Magdir/sendmail
  stable/10/contrib/file/magic/Magdir/sgml
  stable/10/contrib/file/magic/Magdir/sinclair
  stable/10/contrib/file/magic/Magdir/sql
  stable/10/contrib/file/magic/Magdir/terminfo
  stable/10/contrib/file/magic/Magdir/windows
  stable/10/contrib/file/magic/Magdir/wordprocessors
  stable/10/contrib/file/magic/Makefile.am
  stable/10/contrib/file/magic/Makefile.in
  stable/10/contrib/file/python/README
  stable/10/contrib/file/python/magic.py
  stable/10/contrib/file/python/setup.py
  stable/10/contrib/file/src/Makefile.am
  stable/10/contrib/file/src/Makefile.in
  stable/10/contrib/file/src/apprentice.c
  stable/10/contrib/file/src/ascmagic.c
  stable/10/contrib/file/src/compress.c
  stable/10/contrib/file/src/file.c
  stable/10/contrib/file/src/file.h
  stable/10/contrib/file/src/file_opts.h
  stable/10/contrib/file/src/fmtcheck.c
  stable/10/contrib/file/src/funcs.c
  stable/10/contrib/file/src/magic.c
  stable/10/contrib/file/src/magic.h
  stable/10/contrib/file/src/print.c
  stable/10/contrib/file/src/readcdf.c
  stable/10/contrib/file/src/readelf.c
  stable/10/contrib/file/src/readelf.h
  stable/10/contrib/file/src/softmagic.c
  stable/10/lib/libmagic/Makefile
  stable/10/lib/libmagic/config.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/file/ChangeLog
==
--- stable/10/contrib/file/ChangeLogMon May  2 05:43:46 2016
(r298919)
+++ stable/10/contrib/file/ChangeLogMon May  2 05:46:47 2016
(r298920)
@@ -1,3 +1,49 @@
+2016-04-16  18:34  Christos Zoulas 
+   
+   * release 5.25
+
+2016-03-31  13:50  Christos Zoulas 
+
+   * make the number of bytes read from files configurable.
+
+2016-03-21  13:40  Christos Zoulas 

svn commit: r298699 - in stable/10: contrib/ntp contrib/ntp/html contrib/ntp/include contrib/ntp/lib/isc contrib/ntp/lib/isc/include/isc contrib/ntp/libntp contrib/ntp/ntpd contrib/ntp/ntpdate cont...

[Xin LI]

Author: delphij
Date: Wed Apr 27 15:24:33 2016
New Revision: 298699
URL: https://svnweb.freebsd.org/changeset/base/298699

Log:
  MFC r298695: MFV r298691: ntp 4.2.8p7.
  
  Security: CVE-2016-1547, CVE-2016-1548, CVE-2016-1549, CVE-2016-1550
  Security: CVE-2016-1551, CVE-2016-2516, CVE-2016-2517, CVE-2016-2518
  Security: CVE-2016-2519
  Security: FreeBSD-SA-16:16.ntp
  With hat: so

Added:
  stable/10/contrib/ntp/README.pullrequests
 - copied unchanged from r298695, head/contrib/ntp/README.pullrequests
  stable/10/contrib/ntp/lib/isc/tsmemcmp.c
 - copied unchanged from r298695, head/contrib/ntp/lib/isc/tsmemcmp.c
  stable/10/contrib/ntp/tests/libntp/run-tsafememcmp.c
 - copied unchanged from r298695, 
head/contrib/ntp/tests/libntp/run-tsafememcmp.c
  stable/10/contrib/ntp/tests/libntp/tsafememcmp.c
 - copied unchanged from r298695, 
head/contrib/ntp/tests/libntp/tsafememcmp.c
Modified:
  stable/10/contrib/ntp/ChangeLog
  stable/10/contrib/ntp/CommitLog
  stable/10/contrib/ntp/Makefile.am
  stable/10/contrib/ntp/Makefile.in
  stable/10/contrib/ntp/NEWS
  stable/10/contrib/ntp/config.h.in
  stable/10/contrib/ntp/configure
  stable/10/contrib/ntp/configure.ac
  stable/10/contrib/ntp/html/authentic.html
  stable/10/contrib/ntp/html/monopt.html
  stable/10/contrib/ntp/html/xleave.html
  stable/10/contrib/ntp/include/ntp.h
  stable/10/contrib/ntp/include/ntp_keyacc.h
  stable/10/contrib/ntp/include/ntp_refclock.h
  stable/10/contrib/ntp/include/ntp_stdlib.h
  stable/10/contrib/ntp/include/ntp_types.h
  stable/10/contrib/ntp/include/ntp_worker.h
  stable/10/contrib/ntp/include/recvbuff.h
  stable/10/contrib/ntp/lib/isc/hmacmd5.c
  stable/10/contrib/ntp/lib/isc/hmacsha.c
  stable/10/contrib/ntp/lib/isc/include/isc/string.h
  stable/10/contrib/ntp/libntp/Makefile.am
  stable/10/contrib/ntp/libntp/Makefile.in
  stable/10/contrib/ntp/libntp/a_md5encrypt.c
  stable/10/contrib/ntp/libntp/authkeys.c
  stable/10/contrib/ntp/libntp/authreadkeys.c
  stable/10/contrib/ntp/libntp/is_ip_address.c
  stable/10/contrib/ntp/libntp/ntp_intres.c
  stable/10/contrib/ntp/libntp/ntp_worker.c
  stable/10/contrib/ntp/libntp/recvbuff.c
  stable/10/contrib/ntp/libntp/work_fork.c
  stable/10/contrib/ntp/libntp/work_thread.c
  stable/10/contrib/ntp/ntpd/invoke-ntp.conf.texi
  stable/10/contrib/ntp/ntpd/invoke-ntp.keys.texi
  stable/10/contrib/ntp/ntpd/invoke-ntpd.texi
  stable/10/contrib/ntp/ntpd/ntp.conf.5man
  stable/10/contrib/ntp/ntpd/ntp.conf.5mdoc
  stable/10/contrib/ntp/ntpd/ntp.conf.def
  stable/10/contrib/ntp/ntpd/ntp.conf.html
  stable/10/contrib/ntp/ntpd/ntp.conf.man.in
  stable/10/contrib/ntp/ntpd/ntp.conf.mdoc.in
  stable/10/contrib/ntp/ntpd/ntp.keys.5man
  stable/10/contrib/ntp/ntpd/ntp.keys.5mdoc
  stable/10/contrib/ntp/ntpd/ntp.keys.html
  stable/10/contrib/ntp/ntpd/ntp.keys.man.in
  stable/10/contrib/ntp/ntpd/ntp.keys.mdoc.in
  stable/10/contrib/ntp/ntpd/ntp_control.c
  stable/10/contrib/ntp/ntpd/ntp_io.c
  stable/10/contrib/ntp/ntpd/ntp_proto.c
  stable/10/contrib/ntp/ntpd/ntp_request.c
  stable/10/contrib/ntp/ntpd/ntp_timer.c
  stable/10/contrib/ntp/ntpd/ntpd-opts.c
  stable/10/contrib/ntp/ntpd/ntpd-opts.h
  stable/10/contrib/ntp/ntpd/ntpd.1ntpdman
  stable/10/contrib/ntp/ntpd/ntpd.1ntpdmdoc
  stable/10/contrib/ntp/ntpd/ntpd.c
  stable/10/contrib/ntp/ntpd/ntpd.html
  stable/10/contrib/ntp/ntpd/ntpd.man.in
  stable/10/contrib/ntp/ntpd/ntpd.mdoc.in
  stable/10/contrib/ntp/ntpdate/ntpdate.c
  stable/10/contrib/ntp/ntpdc/invoke-ntpdc.texi
  stable/10/contrib/ntp/ntpdc/ntpdc-opts.c
  stable/10/contrib/ntp/ntpdc/ntpdc-opts.h
  stable/10/contrib/ntp/ntpdc/ntpdc.1ntpdcman
  stable/10/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc
  stable/10/contrib/ntp/ntpdc/ntpdc.html
  stable/10/contrib/ntp/ntpdc/ntpdc.man.in
  stable/10/contrib/ntp/ntpdc/ntpdc.mdoc.in
  stable/10/contrib/ntp/ntpq/invoke-ntpq.texi
  stable/10/contrib/ntp/ntpq/ntpq-opts.c
  stable/10/contrib/ntp/ntpq/ntpq-opts.def
  stable/10/contrib/ntp/ntpq/ntpq-opts.h
  stable/10/contrib/ntp/ntpq/ntpq-subs.c
  stable/10/contrib/ntp/ntpq/ntpq.1ntpqman
  stable/10/contrib/ntp/ntpq/ntpq.1ntpqmdoc
  stable/10/contrib/ntp/ntpq/ntpq.c
  stable/10/contrib/ntp/ntpq/ntpq.h
  stable/10/contrib/ntp/ntpq/ntpq.html
  stable/10/contrib/ntp/ntpq/ntpq.man.in
  stable/10/contrib/ntp/ntpq/ntpq.mdoc.in
  stable/10/contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd.html
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd.man.in
  stable/10/contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in
  stable/10/contrib/ntp/packageinfo.sh
  stable/10/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
  stable/10/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
  stable/10/contrib/ntp/scripts/calc_tickadj/calc_tickadj.html
  

svn commit: r296317 - in stable/10: crypto/openssl crypto/openssl/apps crypto/openssl/crypto crypto/openssl/crypto/bio crypto/openssl/crypto/bn crypto/openssl/crypto/bn/asm crypto/openssl/crypto/ds...

[Xin LI]

Author: delphij
Date: Wed Mar  2 15:43:01 2016
New Revision: 296317
URL: https://svnweb.freebsd.org/changeset/base/296317

Log:
  Merge OpenSSL 1.0.1s.  This is a security update.
  
  Relnotes: yes
  Approved by:  re (so@ implicit)

Modified:
  stable/10/crypto/openssl/CHANGES
  stable/10/crypto/openssl/Configure
  stable/10/crypto/openssl/Makefile
  stable/10/crypto/openssl/NEWS
  stable/10/crypto/openssl/README
  stable/10/crypto/openssl/apps/s_server.c
  stable/10/crypto/openssl/crypto/bio/b_print.c
  stable/10/crypto/openssl/crypto/bio/bio.h
  stable/10/crypto/openssl/crypto/bn/Makefile
  stable/10/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl
  stable/10/crypto/openssl/crypto/bn/bn.h
  stable/10/crypto/openssl/crypto/bn/bn_exp.c
  stable/10/crypto/openssl/crypto/bn/bn_print.c
  stable/10/crypto/openssl/crypto/bn/bn_recp.c
  stable/10/crypto/openssl/crypto/dsa/dsa_ameth.c
  stable/10/crypto/openssl/crypto/modes/ctr128.c
  stable/10/crypto/openssl/crypto/opensslconf.h
  stable/10/crypto/openssl/crypto/opensslv.h
  stable/10/crypto/openssl/crypto/perlasm/x86_64-xlate.pl
  stable/10/crypto/openssl/crypto/rsa/rsa_sign.c
  stable/10/crypto/openssl/crypto/srp/srp.h
  stable/10/crypto/openssl/crypto/srp/srp_vfy.c
  stable/10/crypto/openssl/doc/apps/ciphers.pod
  stable/10/crypto/openssl/doc/apps/s_client.pod
  stable/10/crypto/openssl/doc/apps/s_server.pod
  stable/10/crypto/openssl/doc/ssl/SSL_CTX_new.pod
  stable/10/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod
  stable/10/crypto/openssl/doc/ssl/ssl.pod
  stable/10/crypto/openssl/ssl/Makefile
  stable/10/crypto/openssl/ssl/s2_lib.c
  stable/10/crypto/openssl/ssl/s3_lib.c
  stable/10/crypto/openssl/ssl/ssl_lib.c
  stable/10/crypto/openssl/util/libeay.num
  stable/10/crypto/openssl/util/mk1mf.pl
  stable/10/crypto/openssl/util/pl/BC-32.pl
  stable/10/crypto/openssl/util/pl/Mingw32.pl
  stable/10/crypto/openssl/util/pl/OS2-EMX.pl
  stable/10/crypto/openssl/util/pl/VC-32.pl
  stable/10/crypto/openssl/util/pl/linux.pl
  stable/10/crypto/openssl/util/pl/netware.pl
  stable/10/crypto/openssl/util/pl/ultrix.pl
  stable/10/crypto/openssl/util/pl/unix.pl
  stable/10/secure/lib/libcrypto/Makefile.inc
  stable/10/secure/lib/libcrypto/amd64/x86_64-mont5.S
  stable/10/secure/lib/libcrypto/man/ASN1_OBJECT_new.3
  stable/10/secure/lib/libcrypto/man/ASN1_STRING_length.3
  stable/10/secure/lib/libcrypto/man/ASN1_STRING_new.3
  stable/10/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3
  stable/10/secure/lib/libcrypto/man/ASN1_generate_nconf.3
  stable/10/secure/lib/libcrypto/man/BIO_ctrl.3
  stable/10/secure/lib/libcrypto/man/BIO_f_base64.3
  stable/10/secure/lib/libcrypto/man/BIO_f_buffer.3
  stable/10/secure/lib/libcrypto/man/BIO_f_cipher.3
  stable/10/secure/lib/libcrypto/man/BIO_f_md.3
  stable/10/secure/lib/libcrypto/man/BIO_f_null.3
  stable/10/secure/lib/libcrypto/man/BIO_f_ssl.3
  stable/10/secure/lib/libcrypto/man/BIO_find_type.3
  stable/10/secure/lib/libcrypto/man/BIO_new.3
  stable/10/secure/lib/libcrypto/man/BIO_new_CMS.3
  stable/10/secure/lib/libcrypto/man/BIO_push.3
  stable/10/secure/lib/libcrypto/man/BIO_read.3
  stable/10/secure/lib/libcrypto/man/BIO_s_accept.3
  stable/10/secure/lib/libcrypto/man/BIO_s_bio.3
  stable/10/secure/lib/libcrypto/man/BIO_s_connect.3
  stable/10/secure/lib/libcrypto/man/BIO_s_fd.3
  stable/10/secure/lib/libcrypto/man/BIO_s_file.3
  stable/10/secure/lib/libcrypto/man/BIO_s_mem.3
  stable/10/secure/lib/libcrypto/man/BIO_s_null.3
  stable/10/secure/lib/libcrypto/man/BIO_s_socket.3
  stable/10/secure/lib/libcrypto/man/BIO_set_callback.3
  stable/10/secure/lib/libcrypto/man/BIO_should_retry.3
  stable/10/secure/lib/libcrypto/man/BN_BLINDING_new.3
  stable/10/secure/lib/libcrypto/man/BN_CTX_new.3
  stable/10/secure/lib/libcrypto/man/BN_CTX_start.3
  stable/10/secure/lib/libcrypto/man/BN_add.3
  stable/10/secure/lib/libcrypto/man/BN_add_word.3
  stable/10/secure/lib/libcrypto/man/BN_bn2bin.3
  stable/10/secure/lib/libcrypto/man/BN_cmp.3
  stable/10/secure/lib/libcrypto/man/BN_copy.3
  stable/10/secure/lib/libcrypto/man/BN_generate_prime.3
  stable/10/secure/lib/libcrypto/man/BN_mod_inverse.3
  stable/10/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3
  stable/10/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3
  stable/10/secure/lib/libcrypto/man/BN_new.3
  stable/10/secure/lib/libcrypto/man/BN_num_bytes.3
  stable/10/secure/lib/libcrypto/man/BN_rand.3
  stable/10/secure/lib/libcrypto/man/BN_set_bit.3
  stable/10/secure/lib/libcrypto/man/BN_swap.3
  stable/10/secure/lib/libcrypto/man/BN_zero.3
  stable/10/secure/lib/libcrypto/man/CMS_add0_cert.3
  stable/10/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3
  stable/10/secure/lib/libcrypto/man/CMS_add1_signer.3
  stable/10/secure/lib/libcrypto/man/CMS_compress.3
  stable/10/secure/lib/libcrypto/man/CMS_decrypt.3
  stable/10/secure/lib/libcrypto/man/CMS_encrypt.3
  stable/10/secure/lib/libcrypto/man/CMS_final.3
  stable/10/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3
  

svn commit: r295961 - stable/10/contrib/libarchive/libarchive

[Xin LI]

Author: delphij
Date: Wed Feb 24 05:40:03 2016
New Revision: 295961
URL: https://svnweb.freebsd.org/changeset/base/295961

Log:
  MFC r295914: MFV r295913:
  
  Partially apply upstream changeset 6e06b1c8 (kientzle).
  
  Limit filter recursion level to 25 (instead of infinite).  This fixes a
  potential crash issue discovered by Alexander Cherepanov.
  
  PR:   207362
  Reported by:  Robert Clausecker
  Obtained from:libarchive github project
  Approved by:  re (marius)

Modified:
  stable/10/contrib/libarchive/libarchive/archive_read.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/libarchive/libarchive/archive_read.c
==
--- stable/10/contrib/libarchive/libarchive/archive_read.c  Wed Feb 24 
05:17:52 2016(r295960)
+++ stable/10/contrib/libarchive/libarchive/archive_read.c  Wed Feb 24 
05:40:03 2016(r295961)
@@ -545,13 +545,13 @@ archive_read_open1(struct archive *_a)
 static int
 choose_filters(struct archive_read *a)
 {
-   int number_bidders, i, bid, best_bid;
+   int number_bidders, i, bid, best_bid, n;
struct archive_read_filter_bidder *bidder, *best_bidder;
struct archive_read_filter *filter;
ssize_t avail;
int r;
 
-   for (;;) {
+   for (n = 0; n < 25; ++n) {
number_bidders = sizeof(a->bidders) / sizeof(a->bidders[0]);
 
best_bid = 0;
@@ -597,6 +597,9 @@ choose_filters(struct archive_read *a)
return (ARCHIVE_FATAL);
}
}
+   archive_set_error(>archive, ARCHIVE_ERRNO_FILE_FORMAT,
+   "Input requires too many filters for decoding");
+   return (ARCHIVE_FATAL);
 }
 
 /*
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r294901 - in stable/10/sys: amd64/linux amd64/linux32 i386/linux

[Xin LI]

Author: delphij
Date: Wed Jan 27 07:28:55 2016
New Revision: 294901
URL: https://svnweb.freebsd.org/changeset/base/294901

Log:
  MFC r294900:
  
  Implement AT_SECURE properly.
  
  AT_SECURE auxv entry has been added to the Linux 2.5 kernel to pass a
  boolean flag indicating whether secure mode should be enabled. 1 means
  that the program has changes its credentials during the execution.
  Being exported AT_SECURE used by glibc issetugid() call.
  
  Submitted by: imp, dchagin
  Security: FreeBSD-SA-16:10.linux
  Security: CVE-2016-1883

Modified:
  stable/10/sys/amd64/linux/linux_sysvec.c
  stable/10/sys/amd64/linux32/linux32_sysvec.c
  stable/10/sys/i386/linux/linux_sysvec.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/amd64/linux/linux_sysvec.c
==
--- stable/10/sys/amd64/linux/linux_sysvec.cWed Jan 27 07:20:55 2016
(r294900)
+++ stable/10/sys/amd64/linux/linux_sysvec.cWed Jan 27 07:28:55 2016
(r294901)
@@ -271,6 +271,7 @@ elf_linux_fixup(register_t **stack_base,
Elf_Addr *pos;
struct ps_strings *arginfo;
struct proc *p;
+   int issetugid;
 
p = imgp->proc;
arginfo = (struct ps_strings *)p->p_sysent->sv_psstrings;
@@ -281,6 +282,7 @@ elf_linux_fixup(register_t **stack_base,
args = (Elf64_Auxargs *)imgp->auxargs;
pos = base + (imgp->args->argc + imgp->args->envc + 2);
 
+   issetugid = p->p_flag & P_SUGID ? 1 : 0;
AUXARGS_ENTRY(pos, LINUX_AT_SYSINFO_EHDR,
imgp->proc->p_sysent->sv_shared_page_base);
AUXARGS_ENTRY(pos, LINUX_AT_HWCAP, cpu_feature);
@@ -296,7 +298,7 @@ elf_linux_fixup(register_t **stack_base,
AUXARGS_ENTRY(pos, AT_EUID, imgp->proc->p_ucred->cr_svuid);
AUXARGS_ENTRY(pos, AT_GID, imgp->proc->p_ucred->cr_rgid);
AUXARGS_ENTRY(pos, AT_EGID, imgp->proc->p_ucred->cr_svgid);
-   AUXARGS_ENTRY(pos, LINUX_AT_SECURE, 0);
+   AUXARGS_ENTRY(pos, LINUX_AT_SECURE, issetugid);
AUXARGS_ENTRY(pos, LINUX_AT_PLATFORM, PTROUT(linux_platform));
AUXARGS_ENTRY(pos, LINUX_AT_RANDOM, imgp->canary);
if (imgp->execpathp != 0)

Modified: stable/10/sys/amd64/linux32/linux32_sysvec.c
==
--- stable/10/sys/amd64/linux32/linux32_sysvec.cWed Jan 27 07:20:55 
2016(r294900)
+++ stable/10/sys/amd64/linux32/linux32_sysvec.cWed Jan 27 07:28:55 
2016(r294901)
@@ -230,6 +230,7 @@ elf_linux_fixup(register_t **stack_base,
Elf32_Addr *base;
Elf32_Addr *pos;
struct linux32_ps_strings *arginfo;
+   int issetugid;
 
arginfo = (struct linux32_ps_strings *)LINUX32_PS_STRINGS;
 
@@ -239,6 +240,7 @@ elf_linux_fixup(register_t **stack_base,
args = (Elf32_Auxargs *)imgp->auxargs;
pos = base + (imgp->args->argc + imgp->args->envc + 2);
 
+   issetugid = imgp->proc->p_flag & P_SUGID ? 1 : 0;
AUXARGS_ENTRY_32(pos, LINUX_AT_SYSINFO_EHDR,
imgp->proc->p_sysent->sv_shared_page_base);
AUXARGS_ENTRY_32(pos, LINUX_AT_SYSINFO, linux32_vsyscall);
@@ -261,7 +263,7 @@ elf_linux_fixup(register_t **stack_base,
AUXARGS_ENTRY_32(pos, AT_FLAGS, args->flags);
AUXARGS_ENTRY_32(pos, AT_ENTRY, args->entry);
AUXARGS_ENTRY_32(pos, AT_BASE, args->base);
-   AUXARGS_ENTRY_32(pos, LINUX_AT_SECURE, 0);
+   AUXARGS_ENTRY_32(pos, LINUX_AT_SECURE, issetugid);
AUXARGS_ENTRY_32(pos, AT_UID, imgp->proc->p_ucred->cr_ruid);
AUXARGS_ENTRY_32(pos, AT_EUID, imgp->proc->p_ucred->cr_svuid);
AUXARGS_ENTRY_32(pos, AT_GID, imgp->proc->p_ucred->cr_rgid);

Modified: stable/10/sys/i386/linux/linux_sysvec.c
==
--- stable/10/sys/i386/linux/linux_sysvec.c Wed Jan 27 07:20:55 2016
(r294900)
+++ stable/10/sys/i386/linux/linux_sysvec.c Wed Jan 27 07:28:55 2016
(r294901)
@@ -238,11 +238,13 @@ elf_linux_fixup(register_t **stack_base,
Elf32_Addr *uplatform;
struct ps_strings *arginfo;
register_t *pos;
+   int issetugid;
 
KASSERT(curthread->td_proc == imgp->proc,
("unsafe elf_linux_fixup(), should be curproc"));
 
p = imgp->proc;
+   issetugid = imgp->proc->p_flag & P_SUGID ? 1 : 0;
arginfo = (struct ps_strings *)p->p_sysent->sv_psstrings;
uplatform = (Elf32_Addr *)((caddr_t)arginfo - linux_szplatform);
args = (Elf32_Auxargs *)imgp->auxargs;
@@ -270,7 +272,7 @@ elf_linux_fixup(register_t **stack_base,
AUXARGS_ENTRY(pos, AT_FLAGS, args->flags);
AUXARGS_ENTRY(pos, AT_ENTRY, args->entry);
AUXARGS_ENTRY(pos, AT_BASE, args->base);
-   AUXARGS_ENTRY(pos, LINUX_AT_SECURE, 0);
+   AUXARGS_ENTRY(pos, LINUX_AT_SECURE, issetugid);
AUXARGS_ENTRY(pos, AT_UID, 

svn commit: r293820 - in stable/10/sys/dev/hyperv: include vmbus

[Xin LI]

Author: delphij
Date: Wed Jan 13 08:22:53 2016
New Revision: 293820
URL: https://svnweb.freebsd.org/changeset/base/293820

Log:
  MFC r292861:
  
  hyperv: vmbus: run non-blocking message handlers in vmbus_msg_swintr()
  
  We'll remove the per-channel control_work_queue because it can't properly
  do serialization of message handling, e.g., when there are 2 NIC devices,
  vmbus_channel_on_offer() -> hv_queue_work_item() has a race condition:
  for an SMP VM, vmbus_channel_process_offer() can run concurrently on
  different CPUs and if the second NIC's
  vmbus_channel_process_offer() -> hv_vmbus_child_device_register() runs
  first, the second NIC's name will be hn0 and the first NIC's name will
  be hn1!
  
  We can fix the race condition by removing the per-channel control_work_queue
  and run all the message handlers in the global
  hv_vmbus_g_connection.work_queue -- we'll do this in the next patch.
  
  With the coming next patch, we have to run the non-blocking handlers
  directly in the kernel thread vmbus_msg_swintr(), because the special
  handling of sub-channel: when a sub-channel (e.g., of the storvsc driver)
  is received and being handled in vmbus_channel_on_offer() running on the
  global hv_vmbus_g_connection.work_queue, vmbus_channel_process_offer()
  invokes channel->sc_creation_callback, i.e., storvsc_handle_sc_creation,
  and the callback will invoke hv_vmbus_channel_open() -> hv_vmbus_post_message
  and expect a further reply from the host, but the handling of the further
  messag can't be done because the current message's handling hasn't finished
  yet; as result, hv_vmbus_channel_open() -> sema_timedwait() will time out
  and th device can't work.
  
  Also renamed the handler type from hv_pfn_channel_msg_handler to
  vmbus_msg_handler: the 'pfn' and 'channel' in the old name make no sense.
  
  Submitted by: Dexuan Cui 
  Reviewed by:  royger
  Differential Revision:https://reviews.freebsd.org/D4596
  
  MFC r292859:
  
  hyperv: vmbus: remove the per-channel control_work_queue
  
  Now vmbus_channel_on_offer() -> vmbus_channel_process_offer() can
  safely run on the global hv_vmbus_g_connection.work_queue now.
  
  We remove the per-channel control_work_queue to achieve the proper
  serialization of the message handling.
  
  I removed the bogus TODO in vmbus_channel_on_offer(): a vmbus offer
  can only come from the parent partition, i.e., the host.
  
  PR:   kern/205156
  Submitted by: Dexuan Cui 
  Reviewed by:  Howard Su , delphij
  Differential Revision:https://reviews.freebsd.org/D4597

Modified:
  stable/10/sys/dev/hyperv/include/hyperv.h
  stable/10/sys/dev/hyperv/vmbus/hv_channel_mgmt.c
  stable/10/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
  stable/10/sys/dev/hyperv/vmbus/hv_vmbus_priv.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/hyperv/include/hyperv.h
==
--- stable/10/sys/dev/hyperv/include/hyperv.h   Wed Jan 13 08:09:28 2016
(r293819)
+++ stable/10/sys/dev/hyperv/include/hyperv.h   Wed Jan 13 08:22:53 2016
(r293820)
@@ -759,7 +759,6 @@ typedef struct hv_vmbus_channel {
hv_vmbus_ring_buffer_info   inbound;
 
struct mtx  inbound_lock;
-   hv_vmbus_handle control_work_queue;
 
hv_vmbus_pfn_channel_callback   on_channel_callback;
void*   channel_callback_context;

Modified: stable/10/sys/dev/hyperv/vmbus/hv_channel_mgmt.c
==
--- stable/10/sys/dev/hyperv/vmbus/hv_channel_mgmt.cWed Jan 13 08:09:28 
2016(r293819)
+++ stable/10/sys/dev/hyperv/vmbus/hv_channel_mgmt.cWed Jan 13 08:22:53 
2016(r293820)
@@ -34,13 +34,6 @@ __FBSDID("$FreeBSD$");
 
 #include "hv_vmbus_priv.h"
 
-typedef void (*hv_pfn_channel_msg_handler)(hv_vmbus_channel_msg_header* msg);
-
-typedef struct hv_vmbus_channel_msg_table_entry {
-   hv_vmbus_channel_msg_typemessageType;
-   hv_pfn_channel_msg_handler   messageHandler;
-} hv_vmbus_channel_msg_table_entry;
-
 /*
  * Internal functions
  */
@@ -52,36 +45,46 @@ static void vmbus_channel_on_gpadl_creat
 static void vmbus_channel_on_gpadl_torndown(hv_vmbus_channel_msg_header* hdr);
 static void vmbus_channel_on_offers_delivered(hv_vmbus_channel_msg_header* 
hdr);
 static void vmbus_channel_on_version_response(hv_vmbus_channel_msg_header* 
hdr);
-static void vmbus_channel_process_offer(void *context);
 
 /**
  * Channel message dispatch table
  */
 hv_vmbus_channel_msg_table_entry
 g_channel_message_table[HV_CHANNEL_MESSAGE_COUNT] = {
-   { HV_CHANNEL_MESSAGE_INVALID, NULL },
-   { HV_CHANNEL_MESSAGE_OFFER_CHANNEL, vmbus_channel_on_offer },
+   { HV_CHANNEL_MESSAGE_INVALID,
+   0, NULL },
+   { HV_CHANNEL_MESSAGE_OFFER_CHANNEL,
+   0, 

svn commit: r292588 - in stable/10: . contrib/xz contrib/xz/src/common contrib/xz/src/liblzma contrib/xz/src/liblzma/api contrib/xz/src/liblzma/api/lzma contrib/xz/src/liblzma/check contrib/xz/src/...

[Xin LI]

Author: delphij
Date: Tue Dec 22 08:03:23 2015
New Revision: 292588
URL: https://svnweb.freebsd.org/changeset/base/292588

Log:
  MFC: xz 5.2.2.
  
  Relnotes: yes

Added:
  stable/10/contrib/xz/src/liblzma/api/lzma/lzma12.h
 - copied unchanged from r278433, 
head/contrib/xz/src/liblzma/api/lzma/lzma12.h
  stable/10/contrib/xz/src/liblzma/common/block_buffer_encoder.h
 - copied unchanged from r278433, 
head/contrib/xz/src/liblzma/common/block_buffer_encoder.h
  stable/10/contrib/xz/src/liblzma/common/hardware_cputhreads.c
 - copied unchanged from r278433, 
head/contrib/xz/src/liblzma/common/hardware_cputhreads.c
  stable/10/contrib/xz/src/liblzma/common/memcmplen.h
 - copied, changed from r278433, 
head/contrib/xz/src/liblzma/common/memcmplen.h
  stable/10/contrib/xz/src/liblzma/common/outqueue.c
 - copied unchanged from r278433, 
head/contrib/xz/src/liblzma/common/outqueue.c
  stable/10/contrib/xz/src/liblzma/common/outqueue.h
 - copied unchanged from r278433, 
head/contrib/xz/src/liblzma/common/outqueue.h
  stable/10/contrib/xz/src/liblzma/common/stream_encoder_mt.c
 - copied unchanged from r278433, 
head/contrib/xz/src/liblzma/common/stream_encoder_mt.c
  stable/10/contrib/xz/src/liblzma/liblzma.map
 - copied unchanged from r278433, head/contrib/xz/src/liblzma/liblzma.map
  stable/10/contrib/xz/src/liblzma/liblzma.pc.in
 - copied, changed from r276898, head/contrib/xz/src/liblzma/liblzma.pc.in
  stable/10/contrib/xz/src/liblzma/validate_map.sh
 - copied unchanged from r278433, 
head/contrib/xz/src/liblzma/validate_map.sh
  stable/10/contrib/xz/src/xz/mytime.c
 - copied unchanged from r278433, head/contrib/xz/src/xz/mytime.c
  stable/10/contrib/xz/src/xz/mytime.h
 - copied unchanged from r278433, head/contrib/xz/src/xz/mytime.h
Deleted:
  stable/10/contrib/xz/src/liblzma/api/lzma/lzma.h
  stable/10/contrib/xz/src/liblzma/common/stream_encoder.h
Modified:
  stable/10/Makefile.inc1
  stable/10/ObsoleteFiles.inc
  stable/10/contrib/xz/ChangeLog
  stable/10/contrib/xz/FREEBSD-Xlist
  stable/10/contrib/xz/FREEBSD-upgrade
  stable/10/contrib/xz/THANKS
  stable/10/contrib/xz/TODO
  stable/10/contrib/xz/src/common/mythread.h
  stable/10/contrib/xz/src/common/sysdefs.h
  stable/10/contrib/xz/src/common/tuklib_cpucores.c
  stable/10/contrib/xz/src/common/tuklib_integer.h
  stable/10/contrib/xz/src/common/tuklib_physmem.c
  stable/10/contrib/xz/src/liblzma/api/lzma.h
  stable/10/contrib/xz/src/liblzma/api/lzma/base.h
  stable/10/contrib/xz/src/liblzma/api/lzma/block.h
  stable/10/contrib/xz/src/liblzma/api/lzma/container.h
  stable/10/contrib/xz/src/liblzma/api/lzma/filter.h
  stable/10/contrib/xz/src/liblzma/api/lzma/hardware.h
  stable/10/contrib/xz/src/liblzma/api/lzma/index.h
  stable/10/contrib/xz/src/liblzma/api/lzma/index_hash.h
  stable/10/contrib/xz/src/liblzma/api/lzma/version.h
  stable/10/contrib/xz/src/liblzma/check/check.h
  stable/10/contrib/xz/src/liblzma/check/sha256.c
  stable/10/contrib/xz/src/liblzma/common/alone_decoder.c
  stable/10/contrib/xz/src/liblzma/common/alone_decoder.h
  stable/10/contrib/xz/src/liblzma/common/alone_encoder.c
  stable/10/contrib/xz/src/liblzma/common/auto_decoder.c
  stable/10/contrib/xz/src/liblzma/common/block_buffer_decoder.c
  stable/10/contrib/xz/src/liblzma/common/block_buffer_encoder.c
  stable/10/contrib/xz/src/liblzma/common/block_decoder.c
  stable/10/contrib/xz/src/liblzma/common/block_decoder.h
  stable/10/contrib/xz/src/liblzma/common/block_encoder.c
  stable/10/contrib/xz/src/liblzma/common/block_encoder.h
  stable/10/contrib/xz/src/liblzma/common/block_header_decoder.c
  stable/10/contrib/xz/src/liblzma/common/block_header_encoder.c
  stable/10/contrib/xz/src/liblzma/common/block_util.c
  stable/10/contrib/xz/src/liblzma/common/common.c
  stable/10/contrib/xz/src/liblzma/common/common.h
  stable/10/contrib/xz/src/liblzma/common/easy_buffer_encoder.c
  stable/10/contrib/xz/src/liblzma/common/easy_encoder.c
  stable/10/contrib/xz/src/liblzma/common/filter_buffer_decoder.c
  stable/10/contrib/xz/src/liblzma/common/filter_buffer_encoder.c
  stable/10/contrib/xz/src/liblzma/common/filter_common.c
  stable/10/contrib/xz/src/liblzma/common/filter_common.h
  stable/10/contrib/xz/src/liblzma/common/filter_decoder.c
  stable/10/contrib/xz/src/liblzma/common/filter_decoder.h
  stable/10/contrib/xz/src/liblzma/common/filter_encoder.c
  stable/10/contrib/xz/src/liblzma/common/filter_encoder.h
  stable/10/contrib/xz/src/liblzma/common/filter_flags_decoder.c
  stable/10/contrib/xz/src/liblzma/common/index.c
  stable/10/contrib/xz/src/liblzma/common/index_decoder.c
  stable/10/contrib/xz/src/liblzma/common/index_encoder.c
  stable/10/contrib/xz/src/liblzma/common/index_encoder.h
  stable/10/contrib/xz/src/liblzma/common/index_hash.c
  stable/10/contrib/xz/src/liblzma/common/stream_buffer_decoder.c
  stable/10/contrib/xz/src/liblzma/common/stream_buffer_encoder.c
  

svn commit: r292589 - stable/10/sys/sys

[Xin LI]

Author: delphij
Date: Tue Dec 22 08:08:41 2015
New Revision: 292589
URL: https://svnweb.freebsd.org/changeset/base/292589

Log:
  Bump __FreeBSD_version after xz 5.2.2 merge (multithread support).

Modified:
  stable/10/sys/sys/param.h

Modified: stable/10/sys/sys/param.h
==
--- stable/10/sys/sys/param.h   Tue Dec 22 08:03:23 2015(r292588)
+++ stable/10/sys/sys/param.h   Tue Dec 22 08:08:41 2015(r292589)
@@ -58,7 +58,7 @@
  * in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1002503  /* Master, propagated to newvers */
+#define __FreeBSD_version 1002504  /* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r292322 - in stable/10: share/man/man4 sys/dev/arcmsr

[Xin LI]

Author: delphij
Date: Wed Dec 16 08:02:21 2015
New Revision: 292322
URL: https://svnweb.freebsd.org/changeset/base/292322

Log:
  MFC r259564,259565,291641:
  
  Update arcmsr(4) to 1.30.00.00 in order to add support of
  ARC-1203 SATA RAID controllers.
  
  Many thanks to Areca for continuing to support FreeBSD.

Modified:
  stable/10/share/man/man4/arcmsr.4
  stable/10/sys/dev/arcmsr/arcmsr.c
  stable/10/sys/dev/arcmsr/arcmsr.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/man/man4/arcmsr.4
==
--- stable/10/share/man/man4/arcmsr.4   Wed Dec 16 06:21:26 2015
(r292321)
+++ stable/10/share/man/man4/arcmsr.4   Wed Dec 16 08:02:21 2015
(r292322)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 27, 2013
+.Dd December 18, 2013
 .Dt ARCMSR 4
 .Os
 .Sh NAME
@@ -143,6 +143,8 @@ ARC-1681
 ARC-1880
 .It
 ARC-1882
+.It
+ARC-1883
 .El
 .Sh FILES
 .Bl -tag -width ".Pa /dev/arcmsr?" -compact

Modified: stable/10/sys/dev/arcmsr/arcmsr.c
==
--- stable/10/sys/dev/arcmsr/arcmsr.c   Wed Dec 16 06:21:26 2015
(r292321)
+++ stable/10/sys/dev/arcmsr/arcmsr.c   Wed Dec 16 08:02:21 2015
(r292322)
@@ -75,6 +75,8 @@
 ** 1.20.00.26   12/14/2012  Ching Huang Added support 
ARC1214,1224,1264,1284
 ** 1.20.00.27   05/06/2013  Ching Huang Fixed out standing cmd full on 
ARC-12x4
 ** 1.20.00.28   09/13/2013  Ching Huang Removed recursive mutex in 
arcmsr_abort_dr_ccbs
+** 1.20.00.29   12/18/2013  Ching Huang Change simq allocation number, 
support ARC1883
+** 1.30.00.00   11/30/2015  Ching Huang Added support ARC1203
 
**
 */
 
@@ -125,15 +127,15 @@ __FBSDID("$FreeBSD$");
 **
 */
 #if __FreeBSD_version >= 55
-#include 
-#include 
-#include 
-#include 
-#include 
+   #include 
+   #include 
+   #include 
+   #include 
+   #include 
 #else
-#include 
-#include 
-#include 
+   #include 
+   #include 
+   #include 
 #endif
 
 #if !defined(CAM_NEW_TRAN_CODE) && __FreeBSD_version >= 700025
@@ -146,7 +148,7 @@ __FBSDID("$FreeBSD$");
 #define arcmsr_callout_init(a) callout_init(a);
 #endif
 
-#define ARCMSR_DRIVER_VERSION  "arcmsr version 1.20.00.28 2013-09-13"
+#define ARCMSR_DRIVER_VERSION  "arcmsr version 1.30.00.00 2015-11-30"
 #include 
 /*
 **
@@ -180,8 +182,8 @@ static int arcmsr_iop_message_xfer(struc
 static int arcmsr_resume(device_t dev);
 static int arcmsr_suspend(device_t dev);
 static void arcmsr_rescanLun_cb(struct cam_periph *periph, union ccb *ccb);
-static voidarcmsr_polling_devmap(void *arg);
-static voidarcmsr_srb_timeout(void *arg);
+static void arcmsr_polling_devmap(void *arg);
+static void arcmsr_srb_timeout(void *arg);
 static void arcmsr_hbd_postqueue_isr(struct AdapterControlBlock *acb);
 #ifdef ARCMSR_DEBUG1
 static void arcmsr_dump_data(struct AdapterControlBlock *acb);
@@ -219,11 +221,11 @@ static device_method_t arcmsr_methods[]=
{ 0, 0 }
 #endif
 };
-   
+
 static driver_t arcmsr_driver={
"arcmsr", arcmsr_methods, sizeof(struct AdapterControlBlock)
 };
-   
+
 static devclass_t arcmsr_devclass;
 DRIVER_MODULE(arcmsr, pci, arcmsr_driver, arcmsr_devclass, 0, 0);
 MODULE_DEPEND(arcmsr, pci, 1, 1, 1);
@@ -246,38 +248,38 @@ static struct cdevsw arcmsr_cdevsw={
};
 #else
#define ARCMSR_CDEV_MAJOR   180
-   
+
 static struct cdevsw arcmsr_cdevsw = {
-   arcmsr_open,/* open */
-   arcmsr_close,   /* close*/
-   noread, /* read */
-   nowrite,/* write*/
-   arcmsr_ioctl,   /* ioctl*/
-   nopoll, /* poll */
-   nommap, /* mmap */
-   nostrategy, /* strategy */
-   "arcmsr",   /* name */
-   ARCMSR_CDEV_MAJOR,  /* major*/
-   nodump, /* dump */
-   nopsize,/* psize*/
-   0   /* 
flags*/
+   arcmsr_open,/* open */
+   arcmsr_close,   /* close*/
+   noread, /* read */
+

svn commit: r290853 - stable/10/usr.sbin/rtadvd

[Xin LI]

Author: delphij
Date: Sun Nov 15 07:10:02 2015
New Revision: 290853
URL: https://svnweb.freebsd.org/changeset/base/290853

Log:
  MFC r290173:
  
  Use strlcpy().

Modified:
  stable/10/usr.sbin/rtadvd/if.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/rtadvd/if.c
==
--- stable/10/usr.sbin/rtadvd/if.c  Sun Nov 15 06:38:38 2015
(r290852)
+++ stable/10/usr.sbin/rtadvd/if.c  Sun Nov 15 07:10:02 2015
(r290853)
@@ -359,8 +359,7 @@ update_persist_ifinfo(struct ifilist_hea
 
ELM_MALLOC(ifi, exit(1));
ifi->ifi_ifindex = 0;
-   strncpy(ifi->ifi_ifname, ifname, sizeof(ifi->ifi_ifname)-1);
-   ifi->ifi_ifname[sizeof(ifi->ifi_ifname)-1] = '\0';
+   strlcpy(ifi->ifi_ifname, ifname, sizeof(ifi->ifi_ifname));
ifi->ifi_rainfo = NULL;
ifi->ifi_state = IFI_STATE_UNCONFIGURED;
TAILQ_INSERT_TAIL(ifi_head, ifi, ifi_next);
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r290854 - stable/10/usr.sbin/pw

[Xin LI]

Author: delphij
Date: Sun Nov 15 07:14:17 2015
New Revision: 290854
URL: https://svnweb.freebsd.org/changeset/base/290854

Log:
  MFC r290174:
  
  In pw_userlock, set 'name' to NULL when we encounter an all number string
  because it is also used as an indicator of whether a name or an UID is
  being used and we may have undefined results as 'name' may contain
  uninitialized stack contents.

Modified:
  stable/10/usr.sbin/pw/pw_user.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/pw/pw_user.c
==
--- stable/10/usr.sbin/pw/pw_user.c Sun Nov 15 07:10:02 2015
(r290853)
+++ stable/10/usr.sbin/pw/pw_user.c Sun Nov 15 07:14:17 2015
(r290854)
@@ -280,9 +280,10 @@ pw_userlock(char *arg1, int mode)
if (arg1 == NULL)
errx(EX_DATAERR, "username or id required");
 
-   if (arg1[strspn(arg1, "0123456789")] == '\0')
+   if (arg1[strspn(arg1, "0123456789")] == '\0') {
id = pw_checkid(arg1, UID_MAX);
-   else
+   name = NULL;
+   } else
name = arg1;
 
pwd = (name != NULL) ? GETPWNAM(pw_checkname(name, 0)) : GETPWUID(id);
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r290150 - stable/10/share/timedef

[Xin LI]

Author: delphij
Date: Thu Oct 29 17:00:51 2015
New Revision: 290150
URL: https://svnweb.freebsd.org/changeset/base/290150

Log:
  MFC r289038,r289041:
  
  Add encoding for mime-types.
  
  Fix short month names and replace %b with %_m in date_fmt for Chinese
  locales.
  
  When using a Chinese locale, such as zh_TW.UTF-8 or zh_CN.UTF-8,
  nl_langinfo(ABMON_*) only returned numbers.  For instance,
  nl_langinfo(ABMON_1) returns 1, nl_langinfo(ABMON_2) returns 2, and
  so on.
  
  This causes problems in applications that put the short month name
  and the day of the month together.  For example, 'Apr 14' in English
  becomes '414日' in Chinese on the top bar of GNOME Shell.
  
  This problem may be resolved by appending '月' to all short month
  names and replacing %b with %_m in date_fmt. ja_JP.UTF-8 already
  does this, and this matches the en_US.ISO8859-1 behavior, which
  returns 'Oct'.  The GNU C Library also returns values with '月'
  appended.
  
  PR:   199441
  Submitted by: Ting-Wei Lan 

Modified:
  stable/10/share/timedef/zh_CN.GB18030.src   (contents, props changed)
  stable/10/share/timedef/zh_CN.GB2312.src   (contents, props changed)
  stable/10/share/timedef/zh_CN.UTF-8.src   (contents, props changed)
  stable/10/share/timedef/zh_CN.eucCN.src   (contents, props changed)
  stable/10/share/timedef/zh_TW.Big5.src   (contents, props changed)
  stable/10/share/timedef/zh_TW.UTF-8.src   (contents, props changed)
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/timedef/zh_CN.GB18030.src
==
--- stable/10/share/timedef/zh_CN.GB18030.src   Thu Oct 29 16:53:34 2015
(r290149)
+++ stable/10/share/timedef/zh_CN.GB18030.src   Thu Oct 29 17:00:51 2015
(r290150)
@@ -5,18 +5,18 @@
 #
 # Short month names
 #
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
-10
-11
-12
+ 1��
+ 2��
+ 3��
+ 4��
+ 5��
+ 6��
+ 7��
+ 8��
+ 9��
+10��
+11��
+12��
 #
 # Long month names (as in a date)
 #
@@ -75,7 +75,7 @@
 #
 # date_fmt
 #
-%Y��%b��%e�� %A %X %Z
+%Y��%_m��%e�� %A %X %Z
 #
 # Long month names (without case ending)
 #

Modified: stable/10/share/timedef/zh_CN.GB2312.src
==
--- stable/10/share/timedef/zh_CN.GB2312.srcThu Oct 29 16:53:34 2015
(r290149)
+++ stable/10/share/timedef/zh_CN.GB2312.srcThu Oct 29 17:00:51 2015
(r290150)
@@ -5,18 +5,18 @@
 #
 # Short month names
 #
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
-10
-11
-12
+ 1��
+ 2��
+ 3��
+ 4��
+ 5��
+ 6��
+ 7��
+ 8��
+ 9��
+10��
+11��
+12��
 #
 # Long month names (as in a date)
 #
@@ -75,7 +75,7 @@
 #
 # date_fmt
 #
-%Y��%b��%e�� %A %X %Z
+%Y��%_m��%e�� %A %X %Z
 #
 # Long month names (without case ending)
 #

Modified: stable/10/share/timedef/zh_CN.UTF-8.src
==
--- stable/10/share/timedef/zh_CN.UTF-8.src Thu Oct 29 16:53:34 2015
(r290149)
+++ stable/10/share/timedef/zh_CN.UTF-8.src Thu Oct 29 17:00:51 2015
(r290150)
@@ -5,18 +5,18 @@
 #
 # Short month names
 #
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
-10
-11
-12
+ 1月
+ 2月
+ 3月
+ 4月
+ 5月
+ 6月
+ 7月
+ 8月
+ 9月
+10月
+11月
+12月
 #
 # Long month names (as in a date)
 #
@@ -75,7 +75,7 @@
 #
 # date_fmt
 #
-%Y年%b月%e日 %A %X %Z
+%Y年%_m月%e日 %A %X %Z
 #
 # Long month names (without case ending)
 #

Modified: stable/10/share/timedef/zh_CN.eucCN.src
==
--- stable/10/share/timedef/zh_CN.eucCN.src Thu Oct 29 16:53:34 2015
(r290149)
+++ stable/10/share/timedef/zh_CN.eucCN.src Thu Oct 29 17:00:51 2015
(r290150)
@@ -5,18 +5,18 @@
 #
 # Short month names
 #
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
-10
-11
-12
+ 1��
+ 2��
+ 3��
+ 4��
+ 5��
+ 6��
+ 7��
+ 8��
+ 9��
+10��
+11��
+12��
 #
 # Long month names (as in a date)
 #
@@ -75,7 +75,7 @@
 #
 # date_fmt
 #
-%Y��%b��%e�� %A %X %Z
+%Y��%_m��%e�� %A %X %Z
 #
 # Long month names (without case ending)
 #

Modified: stable/10/share/timedef/zh_TW.Big5.src
==
--- stable/10/share/timedef/zh_TW.Big5.src  Thu Oct 29 16:53:34 2015
(r290149)
+++ stable/10/share/timedef/zh_TW.Big5.src  Thu Oct 29 17:00:51 2015
(r290150)
@@ -4,18 +4,18 @@
 # WARNING: empty lines are essential too
 #
 # Short month names
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
-10
-11
-12
+ 1��
+ 2��
+ 3��
+ 4��
+ 5��
+ 6��
+ 7��
+ 8��
+ 9��
+10��
+11��
+12��
 #
 # Long month names (as in a date)
 #
@@ -74,7 +74,7 @@
 #
 # date_fmt
 #
-%Y�~%b��%e�� %A %X %Z
+%Y�~%_m��%e�� %A %X %Z
 #
 # Long month names (without case ending)
 #

Modified: stable/10/share/timedef/zh_TW.UTF-8.src
==
--- stable/10/share/timedef/zh_TW.UTF-8.src Thu Oct 29 16:53:34 2015
(r290149)
+++ 

svn commit: r290152 - in stable/10: contrib/file contrib/file/doc contrib/file/magic/Magdir contrib/file/src lib/libmagic

[Xin LI]

Author: delphij
Date: Thu Oct 29 17:51:48 2015
New Revision: 290152
URL: https://svnweb.freebsd.org/changeset/base/290152

Log:
  MFC r287453,287454,288143:
  
  file 5.25.
  
  Relnotes: yes

Modified:
  stable/10/contrib/file/ChangeLog
  stable/10/contrib/file/configure
  stable/10/contrib/file/configure.ac
  stable/10/contrib/file/doc/file.man
  stable/10/contrib/file/doc/libmagic.man
  stable/10/contrib/file/doc/magic.man
  stable/10/contrib/file/magic/Magdir/adventure
  stable/10/contrib/file/magic/Magdir/apple
  stable/10/contrib/file/magic/Magdir/archive
  stable/10/contrib/file/magic/Magdir/c-lang
  stable/10/contrib/file/magic/Magdir/c64
  stable/10/contrib/file/magic/Magdir/compress
  stable/10/contrib/file/magic/Magdir/database
  stable/10/contrib/file/magic/Magdir/elf
  stable/10/contrib/file/magic/Magdir/filesystems
  stable/10/contrib/file/magic/Magdir/fortran
  stable/10/contrib/file/magic/Magdir/frame
  stable/10/contrib/file/magic/Magdir/iff
  stable/10/contrib/file/magic/Magdir/images
  stable/10/contrib/file/magic/Magdir/karma
  stable/10/contrib/file/magic/Magdir/linux
  stable/10/contrib/file/magic/Magdir/mail.news
  stable/10/contrib/file/magic/Magdir/make
  stable/10/contrib/file/magic/Magdir/map
  stable/10/contrib/file/magic/Magdir/msdos
  stable/10/contrib/file/magic/Magdir/netscape
  stable/10/contrib/file/magic/Magdir/python
  stable/10/contrib/file/magic/Magdir/scientific
  stable/10/contrib/file/magic/Magdir/sgi
  stable/10/contrib/file/magic/Magdir/sgml
  stable/10/contrib/file/magic/Magdir/windows
  stable/10/contrib/file/src/apprentice.c
  stable/10/contrib/file/src/file.c
  stable/10/contrib/file/src/file.h
  stable/10/contrib/file/src/file_opts.h
  stable/10/contrib/file/src/funcs.c
  stable/10/contrib/file/src/gmtime_r.c
  stable/10/contrib/file/src/localtime_r.c
  stable/10/contrib/file/src/magic.c
  stable/10/contrib/file/src/magic.h
  stable/10/contrib/file/src/magic.h.in
  stable/10/contrib/file/src/print.c
  stable/10/contrib/file/src/readelf.c
  stable/10/contrib/file/src/softmagic.c
  stable/10/lib/libmagic/config.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/file/ChangeLog
==
--- stable/10/contrib/file/ChangeLogThu Oct 29 17:04:43 2015
(r290151)
+++ stable/10/contrib/file/ChangeLogThu Oct 29 17:51:48 2015
(r290152)
@@ -1,3 +1,23 @@
+2015-09-16   9:50  Christos Zoulas 
+   
+   * release 5.25
+
+2015-09-11  13:25  Christos Zoulas 
+
+   * add a limit to the length of regex searches
+
+2015-09-08   9:50  Christos Zoulas 
+
+   * fix problems with --parameter (Christoph Biedl)
+
+2015-07-11  10:35  Christos Zoulas 
+
+   * Windows fixes PR/466 (Jason Hood)
+
+2015-07-09  10:35  Christos Zoulas 
+
+   * release 5.24
+
 2015-06-11   8:52  Christos Zoulas 
 
* redo long option encoding to fix off-by-one in 5.23

Modified: stable/10/contrib/file/configure
==
--- stable/10/contrib/file/configureThu Oct 29 17:04:43 2015
(r290151)
+++ stable/10/contrib/file/configureThu Oct 29 17:51:48 2015
(r290152)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for file 5.23.
+# Generated by GNU Autoconf 2.69 for file 5.25.
 #
 # Report bugs to .
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='file'
 PACKAGE_TARNAME='file'
-PACKAGE_VERSION='5.23'
-PACKAGE_STRING='file 5.23'
+PACKAGE_VERSION='5.25'
+PACKAGE_STRING='file 5.25'
 PACKAGE_BUGREPORT='chris...@astron.com'
 PACKAGE_URL=''
 
@@ -1327,7 +1327,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures file 5.23 to adapt to many kinds of systems.
+\`configure' configures file 5.25 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1397,7 +1397,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of file 5.23:";;
+ short | recursive ) echo "Configuration of file 5.25:";;
esac
   cat <<\_ACEOF
 
@@ -1507,7 +1507,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-file configure 5.23
+file configure 5.25
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2163,7 +2163,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by file $as_me 5.23, which 

svn commit: r290149 - in stable/10: sbin/rtsol usr.sbin/rtadvd usr.sbin/rtsold

[Xin LI]

Author: delphij
Date: Thu Oct 29 16:53:34 2015
New Revision: 290149
URL: https://svnweb.freebsd.org/changeset/base/290149

Log:
  MFC r288963:
  
  Now that we own the code, use arc4random(3) unconditionally
  and remove the corresponding HAVE_ARC4RANDOM conditions.

Modified:
  stable/10/sbin/rtsol/Makefile
  stable/10/usr.sbin/rtadvd/Makefile
  stable/10/usr.sbin/rtadvd/rtadvd.c
  stable/10/usr.sbin/rtsold/Makefile
  stable/10/usr.sbin/rtsold/rtsold.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sbin/rtsol/Makefile
==
--- stable/10/sbin/rtsol/Makefile   Thu Oct 29 16:50:28 2015
(r290148)
+++ stable/10/sbin/rtsol/Makefile   Thu Oct 29 16:53:34 2015
(r290149)
@@ -23,6 +23,6 @@ SRCS= rtsold.c rtsol.c if.c probe.c dump
 MAN=
 
 WARNS?=3
-CFLAGS+= -DHAVE_ARC4RANDOM -DHAVE_POLL_H -DSMALL
+CFLAGS+= -DHAVE_POLL_H -DSMALL
 
 .include 

Modified: stable/10/usr.sbin/rtadvd/Makefile
==
--- stable/10/usr.sbin/rtadvd/Makefile  Thu Oct 29 16:50:28 2015
(r290148)
+++ stable/10/usr.sbin/rtadvd/Makefile  Thu Oct 29 16:53:34 2015
(r290149)
@@ -22,8 +22,6 @@ SRCS= rtadvd.c rrenum.c advcap.c if.c co
 DPADD= ${LIBUTIL}
 LDADD= -lutil
 
-CFLAGS+= -DHAVE_ARC4RANDOM
-
 WARNS?=1
 
 .include 

Modified: stable/10/usr.sbin/rtadvd/rtadvd.c
==
--- stable/10/usr.sbin/rtadvd/rtadvd.c  Thu Oct 29 16:50:28 2015
(r290148)
+++ stable/10/usr.sbin/rtadvd/rtadvd.c  Thu Oct 29 16:53:34 2015
(r290149)
@@ -242,14 +242,6 @@ main(int argc, char *argv[])
/* timer initialization */
rtadvd_timer_init();
 
-#ifndef HAVE_ARC4RANDOM
-   /* random value initialization */
-#ifdef __FreeBSD__
-   srandomdev();
-#else
-   srandom((unsigned long)time(NULL));
-#endif
-#endif
pfh = pidfile_open(pidfilename, 0600, );
if (pfh == NULL) {
if (errno == EEXIST)
@@ -1016,11 +1008,7 @@ set_short_delay(struct ifinfo *ifi)
 * delay and send the advertisement at the
 * already-scheduled time. RFC 4861 6.2.6
 */
-#ifdef HAVE_ARC4RANDOM
delay = arc4random_uniform(MAX_RA_DELAY_TIME);
-#else
-   delay = random() % MAX_RA_DELAY_TIME;
-#endif
interval.tv_sec = 0;
interval.tv_nsec = delay * 1000;
rest = rtadvd_timer_rest(ifi->ifi_ra_timer);
@@ -1894,13 +1882,8 @@ ra_timer_update(void *arg, struct timesp
 * MaxRtrAdvInterval (RFC4861 6.2.4).
 */
interval = rai->rai_mininterval;
-#ifdef HAVE_ARC4RANDOM
interval += arc4random_uniform(rai->rai_maxinterval -
rai->rai_mininterval);
-#else
-   interval += random() % (rai->rai_maxinterval -
-   rai->rai_mininterval);
-#endif
break;
case IFI_STATE_TRANSITIVE:
/*

Modified: stable/10/usr.sbin/rtsold/Makefile
==
--- stable/10/usr.sbin/rtsold/Makefile  Thu Oct 29 16:50:28 2015
(r290148)
+++ stable/10/usr.sbin/rtsold/Makefile  Thu Oct 29 16:53:34 2015
(r290149)
@@ -20,7 +20,7 @@ MLINKS=   rtsold.8 rtsol.8
 SRCS=  rtsold.c rtsol.c if.c probe.c dump.c rtsock.c
 
 WARNS?=3
-CFLAGS+= -DHAVE_ARC4RANDOM -DHAVE_POLL_H
+CFLAGS+= -DHAVE_POLL_H
 DPADD= ${LIBKVM}
 LDADD= -lkvm
 

Modified: stable/10/usr.sbin/rtsold/rtsold.c
==
--- stable/10/usr.sbin/rtsold/rtsold.c  Thu Oct 29 16:50:28 2015
(r290148)
+++ stable/10/usr.sbin/rtsold/rtsold.c  Thu Oct 29 16:53:34 2015
(r290149)
@@ -223,10 +223,6 @@ main(int argc, char **argv)
errx(1, "pid filename (%s) must be an absolute path",
pidfilename);
}
-#ifndef HAVE_ARC4RANDOM
-   /* random value initialization */
-   srandom((u_long)time(NULL));
-#endif
 
 #if (__FreeBSD_version < 90)
if (Fflag) {
@@ -780,11 +776,7 @@ rtsol_timer_update(struct ifinfo *ifi)
ifi->timer = tm_max;/* stop timer(valid?) */
break;
case IFS_DELAY:
-#ifndef HAVE_ARC4RANDOM
-   interval = random() % (MAX_RTR_SOLICITATION_DELAY * MILLION);
-#else
interval = arc4random_uniform(MAX_RTR_SOLICITATION_DELAY * 
MILLION);
-#endif
ifi->timer.tv_sec = interval / MILLION;
ifi->timer.tv_nsec = (interval % MILLION) * 1000;
break;
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r290145 - stable/10/usr.sbin/iscsid

[Xin LI]

Author: delphij
Date: Thu Oct 29 16:34:55 2015
New Revision: 290145
URL: https://svnweb.freebsd.org/changeset/base/290145

Log:
  MFC r288959:
  
  Remove a few unused headers.

Modified:
  stable/10/usr.sbin/iscsid/discovery.c
  stable/10/usr.sbin/iscsid/pdu.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/iscsid/discovery.c
==
--- stable/10/usr.sbin/iscsid/discovery.c   Thu Oct 29 15:20:47 2015
(r290144)
+++ stable/10/usr.sbin/iscsid/discovery.c   Thu Oct 29 16:34:55 2015
(r290145)
@@ -33,10 +33,7 @@ __FBSDID("$FreeBSD$");
 
 #include 
 #include 
-#include 
 #include 
-#include 
-#include 
 #include 
 #include 
 

Modified: stable/10/usr.sbin/iscsid/pdu.c
==
--- stable/10/usr.sbin/iscsid/pdu.c Thu Oct 29 15:20:47 2015
(r290144)
+++ stable/10/usr.sbin/iscsid/pdu.c Thu Oct 29 16:34:55 2015
(r290145)
@@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r290146 - stable/10/usr.sbin/watch

[Xin LI]

Author: delphij
Date: Thu Oct 29 16:45:06 2015
New Revision: 290146
URL: https://svnweb.freebsd.org/changeset/base/290146

Log:
  MFC r288960:
  
  Use strlcpy() when the string is expected to be nul-terminated.

Modified:
  stable/10/usr.sbin/watch/watch.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/watch/watch.c
==
--- stable/10/usr.sbin/watch/watch.cThu Oct 29 16:34:55 2015
(r290145)
+++ stable/10/usr.sbin/watch/watch.cThu Oct 29 16:45:06 2015
(r290146)
@@ -247,7 +247,7 @@ set_dev(const char *name)
if ((sb.st_mode & S_IFMT) != S_IFCHR)
fatal(EX_DATAERR, "must be a character device");
 
-   strncpy(dev_name, buf, DEV_NAME_LEN);
+   strlcpy(dev_name, buf, sizeof(dev_name));
 
attach_snp();
 }
@@ -340,7 +340,7 @@ main(int ac, char *av[])
else
fatal(EX_DATAERR, "no device name given");
} else
-   strncpy(dev_name, *av, DEV_NAME_LEN);
+   strlcpy(dev_name, *av, sizeof(dev_name));
 
set_dev(dev_name);
 
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r290033 - stable/10/usr.sbin/tzsetup

[Xin LI]

Author: delphij
Date: Tue Oct 27 01:28:11 2015
New Revision: 290033
URL: https://svnweb.freebsd.org/changeset/base/290033

Log:
  Revert the merge of r289269 for now as it may break non-root installs.

Modified:
  stable/10/usr.sbin/tzsetup/tzsetup.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/tzsetup/tzsetup.c
==
--- stable/10/usr.sbin/tzsetup/tzsetup.cTue Oct 27 01:28:07 2015
(r290032)
+++ stable/10/usr.sbin/tzsetup/tzsetup.cTue Oct 27 01:28:11 2015
(r290033)
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
@@ -936,18 +935,23 @@ main(int argc, char **argv)
if (argc - optind > 1)
usage();
 
-   if (chrootenv != NULL) {
-   rv = chroot(chrootenv);
-   if (rv != 0)
-   err(EX_OSERR, "chroot to %s", chrootenv);
+   if (chrootenv == NULL) {
+   strcpy(path_zonetab, _PATH_ZONETAB);
+   strcpy(path_iso3166, _PATH_ISO3166);
+   strcpy(path_zoneinfo, _PATH_ZONEINFO);
+   strcpy(path_localtime, _PATH_LOCALTIME);
+   strcpy(path_db, _PATH_DB);
+   strcpy(path_wall_cmos_clock, _PATH_WALL_CMOS_CLOCK);
+   } else {
+   sprintf(path_zonetab, "%s/%s", chrootenv, _PATH_ZONETAB);
+   sprintf(path_iso3166, "%s/%s", chrootenv, _PATH_ISO3166);
+   sprintf(path_zoneinfo, "%s/%s", chrootenv, _PATH_ZONEINFO);
+   sprintf(path_localtime, "%s/%s", chrootenv, _PATH_LOCALTIME);
+   sprintf(path_db, "%s/%s", chrootenv, _PATH_DB);
+   sprintf(path_wall_cmos_clock, "%s/%s", chrootenv,
+   _PATH_WALL_CMOS_CLOCK);
}
 
-   strcpy(path_zonetab, _PATH_ZONETAB);
-   strcpy(path_iso3166, _PATH_ISO3166);
-   strcpy(path_zoneinfo, _PATH_ZONEINFO);
-   strcpy(path_localtime, _PATH_LOCALTIME);
-   strcpy(path_db, _PATH_DB);
-   strcpy(path_wall_cmos_clock, _PATH_WALL_CMOS_CLOCK);
 
/* Override the user-supplied umask. */
(void)umask(S_IWGRP | S_IWOTH);
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r290027 - stable/10/usr.sbin/tzsetup

[Xin LI]

Author: delphij
Date: Tue Oct 27 00:37:19 2015
New Revision: 290027
URL: https://svnweb.freebsd.org/changeset/base/290027

Log:
  MFC r289269:
  
  Use chroot(2) instead of using prefixes for files.
  
  Previously, the code prefixes the chroot path to actual file paths to
  simulate the effect.  This, however, will not work for tzset(3) which
  expects the current system have a working set of timezone data files,
  and that is not always the case.
  
  This changeset simplifies the handling of paths and use an actual
  chroot(2) call to implement the effect.
  
  PR:   bin/197313

Modified:
  stable/10/usr.sbin/tzsetup/tzsetup.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/tzsetup/tzsetup.c
==
--- stable/10/usr.sbin/tzsetup/tzsetup.cMon Oct 26 23:28:35 2015
(r290026)
+++ stable/10/usr.sbin/tzsetup/tzsetup.cTue Oct 27 00:37:19 2015
(r290027)
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -935,23 +936,18 @@ main(int argc, char **argv)
if (argc - optind > 1)
usage();
 
-   if (chrootenv == NULL) {
-   strcpy(path_zonetab, _PATH_ZONETAB);
-   strcpy(path_iso3166, _PATH_ISO3166);
-   strcpy(path_zoneinfo, _PATH_ZONEINFO);
-   strcpy(path_localtime, _PATH_LOCALTIME);
-   strcpy(path_db, _PATH_DB);
-   strcpy(path_wall_cmos_clock, _PATH_WALL_CMOS_CLOCK);
-   } else {
-   sprintf(path_zonetab, "%s/%s", chrootenv, _PATH_ZONETAB);
-   sprintf(path_iso3166, "%s/%s", chrootenv, _PATH_ISO3166);
-   sprintf(path_zoneinfo, "%s/%s", chrootenv, _PATH_ZONEINFO);
-   sprintf(path_localtime, "%s/%s", chrootenv, _PATH_LOCALTIME);
-   sprintf(path_db, "%s/%s", chrootenv, _PATH_DB);
-   sprintf(path_wall_cmos_clock, "%s/%s", chrootenv,
-   _PATH_WALL_CMOS_CLOCK);
+   if (chrootenv != NULL) {
+   rv = chroot(chrootenv);
+   if (rv != 0)
+   err(EX_OSERR, "chroot to %s", chrootenv);
}
 
+   strcpy(path_zonetab, _PATH_ZONETAB);
+   strcpy(path_iso3166, _PATH_ISO3166);
+   strcpy(path_zoneinfo, _PATH_ZONEINFO);
+   strcpy(path_localtime, _PATH_LOCALTIME);
+   strcpy(path_db, _PATH_DB);
+   strcpy(path_wall_cmos_clock, _PATH_WALL_CMOS_CLOCK);
 
/* Override the user-supplied umask. */
(void)umask(S_IWGRP | S_IWOTH);
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r288511 - in stable: 10/usr.sbin/rpcbind 9/usr.sbin/rpcbind

[Xin LI]

Author: delphij
Date: Fri Oct  2 16:36:16 2015
New Revision: 288511
URL: https://svnweb.freebsd.org/changeset/base/288511

Log:
  Fix a regression with SA-15:24 patch that prevented NIS from
  working.

Modified:
  stable/10/usr.sbin/rpcbind/rpcb_svc_com.c

Changes in other areas also in this revision:
Modified:
  stable/9/usr.sbin/rpcbind/rpcb_svc_com.c

Modified: stable/10/usr.sbin/rpcbind/rpcb_svc_com.c
==
--- stable/10/usr.sbin/rpcbind/rpcb_svc_com.c   Fri Oct  2 16:35:41 2015
(r288510)
+++ stable/10/usr.sbin/rpcbind/rpcb_svc_com.c   Fri Oct  2 16:36:16 2015
(r288511)
@@ -1053,12 +1053,15 @@ static bool_t
 netbuf_copybuf(struct netbuf *dst, const struct netbuf *src)
 {
 
-   assert(dst->buf == NULL);
+   if (dst->len != src->len || dst->buf == NULL) {
+   if (dst->buf != NULL)
+   free(dst->buf);
+   if ((dst->buf = malloc(src->len)) == NULL)
+   return (FALSE);
 
-   if ((dst->buf = malloc(src->len)) == NULL)
-   return (FALSE);
+   dst->maxlen = dst->len = src->len;
+   }
 
-   dst->maxlen = dst->len = src->len;
memcpy(dst->buf, src->buf, src->len);
return (TRUE);
 }
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r288434 - stable/10/usr.sbin/bhyve

[Xin LI]

Author: delphij
Date: Thu Oct  1 00:44:45 2015
New Revision: 288434
URL: https://svnweb.freebsd.org/changeset/base/288434

Log:
  MFC r287927:
  
  Use strlcpy() instead of strncpy() because subsequent mkstemps expects
  the string be nul-terminated.
  
  Reviewed by:  neel

Modified:
  stable/10/usr.sbin/bhyve/acpi.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/bhyve/acpi.c
==
--- stable/10/usr.sbin/bhyve/acpi.c Thu Oct  1 00:34:38 2015
(r288433)
+++ stable/10/usr.sbin/bhyve/acpi.c Thu Oct  1 00:44:45 2015
(r288434)
@@ -790,10 +790,10 @@ basl_open(struct basl_fio *bf, int suffi
err = 0;
 
if (suffix) {
-   strncpy(bf->f_name, basl_stemplate, MAXPATHLEN);
+   strlcpy(bf->f_name, basl_stemplate, MAXPATHLEN);
bf->fd = mkstemps(bf->f_name, strlen(BHYVE_ASL_SUFFIX));
} else {
-   strncpy(bf->f_name, basl_template, MAXPATHLEN);
+   strlcpy(bf->f_name, basl_template, MAXPATHLEN);
bf->fd = mkstemp(bf->f_name);
}
 
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r288384 - in stable: 10/usr.sbin/rpcbind 9/usr.sbin/rpcbind

[Xin LI]

Author: delphij
Date: Tue Sep 29 18:06:27 2015
New Revision: 288384
URL: https://svnweb.freebsd.org/changeset/base/288384

Log:
  The Sun RPC framework uses a netbuf structure to represent the
  transport specific form of a universal transport address.  The
  structure is expected to be opaque to consumers.  In the current
  implementation, the structure contains a pointer to a buffer
  that holds the actual address.
  
  In rpcbind(8), netbuf structures are copied directly, which would
  result in two netbuf structures that reference to one shared
  address buffer.  When one of the two netbuf structures is freed,
  access to the other netbuf structure would result in an undefined
  result that may crash the rpcbind(8) daemon.
  
  Fix this by making a copy of the buffer that is going to be freed
  instead of doing a shallow copy.
  
  Security: FreeBSD-SA-15:24.rpcbind
  Security: CVE-2015-7236

Modified:
  stable/10/usr.sbin/rpcbind/rpcb_svc_com.c

Changes in other areas also in this revision:
Modified:
  stable/9/usr.sbin/rpcbind/rpcb_svc_com.c

Modified: stable/10/usr.sbin/rpcbind/rpcb_svc_com.c
==
--- stable/10/usr.sbin/rpcbind/rpcb_svc_com.c   Tue Sep 29 18:05:54 2015
(r288383)
+++ stable/10/usr.sbin/rpcbind/rpcb_svc_com.c   Tue Sep 29 18:06:27 2015
(r288384)
@@ -48,6 +48,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1048,19 +1049,31 @@ netbufcmp(struct netbuf *n1, struct netb
return ((n1->len != n2->len) || memcmp(n1->buf, n2->buf, n1->len));
 }
 
+static bool_t
+netbuf_copybuf(struct netbuf *dst, const struct netbuf *src)
+{
+
+   assert(dst->buf == NULL);
+
+   if ((dst->buf = malloc(src->len)) == NULL)
+   return (FALSE);
+
+   dst->maxlen = dst->len = src->len;
+   memcpy(dst->buf, src->buf, src->len);
+   return (TRUE);
+}
+
 static struct netbuf *
 netbufdup(struct netbuf *ap)
 {
struct netbuf  *np;
 
-   if ((np = malloc(sizeof(struct netbuf))) == NULL)
+   if ((np = calloc(1, sizeof(struct netbuf))) == NULL)
return (NULL);
-   if ((np->buf = malloc(ap->len)) == NULL) {
+   if (netbuf_copybuf(np, ap) == FALSE) {
free(np);
return (NULL);
}
-   np->maxlen = np->len = ap->len;
-   memcpy(np->buf, ap->buf, ap->len);
return (np);
 }
 
@@ -1068,6 +1081,7 @@ static void
 netbuffree(struct netbuf *ap)
 {
free(ap->buf);
+   ap->buf = NULL;
free(ap);
 }
 
@@ -1185,7 +1199,7 @@ xprt_set_caller(SVCXPRT *xprt, struct fi
 {
u_int32_t *xidp;
 
-   *(svc_getrpccaller(xprt)) = *(fi->caller_addr);
+   netbuf_copybuf(svc_getrpccaller(xprt), fi->caller_addr);
xidp = __rpcb_get_dg_xidp(xprt);
*xidp = fi->caller_xid;
 }
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r288346 - stable/10/cddl/contrib/opensolaris/cmd/zfs

[Xin LI]

Author: delphij
Date: Mon Sep 28 18:58:27 2015
New Revision: 288346
URL: https://svnweb.freebsd.org/changeset/base/288346

Log:
  MFC r287770: MFV r277429:
  
  Document -S option when zfs inherit fails on quota and
  in manual pages.
  
  Illumos ZFS issues:
  
  5410 Document -S option to zfs inherit
  https://illumos.org/issues/5410
  
  5412 Mention -S option when zfs inherit fails on quota
  https://illumos.org/issues/5412
  
  illumos/illumos-gate@5ff8cfa92ec8ea0f8593ad21aa2a04829b0ef5ea

Modified:
  stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==
--- stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs.8Mon Sep 28 18:39:21 
2015(r288345)
+++ stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs.8Mon Sep 28 18:58:27 
2015(r288346)
@@ -31,7 +31,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 30, 2015
+.Dd September 14, 2015
 .Dt ZFS 8
 .Os
 .Sh NAME
@@ -2126,7 +2126,8 @@ Property name
 .It value
 Property value
 .It source
-Property source. Can either be local, default, temporary, inherited, or none
+Property source. Can either be local, default, temporary, inherited, received,
+or none
 (\&-).
 .El
 .Pp
@@ -2192,8 +2193,11 @@ The default value is all sources.
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns ...
 .Xc
 .Pp
-Clears the specified property, causing it to be inherited from an ancestor. If
-no ancestor has the property set, then the default value is used. See the
+Clears the specified property, causing it to be inherited from an ancestor,
+restored to default if no ancestor has the property set, or with the
+.Fl S
+option reverted to the received value if one exists.
+See the
 .Qq Sx Properties
 section for a listing of default values, and details on which properties can be
 inherited.
@@ -2201,8 +2205,10 @@ inherited.
 .It Fl r
 Recursively inherit the given property for all children.
 .It Fl S
-For properties with a received value, revert to this value. This flag has no
-effect on properties that do not have a received value.
+Revert the property to the received value if one exists; otherwise operate as
+if the
+.Fl S
+option was not specified.
 .El
 .It Xo
 .Nm

Modified: stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==
--- stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c   Mon Sep 28 
18:39:21 2015(r288345)
+++ stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c   Mon Sep 28 
18:58:27 2015(r288346)
@@ -1927,9 +1927,13 @@ zfs_do_inherit(int argc, char **argv)
if (prop == ZFS_PROP_QUOTA ||
prop == ZFS_PROP_RESERVATION ||
prop == ZFS_PROP_REFQUOTA ||
-   prop == ZFS_PROP_REFRESERVATION)
+   prop == ZFS_PROP_REFRESERVATION) {
(void) fprintf(stderr, gettext("use 'zfs set "
"%s=none' to clear\n"), propname);
+   (void) fprintf(stderr, gettext("use 'zfs "
+   "inherit -S %s' to revert to received "
+   "value\n"), propname);
+   }
return (1);
}
if (received && (prop == ZFS_PROP_VOLSIZE ||
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"