svn commit: r212678 - stable/7/sys/dev/twa

[Xin LI]

Author: delphij
Date: Wed Sep 15 17:25:51 2010
New Revision: 212678
URL: http://svn.freebsd.org/changeset/base/212678

Log:
  MFC r212008,212028,212210 the updated twa(4) driver minus maxio change
  which depends on cam(4) revision r195534.
  
  The change have been tested on stable/7 with 3ware 9650SE at iXsystems.

Modified:
  stable/7/sys/dev/twa/tw_cl.h
  stable/7/sys/dev/twa/tw_cl_externs.h
  stable/7/sys/dev/twa/tw_cl_fwif.h
  stable/7/sys/dev/twa/tw_cl_init.c
  stable/7/sys/dev/twa/tw_cl_intr.c
  stable/7/sys/dev/twa/tw_cl_io.c
  stable/7/sys/dev/twa/tw_cl_misc.c
  stable/7/sys/dev/twa/tw_cl_share.h
  stable/7/sys/dev/twa/tw_osl.h
  stable/7/sys/dev/twa/tw_osl_cam.c
  stable/7/sys/dev/twa/tw_osl_freebsd.c
  stable/7/sys/dev/twa/tw_osl_share.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/twa/tw_cl.h
==
--- stable/7/sys/dev/twa/tw_cl.hWed Sep 15 17:25:09 2010
(r212677)
+++ stable/7/sys/dev/twa/tw_cl.hWed Sep 15 17:25:51 2010
(r212678)
@@ -88,7 +88,8 @@ struct tw_cli_q_stats {
 #define TW_CLI_BUSY_Q  1   /* q of reqs submitted to fw */
 #define TW_CLI_PENDING_Q   2   /* q of reqs deferred due to 'q full' */
 #define TW_CLI_COMPLETE_Q  3   /* q of reqs completed by fw */
-#define TW_CLI_Q_COUNT 4   /* total number of queues */
+#define TW_CLI_RESET_Q 4   /* q of reqs reset by timeout */
+#define TW_CLI_Q_COUNT 5   /* total number of queues */
 
 
 /* CL's internal request context. */
@@ -133,6 +134,7 @@ struct tw_cli_ctlr_context {
TW_UINT8interrupts_enabled;   /* Interrupts on 
controller enabled. */
TW_UINT8internal_req_busy;/* Data buffer for 
internal requests in use. */
TW_UINT8get_more_aens;/* More AEN's need to 
be retrieved. */
+   TW_UINT8reset_needed; /* Controller needs a 
soft reset. */
TW_UINT8reset_in_progress;/* Controller is 
being reset. */
TW_UINT8reset_phase1_in_progress; /* In 'phase 1' of 
reset. */
TW_UINT32   flags;  /* controller settings */

Modified: stable/7/sys/dev/twa/tw_cl_externs.h
==
--- stable/7/sys/dev/twa/tw_cl_externs.hWed Sep 15 17:25:09 2010
(r212677)
+++ stable/7/sys/dev/twa/tw_cl_externs.hWed Sep 15 17:25:51 2010
(r212678)
@@ -86,6 +86,8 @@ extern TW_INT32   tw_cli_submit_and_poll_r
 
 /* Soft reset the controller. */
 extern TW_INT32tw_cli_soft_reset(struct tw_cli_ctlr_context *ctlr);
+extern int twa_setup_intr(struct twa_softc *sc);
+extern int twa_teardown_intr(struct twa_softc *sc);
 
 /* Send down a SCSI command to the firmware (usually, an internal Req Sense. */
 extern TW_INT32tw_cli_send_scsi_cmd(struct tw_cli_req_context *req,

Modified: stable/7/sys/dev/twa/tw_cl_fwif.h
==
--- stable/7/sys/dev/twa/tw_cl_fwif.h   Wed Sep 15 17:25:09 2010
(r212677)
+++ stable/7/sys/dev/twa/tw_cl_fwif.h   Wed Sep 15 17:25:51 2010
(r212678)
@@ -89,7 +89,7 @@
 #define TWA_STATUS_MINOR_VERSION_MASK  0x0F00
 #define TWA_STATUS_MAJOR_VERSION_MASK  0xF000
 
-#define TWA_STATUS_UNEXPECTED_BITS 0x00F0
+#define TWA_STATUS_UNEXPECTED_BITS 0x00D0
 
 
 /* PCI related defines. */

Modified: stable/7/sys/dev/twa/tw_cl_init.c
==
--- stable/7/sys/dev/twa/tw_cl_init.c   Wed Sep 15 17:25:09 2010
(r212677)
+++ stable/7/sys/dev/twa/tw_cl_init.c   Wed Sep 15 17:25:51 2010
(r212678)
@@ -315,6 +315,7 @@ tw_cl_init_ctlr(struct tw_cl_ctlr_handle
tw_cli_req_q_init(ctlr, TW_CLI_BUSY_Q);
tw_cli_req_q_init(ctlr, TW_CLI_PENDING_Q);
tw_cli_req_q_init(ctlr, TW_CLI_COMPLETE_Q);
+   tw_cli_req_q_init(ctlr, TW_CLI_RESET_Q);
 
/* Initialize all locks used by CL. */
ctlr->gen_lock = &(ctlr->gen_lock_handle);
@@ -675,15 +676,14 @@ tw_cli_init_connection(struct tw_cli_ctl
/* Submit the command, and wait for it to complete. */
error = tw_cli_submit_and_poll_request(req,
TW_CLI_REQUEST_TIMEOUT_PERIOD);
-   if (error == TW_OSL_ETIMEDOUT)
-   /* Clean-up done by tw_cli_submit_and_poll_request. */
-   return(error);
if (error)
goto out;
if ((error = init_connect->status)) {
+#if   0
tw_cli_create_ctlr_event(ctlr,
 

svn commit: r212764 - head/sys/dev/alc

[Xin LI]

Author: delphij
Date: Thu Sep 16 21:06:23 2010
New Revision: 212764
URL: http://svn.freebsd.org/changeset/base/212764

Log:
  status bits should be &'ed against status to be really functional.
  
  Reported by:  Jike Song
  Reviewed by:  yongari
  MFC after:1 week

Modified:
  head/sys/dev/alc/if_alc.c

Modified: head/sys/dev/alc/if_alc.c
==
--- head/sys/dev/alc/if_alc.c   Thu Sep 16 20:23:22 2010(r212763)
+++ head/sys/dev/alc/if_alc.c   Thu Sep 16 21:06:23 2010(r212764)
@@ -2948,8 +2948,8 @@ alc_rxeof(struct alc_softc *sc, struct r
 *  errored frames.
 */
status |= RRD_TCP_UDPCSUM_NOK | RRD_IPCSUM_NOK;
-   if ((RRD_ERR_CRC | RRD_ERR_ALIGN | RRD_ERR_TRUNC |
-   RRD_ERR_RUNT) != 0)
+   if ((status & (RRD_ERR_CRC | RRD_ERR_ALIGN |
+   RRD_ERR_TRUNC | RRD_ERR_RUNT)) != 0)
return;
}
 
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r212807 - stable/8/usr.bin/gzip

[Xin LI]

Author: delphij
Date: Sat Sep 18 00:44:55 2010
New Revision: 212807
URL: http://svn.freebsd.org/changeset/base/212807

Log:
  MFC r211475:
  
  Check return value of dup(), it could be -1 when the system is running
  out of file descriptors for instance.
  
  Found with:   Coverity Prevent(tm)
  CID:  6084

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

Modified: stable/8/usr.bin/gzip/unpack.c
==
--- stable/8/usr.bin/gzip/unpack.c  Fri Sep 17 23:09:31 2010
(r212806)
+++ stable/8/usr.bin/gzip/unpack.c  Sat Sep 18 00:44:55 2010
(r212807)
@@ -312,7 +312,14 @@ unpack(int in, int out, char *pre, size_
 {
unpack_descriptor_t unpackd;
 
-   unpack_parse_header(dup(in), dup(out), pre, prelen, bytes_in, &unpackd);
+   in = dup(in);
+   if (in == -1)
+   maybe_err("dup");
+   out = dup(out);
+   if (out == -1)
+   maybe_err("dup");
+
+   unpack_parse_header(in, out, pre, prelen, bytes_in, &unpackd);
unpack_decode(&unpackd, bytes_in);
unpack_descriptor_fini(&unpackd);
 
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r212808 - stable/7/usr.bin/gzip

[Xin LI]

Author: delphij
Date: Sat Sep 18 00:46:05 2010
New Revision: 212808
URL: http://svn.freebsd.org/changeset/base/212808

Log:
  MFC r211475:
  
  Check return value of dup(), it could be -1 when the system is running
  out of file descriptors for instance.
  
  Found with:   Coverity Prevent(tm)
  CID:  6084

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

Modified: stable/7/usr.bin/gzip/unpack.c
==
--- stable/7/usr.bin/gzip/unpack.c  Sat Sep 18 00:44:55 2010
(r212807)
+++ stable/7/usr.bin/gzip/unpack.c  Sat Sep 18 00:46:05 2010
(r212808)
@@ -312,7 +312,14 @@ unpack(int in, int out, char *pre, size_
 {
unpack_descriptor_t unpackd;
 
-   unpack_parse_header(dup(in), dup(out), pre, prelen, bytes_in, &unpackd);
+   in = dup(in);
+   if (in == -1)
+   maybe_err("dup");
+   out = dup(out);
+   if (out == -1)
+   maybe_err("dup");
+
+   unpack_parse_header(in, out, pre, prelen, bytes_in, &unpackd);
unpack_decode(&unpackd, bytes_in);
unpack_descriptor_fini(&unpackd);
 
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r212517 - head/lib/libz

[Xin LI]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

On 2010/09/12 18:44, Warner Losh wrote:
> Author: imp
> Date: Mon Sep 13 01:44:07 2010
> New Revision: 212517
> URL: http://svn.freebsd.org/changeset/base/212517
> 
> Log:
>   Include FreeBSD svn tag

The file was completely the same with libz vendor version now (except
your addition of $FreeBSD$ tag).  Plus:

[delp...@delta] /usr/src/lib/libz> svn pl minigzip.c
Properties on 'minigzip.c':
  fbsd:nokeywords

Or, do we require $FreeBSD$ tags for every files?

> Modified:
>   head/lib/libz/minigzip.c
> 

Cheers,
- -- 
Xin LI http://www.delphij.net/
FreeBSD - The Power to Serve!  Live free or die
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.16 (FreeBSD)

iQEcBAEBCAAGBQJMleshAAoJEATO+BI/yjfB9U4IAIodWHl2YHawJfru3Tpd4GQW
MVuHGjPGyV8rkB/ABntFZ4u+nDxwn9gah2f4CXfKnQx5+49QMaie4ubQEbAzFvZF
a/hanbix4keiJIsHXBfm+r3NStMUtw9rgDjs+j73j0qNjkya62FlvbMF6Q7FeWsw
Z5LTrH7bNBhfLqAkbVcyvqHqajsjAh025UQ/2Z9in38f3P+8FTSWBXWeunHNfsAr
q+F8lEftrFH9+PIweBV18D0RReSTE9XKq448lJeeKQN9n26Zjgari7j+FEsWlzQj
WyZK/YOQNMOUCQQB/FWmBHOlHh0qaOSitWyYvMzIilfNR3ercQpT8oIZOLc91j8=
=EZjg
-END PGP SIGNATURE-
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r212927 - head/usr.bin/grep/nls

[Xin LI]

Author: delphij
Date: Mon Sep 20 19:42:52 2010
New Revision: 212927
URL: http://svn.freebsd.org/changeset/base/212927

Log:
  Add Simplified Chinese messages for BSD grep.

Added:
  head/usr.bin/grep/nls/zh_CN.UTF-8.msg   (contents, props changed)
Modified:
  head/usr.bin/grep/nls/Makefile.inc

Modified: head/usr.bin/grep/nls/Makefile.inc
==
--- head/usr.bin/grep/nls/Makefile.inc  Mon Sep 20 19:42:14 2010
(r212926)
+++ head/usr.bin/grep/nls/Makefile.inc  Mon Sep 20 19:42:52 2010
(r212927)
@@ -10,6 +10,7 @@ NLS+= ja_JP.UTF-8
 NLS+=  pt_BR.ISO8859-1
 NLS+=  ru_RU.KOI8-R
 NLS+=  uk_UA.UTF-8
+NLS+=  zh_CN.UTF-8
 
 NLSSRCDIR= ${.CURDIR}/nls
 .for lang in ${NLS}

Added: head/usr.bin/grep/nls/zh_CN.UTF-8.msg
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/usr.bin/grep/nls/zh_CN.UTF-8.msg   Mon Sep 20 19:42:52 2010
(r212927)
@@ -0,0 +1,13 @@
+$ $FreeBSD$
+$
+$set 1
+$quote "
+1 "(标准输入)"
+2 "读取 bzip2 压缩文件时出错"
+3 "选项 %s 无法识别"
+4 "用法： %s [-abcDEFGHhIiJLlmnOoPqRSsUVvwxZ] [-A 行数] [-B 行数] [-C[行数]]\n"
+5 "\t[-e 模式] [-f 文件] [--binary-files=值] [--color=何时]\n"
+6 "\t[--context[=行数]] [--directories=动作] [--label] [--line-buffered]\n"
+7 "\t[--null] [模式] [文件名 ...]\n"
+8 "二进制文件 %s 包含模式\n"
+9 "%s (BSD grep) %s\n"
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213044 - head/usr.bin/gzip

[Xin LI]

Author: delphij
Date: Thu Sep 23 01:24:33 2010
New Revision: 213044
URL: http://svn.freebsd.org/changeset/base/213044

Log:
  In the past gunzip(1) write()'s after each inflate return.  This is
  not optimal from a performance standpoint since the write buffer is
  not necessarily be filled up when the inflate rountine reached the
  end of input buffer and it's not the end of file.
  
  This problem gets uncovered by trying to pipe gunzip -c output to
  a GEOM device directly, which enforces the writes be multiple of
  sector size.
  
  Sponsored by: iXsystems, Inc.
  Reported by:  jpaetzel
  MFC after:2 weeks

Modified:
  head/usr.bin/gzip/gzip.c

Modified: head/usr.bin/gzip/gzip.c
==
--- head/usr.bin/gzip/gzip.cThu Sep 23 01:19:31 2010(r213043)
+++ head/usr.bin/gzip/gzip.cThu Sep 23 01:24:33 2010(r213044)
@@ -916,6 +916,8 @@ gz_uncompress(int in, int out, char *pre
switch (error) {
/* Z_BUF_ERROR goes with Z_FINISH... */
case Z_BUF_ERROR:
+   if (z.avail_out > 0 && !done_reading)
+   continue;
case Z_STREAM_END:
case Z_OK:
break;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213045 - stable/8/sys/dev/alc

[Xin LI]

Author: delphij
Date: Thu Sep 23 01:30:50 2010
New Revision: 213045
URL: http://svn.freebsd.org/changeset/base/213045

Log:
  MFC r212764:
  
  status bits should be &'ed against status to be really functional.
  
  Reported by:  Jike Song
  Reviewed by:  yongari

Modified:
  stable/8/sys/dev/alc/if_alc.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/alc/if_alc.c
==
--- stable/8/sys/dev/alc/if_alc.c   Thu Sep 23 01:24:33 2010
(r213044)
+++ stable/8/sys/dev/alc/if_alc.c   Thu Sep 23 01:30:50 2010
(r213045)
@@ -2948,8 +2948,8 @@ alc_rxeof(struct alc_softc *sc, struct r
 *  errored frames.
 */
status |= RRD_TCP_UDPCSUM_NOK | RRD_IPCSUM_NOK;
-   if ((RRD_ERR_CRC | RRD_ERR_ALIGN | RRD_ERR_TRUNC |
-   RRD_ERR_RUNT) != 0)
+   if ((status & (RRD_ERR_CRC | RRD_ERR_ALIGN |
+   RRD_ERR_TRUNC | RRD_ERR_RUNT)) != 0)
return;
}
 
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213046 - stable/7/sys/dev/alc

[Xin LI]

Author: delphij
Date: Thu Sep 23 01:38:52 2010
New Revision: 213046
URL: http://svn.freebsd.org/changeset/base/213046

Log:
  MFC r212764:
  
  status bits should be &'ed against status to be really functional.
  
  Reported by:  Jike Song
  Reviewed by:  yongari

Modified:
  stable/7/sys/dev/alc/if_alc.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/alc/if_alc.c
==
--- stable/7/sys/dev/alc/if_alc.c   Thu Sep 23 01:30:50 2010
(r213045)
+++ stable/7/sys/dev/alc/if_alc.c   Thu Sep 23 01:38:52 2010
(r213046)
@@ -2948,8 +2948,8 @@ alc_rxeof(struct alc_softc *sc, struct r
 *  errored frames.
 */
status |= RRD_TCP_UDPCSUM_NOK | RRD_IPCSUM_NOK;
-   if ((RRD_ERR_CRC | RRD_ERR_ALIGN | RRD_ERR_TRUNC |
-   RRD_ERR_RUNT) != 0)
+   if ((status & (RRD_ERR_CRC | RRD_ERR_ALIGN |
+   RRD_ERR_TRUNC | RRD_ERR_RUNT)) != 0)
return;
}
 
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213106 - stable/8/sys/fs/tmpfs

[Xin LI]

Author: delphij
Date: Fri Sep 24 17:26:57 2010
New Revision: 213106
URL: http://svn.freebsd.org/changeset/base/213106

Log:
  MFC r197850:
  
  Add a special workaround to handle UIO_NOCOPY case.  This fixes data
  corruption observed when sendfile() is being used.
  
  Requested by: avg
  PR:   kern/127213
  Submitted by: gk

Modified:
  stable/8/sys/fs/tmpfs/tmpfs_vnops.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/fs/tmpfs/tmpfs_vnops.c
==
--- stable/8/sys/fs/tmpfs/tmpfs_vnops.c Fri Sep 24 16:40:46 2010
(r213105)
+++ stable/8/sys/fs/tmpfs/tmpfs_vnops.c Fri Sep 24 17:26:57 2010
(r213106)
@@ -43,6 +43,8 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -433,15 +435,72 @@ tmpfs_setattr(struct vop_setattr_args *v
 }
 
 /* - */
+static int
+tmpfs_nocacheread(vm_object_t tobj, vm_pindex_t idx,
+vm_offset_t offset, size_t tlen, struct uio *uio)
+{
+   vm_page_t   m;
+   int error;
+
+   VM_OBJECT_LOCK(tobj);
+   vm_object_pip_add(tobj, 1);
+   m = vm_page_grab(tobj, idx, VM_ALLOC_WIRED |
+   VM_ALLOC_ZERO | VM_ALLOC_NORMAL | VM_ALLOC_RETRY);
+   if (m->valid != VM_PAGE_BITS_ALL) {
+   if (vm_pager_has_page(tobj, idx, NULL, NULL)) {
+   error = vm_pager_get_pages(tobj, &m, 1, 0);
+   if (error != 0) {
+   printf("tmpfs get pages from pager error 
[read]\n");
+   goto out;
+   }
+   } else
+   vm_page_zero_invalid(m, TRUE);
+   }
+   VM_OBJECT_UNLOCK(tobj);
+   error = uiomove_fromphys(&m, offset, tlen, uio);
+   VM_OBJECT_LOCK(tobj);
+out:
+   vm_page_lock_queues();
+   vm_page_unwire(m, TRUE);
+   vm_page_unlock_queues();
+   vm_page_wakeup(m);
+   vm_object_pip_subtract(tobj, 1);
+   VM_OBJECT_UNLOCK(tobj);
+
+   return (error);
+}
+
+static __inline int
+tmpfs_nocacheread_buf(vm_object_t tobj, vm_pindex_t idx,
+vm_offset_t offset, size_t tlen, void *buf)
+{
+   struct uio uio;
+   struct iovec iov;
+
+   uio.uio_iovcnt = 1;
+   uio.uio_iov = &iov;
+   iov.iov_base = buf;
+   iov.iov_len = tlen;
+
+   uio.uio_offset = 0;
+   uio.uio_resid = tlen;
+   uio.uio_rw = UIO_READ;
+   uio.uio_segflg = UIO_SYSSPACE;
+   uio.uio_td = curthread;
+
+   return (tmpfs_nocacheread(tobj, idx, offset, tlen, &uio));
+}
 
 static int
 tmpfs_mappedread(vm_object_t vobj, vm_object_t tobj, size_t len, struct uio 
*uio)
 {
+   struct sf_buf   *sf;
vm_pindex_t idx;
vm_page_t   m;
vm_offset_t offset;
off_t   addr;
size_t  tlen;
+   char*ma;
int error;
 
addr = uio->uio_offset;
@@ -465,33 +524,30 @@ lookupvpg:
vm_page_wakeup(m);
VM_OBJECT_UNLOCK(vobj);
return  (error);
+   } else if (m != NULL && uio->uio_segflg == UIO_NOCOPY) {
+   if (vm_page_sleep_if_busy(m, FALSE, "tmfsmr"))
+   goto lookupvpg;
+   vm_page_busy(m);
+   VM_OBJECT_UNLOCK(vobj);
+   sched_pin();
+   sf = sf_buf_alloc(m, SFB_CPUPRIVATE);
+   ma = (char *)sf_buf_kva(sf);
+   error = tmpfs_nocacheread_buf(tobj, idx, offset, tlen,
+   ma + offset);
+   if (error == 0) {
+   uio->uio_offset += tlen;
+   uio->uio_resid -= tlen;
+   }
+   sf_buf_free(sf);
+   sched_unpin();
+   VM_OBJECT_LOCK(vobj);
+   vm_page_wakeup(m);
+   VM_OBJECT_UNLOCK(vobj);
+   return  (error);
}
VM_OBJECT_UNLOCK(vobj);
 nocache:
-   VM_OBJECT_LOCK(tobj);
-   vm_object_pip_add(tobj, 1);
-   m = vm_page_grab(tobj, idx, VM_ALLOC_WIRED |
-   VM_ALLOC_ZERO | VM_ALLOC_NORMAL | VM_ALLOC_RETRY);
-   if (m->valid != VM_PAGE_BITS_ALL) {
-   if (vm_pager_has_page(tobj, idx, NULL, NULL)) {
-   error = vm_pager_get_pages(tobj, &m, 1, 0);
-   if (error != 0) {
-   printf("tmpfs get pages from pager error 
[read]\n");
-   goto out;
-   }
-   } else
-   vm_page_zero_invalid(m, TRU

Re: svn commit: r212964 - head/sys/kern

[Xin LI]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

On 2010/09/23 19:31, M. Warner Losh wrote:
> In message: 
> Gavin Atkinson  writes:
> : On Thu, 23 Sep 2010, Ken Smith wrote:
> : > The issues talked about so far all contribute to the reason for that.
> : > But one of the more basic gut reactions to it all is that the users
> : > want to be interested in helping with the debugging (even if just
> : > providing the requested info) for any sort of crash information
> : > to be useful.  And at the point we shift something from -current
> : > to -stable the percentage of people actively interested in participating
> : > in that sort of stuff flip.  The bulk of people using -current
> : > know it's risky and they do it out of some interest in debugging
> : > stuff.  The *bulk* of people using -stable are less interested or
> : > flat out not interested.  And have no clue what crash dumps are,
> : > may be challenged to notice partition-getting-full issues, etc.
> : 
> : I'm not sure I buy this argument, I'm afraid.  Part of the advantage of 
> : having all this done automatically on the as-shipped release media is that 
> : end users don't have to be interested in debugging - crashinfo(8) does 
> : most of the work for them.  There's no easy way to actually determine 
> : figures, but even if say only 10-15% of crashes can be diagnosed and 
> : corrected just from the output of crashinfo(8) then that's a huge win for 
> : the project as a whole. I'm guessing 10-15% is not unrealistic.
> : 
> : I appreciate the issue about filling partitions is a valid one.  Would a 
> : possible compromise be that on release media, crashinfo(8) or similar will 
> : default to only keeping the most recent coredump or similar?  Given /var 
> : now defaults to 4GB, Defaulting to keeping a single core is probably 
> : acceptable.
> 
> Furthermore, if we aren't interested in crash dumps by default, why do
> we install the huge .symbols files?

+1.  Even textdump would be a huge help for the project (except it
depends on KDB/DDB which should be considered more thoroughly due to
security consequences).

Cheers,
- -- 
Xin LI http://www.delphij.net/
FreeBSD - The Power to Serve!  Live free or die
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.16 (FreeBSD)

iQEcBAEBCAAGBQJMnQ+cAAoJEATO+BI/yjfBv+gH/27HC9fRFNlYh28YypZFjK/K
FWKed15ZK+kR8pAvpONibBY/yWAWzsYyCxADn0q2aGAYItukQkonZnTWAQTbcbaG
d4begzGOrr9xWRYbIar8VvLM7mlUu99FNVkscFMsNvkD6mMP7N6MB9SNnqg/yRSo
jbSUceIkASnZni0poHoAKCpBJsPu2Yt/XnBXhbtR6tzHiWZKqKMCm5yfDHvH0+Cw
kNcR6jInnGJk8f2qk2a6h2Qtu6/R9vwkmidtBCX7CLba07yRHP/cgjiAN79AgnKx
7AHw5ZCItGJMjyGukuc1eSBPJluzmTRXwhzZt+zbTB5He3gWe78jRkylDoj0qMw=
=TtpC
-END PGP SIGNATURE-
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213144 - stable/8/lib/libutil

[Xin LI]

Author: delphij
Date: Fri Sep 24 23:47:42 2010
New Revision: 213144
URL: http://svn.freebsd.org/changeset/base/213144

Log:
  MFC r211393 (des):
  
  In setusercontext(), do not apply user settings unless running as the
  user in question (usually but not necessarily because we were called
  with LOGIN_SETUSER).  This plugs a hole where users could raise their
  resource limits and expand their CPU mask.
  
  Approved by:  des

Modified:
  stable/8/lib/libutil/login_class.c
Directory Properties:
  stable/8/lib/libutil/   (props changed)

Modified: stable/8/lib/libutil/login_class.c
==
--- stable/8/lib/libutil/login_class.c  Fri Sep 24 21:55:44 2010
(r213143)
+++ stable/8/lib/libutil/login_class.c  Fri Sep 24 23:47:42 2010
(r213144)
@@ -525,7 +525,7 @@ setusercontext(login_cap_t *lc, const st
 /*
  * Now, we repeat some of the above for the user's private entries
  */
-if ((lc = login_getuserclass(pwd)) != NULL) {
+if (getuid() == uid && (lc = login_getuserclass(pwd)) != NULL) {
mymask = setlogincontext(lc, pwd, mymask, flags);
login_close(lc);
 }
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213145 - stable/7/lib/libutil

[Xin LI]

Author: delphij
Date: Fri Sep 24 23:48:29 2010
New Revision: 213145
URL: http://svn.freebsd.org/changeset/base/213145

Log:
  MFC r211393 (by des):
  
  In setusercontext(), do not apply user settings unless running as the
  user in question (usually but not necessarily because we were called
  with LOGIN_SETUSER).  This plugs a hole where users could raise their
  resource limits and expand their CPU mask.
  
  Approved by:  des

Modified:
  stable/7/lib/libutil/login_class.c
Directory Properties:
  stable/7/lib/libutil/   (props changed)

Modified: stable/7/lib/libutil/login_class.c
==
--- stable/7/lib/libutil/login_class.c  Fri Sep 24 23:47:42 2010
(r213144)
+++ stable/7/lib/libutil/login_class.c  Fri Sep 24 23:48:29 2010
(r213145)
@@ -523,7 +523,7 @@ setusercontext(login_cap_t *lc, const st
 /*
  * Now, we repeat some of the above for the user's private entries
  */
-if ((lc = login_getuserclass(pwd)) != NULL) {
+if (getuid() == uid && (lc = login_getuserclass(pwd)) != NULL) {
mymask = setlogincontext(lc, pwd, mymask, flags);
login_close(lc);
 }
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213146 - stable/6/lib/libutil

[Xin LI]

Author: delphij
Date: Fri Sep 24 23:51:45 2010
New Revision: 213146
URL: http://svn.freebsd.org/changeset/base/213146

Log:
  MFC r211393 (by des):
  
  In setusercontext(), do not apply user settings unless running as the
  user in question (usually but not necessarily because we were called
  with LOGIN_SETUSER).  This plugs a hole where users could raise their
  resource limits and expand their CPU mask.
  
  Approved by:  des

Modified:
  stable/6/lib/libutil/login_class.c
Directory Properties:
  stable/6/lib/libutil/   (props changed)

Modified: stable/6/lib/libutil/login_class.c
==
--- stable/6/lib/libutil/login_class.c  Fri Sep 24 23:48:29 2010
(r213145)
+++ stable/6/lib/libutil/login_class.c  Fri Sep 24 23:51:45 2010
(r213146)
@@ -415,7 +415,7 @@ setusercontext(login_cap_t *lc, const st
 /*
  * Now, we repeat some of the above for the user's private entries
  */
-if ((lc = login_getuserclass(pwd)) != NULL) {
+if (getuid() == uid && (lc = login_getuserclass(pwd)) != NULL) {
mymask = setlogincontext(lc, pwd, mymask, flags);
login_close(lc);
 }
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213225 - in head/sys: netinet netinet6

[Xin LI]

Author: delphij
Date: Mon Sep 27 19:26:56 2010
New Revision: 213225
URL: http://svn.freebsd.org/changeset/base/213225

Log:
  Add a bandaid for a long-standing race condition during route entry
  un-expiring.
  
  The previous version of code have no locking when testing rt_refcnt.
  The result of the lack of locking may result in a condition where
  a routing entry have a reference count but at the same time have
  RTPRF_OURS bit set and an expiration timer.  These would eventually
  lead to a panic:
  
panic: rtqkill route really not free
  
  When the system have ICMP redirects accepted from local gateway
  in a moderate frequency, for instance.
  
  Commit this workaround for now until we have some better solution.
  
  PR:   kern/149804
  Reviewed by:  bz
  Tested by:Zhao Xin, Pete French
  MFC after:2 weeks

Modified:
  head/sys/netinet/in_rmx.c
  head/sys/netinet6/in6_rmx.c

Modified: head/sys/netinet/in_rmx.c
==
--- head/sys/netinet/in_rmx.c   Mon Sep 27 19:03:18 2010(r213224)
+++ head/sys/netinet/in_rmx.c   Mon Sep 27 19:26:56 2010(r213225)
@@ -121,12 +121,13 @@ in_matroute(void *v_arg, struct radix_no
struct radix_node *rn = rn_match(v_arg, head);
struct rtentry *rt = (struct rtentry *)rn;
 
-   /*XXX locking? */
-   if (rt && rt->rt_refcnt == 0) { /* this is first reference */
+   if (rt) {
+   RT_LOCK(rt);
if (rt->rt_flags & RTPRF_OURS) {
rt->rt_flags &= ~RTPRF_OURS;
rt->rt_rmx.rmx_expire = 0;
}
+   RT_UNLOCK(rt);
}
return rn;
 }

Modified: head/sys/netinet6/in6_rmx.c
==
--- head/sys/netinet6/in6_rmx.c Mon Sep 27 19:03:18 2010(r213224)
+++ head/sys/netinet6/in6_rmx.c Mon Sep 27 19:26:56 2010(r213225)
@@ -193,11 +193,13 @@ in6_matroute(void *v_arg, struct radix_n
struct radix_node *rn = rn_match(v_arg, head);
struct rtentry *rt = (struct rtentry *)rn;
 
-   if (rt && rt->rt_refcnt == 0) { /* this is first reference */
+   if (rt) {
+   RT_LOCK(rt);
if (rt->rt_flags & RTPRF_OURS) {
rt->rt_flags &= ~RTPRF_OURS;
rt->rt_rmx.rmx_expire = 0;
}
+   RT_UNLOCK(rt);
}
return rn;
 }
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r213326 - head/lib/libc/i386/string

[Xin LI]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

On 2010/10/01 06:22, Roman Divacky wrote:
> On Fri, Oct 01, 2010 at 01:10:11PM +, Jilles Tjoelker wrote:
>> Author: jilles
>> Date: Fri Oct  1 13:10:11 2010
>> New Revision: 213326
>> URL: http://svn.freebsd.org/changeset/base/213326
>>
>> Log:
>>   libc: Remove the i386 assembler version of strlen(3).
>>   
>>   On anything modern, the C version, which processes a word at a time, is 
>> much
>>   faster. The Intel optimization manual explicitly warns against using REP
>>   prefixes with SCAS or CMPS, which is exactly what the assembler version
>>   does.
> 
> there's "rep cmps" in bcmp.S and memcmp.S in both amd64/i386
> 
> they both have C counterparts, no idea how fast those are (they
> are going char by char).

char by char will be slower than word-by-word in both aligned and
unaligned case.  There are some other factors like inline expanding,
etc. which also affects their speed and require careful tuning.

> does this wisdom apply to those too?

I'm not quite sure about bcmp() and memcmp() case, especially when the
two pointers are not aligned (say, (p1 & (sizeof(word)-1)) != (p2 &
(sizeof(word)-1))).  Branching for different aligning cases MAY give
better performance, BUT they can also hurt due to the added complexity,
so if we want to do it in a MI way we will need to benchmark.

===

By the way I have a memchr(3) implementation using the similar algorithm
strlen(3) uses, and microbenchmark shows a 2x to 3x improvement but it's
still in my queue and needs to do real-world testing.

Cheers,
- -- 
Xin LI http://www.delphij.net/
FreeBSD - The Power to Serve!  Live free or die
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.16 (FreeBSD)

iQEcBAEBCAAGBQJMplbNAAoJEATO+BI/yjfBgWwH/2MSNvH0QNhEcyhKBU/Pzh8C
862myDjcxA4l1+ca2en9igPgWno+ZMUaiH4Td5qCBdX8tsFLlGCgC0o0a0HC51+7
mv8qTfWrYAFcU2NrmX8wsnprLijmS2NH3wBC0uJJXpJhmJUraTHbG9YcctIUe363
Yvy+d7HqraPvCShWEgj54V5q/vPPy5vT6gPFwhMpe0J9/gmSMwwxCF1RctE2K/Br
89TWb/g4vrFJCk3Ks3j8viJJN2Zd9sbBYeF/LBnMLPkVSJNCnw0j1gSs+uFbfgzw
Gv5WMNNpDu338dFMVJDddgxqWa+OW1oMgtHcLUmoxMQI87sir+NJQFBD6+EK22I=
=2+Hh
-END PGP SIGNATURE-
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213398 - head/bin/rm

[Xin LI]

Author: delphij
Date: Mon Oct  4 06:17:45 2010
New Revision: 213398
URL: http://svn.freebsd.org/changeset/base/213398

Log:
  Clarify the combination effect of -P and -f to make it clear.
  
  Submitted by: arundel
  MFC after:2 weeks

Modified:
  head/bin/rm/rm.1

Modified: head/bin/rm/rm.1
==
--- head/bin/rm/rm.1Mon Oct  4 05:56:29 2010(r213397)
+++ head/bin/rm/rm.1Mon Oct  4 06:17:45 2010(r213398)
@@ -32,7 +32,7 @@
 .\"@(#)rm.18.5 (Berkeley) 12/5/94
 .\" $FreeBSD$
 .\"
-.Dd December 26, 2006
+.Dd October 3, 2010
 .Dt RM 1
 .Os
 .Sh NAME
@@ -88,9 +88,13 @@ yet provides almost the same level of pr
 Overwrite regular files before deleting them.
 Files are overwritten three times, first with the byte pattern 0xff,
 then 0x00, and then 0xff again, before they are deleted.
-Files with multiple links will not be overwritten nor deleted unless
+Files with multiple links will not be overwritten nor deleted
+and a warning will be issued.
+If the
 .Fl f
-is specified, a warning is generated instead.
+option is specified, files with multiple links will also be overwritten
+and deleted.
+No warning will be issued.
 .Pp
 Specifying this flag for a read only file will cause
 .Nm
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213399 - stable/8/usr.bin

[Xin LI]

Author: delphij
Date: Mon Oct  4 06:49:12 2010
New Revision: 213399
URL: http://svn.freebsd.org/changeset/base/213399

Log:
  Revision 209601 should have merged this part of r203711 to make fmt(1)
  build unconditional.
  
  PR:   misc/151180

Modified:
  stable/8/usr.bin/Makefile
Directory Properties:
  stable/8/usr.bin/   (props changed)
  stable/8/usr.bin/apply/   (props changed)
  stable/8/usr.bin/ar/   (props changed)
  stable/8/usr.bin/awk/   (props changed)
  stable/8/usr.bin/biff/   (props changed)
  stable/8/usr.bin/c89/   (props changed)
  stable/8/usr.bin/c99/   (props changed)
  stable/8/usr.bin/catman/   (props changed)
  stable/8/usr.bin/column/   (props changed)
  stable/8/usr.bin/comm/   (props changed)
  stable/8/usr.bin/cpio/   (props changed)
  stable/8/usr.bin/csup/   (props changed)
  stable/8/usr.bin/du/   (props changed)
  stable/8/usr.bin/ee/   (props changed)
  stable/8/usr.bin/enigma/   (props changed)
  stable/8/usr.bin/fetch/   (props changed)
  stable/8/usr.bin/find/   (props changed)
  stable/8/usr.bin/finger/   (props changed)
  stable/8/usr.bin/fstat/   (props changed)
  stable/8/usr.bin/gcore/   (props changed)
  stable/8/usr.bin/getopt/   (props changed)
  stable/8/usr.bin/hexdump/   (props changed)
  stable/8/usr.bin/indent/   (props changed)
  stable/8/usr.bin/jot/   (props changed)
  stable/8/usr.bin/kdump/   (props changed)
  stable/8/usr.bin/killall/   (props changed)
  stable/8/usr.bin/ktrace/   (props changed)
  stable/8/usr.bin/locale/   (props changed)
  stable/8/usr.bin/lockf/   (props changed)
  stable/8/usr.bin/look/   (props changed)
  stable/8/usr.bin/mail/   (props changed)
  stable/8/usr.bin/make/   (props changed)
  stable/8/usr.bin/makewhatis/   (props changed)
  stable/8/usr.bin/minigzip/   (props changed)
  stable/8/usr.bin/netstat/   (props changed)
  stable/8/usr.bin/pathchk/   (props changed)
  stable/8/usr.bin/perror/   (props changed)
  stable/8/usr.bin/procstat/   (props changed)
  stable/8/usr.bin/rpcgen/   (props changed)
  stable/8/usr.bin/script/   (props changed)
  stable/8/usr.bin/sed/   (props changed)
  stable/8/usr.bin/sockstat/   (props changed)
  stable/8/usr.bin/split/   (props changed)
  stable/8/usr.bin/stat/   (props changed)
  stable/8/usr.bin/systat/   (props changed)
  stable/8/usr.bin/tar/   (props changed)
  stable/8/usr.bin/tftp/   (props changed)
  stable/8/usr.bin/touch/   (props changed)
  stable/8/usr.bin/truss/   (props changed)
  stable/8/usr.bin/uname/   (props changed)
  stable/8/usr.bin/unifdef/   (props changed)
  stable/8/usr.bin/uniq/   (props changed)
  stable/8/usr.bin/vmstat/   (props changed)
  stable/8/usr.bin/w/   (props changed)
  stable/8/usr.bin/whois/   (props changed)
  stable/8/usr.bin/xinstall/   (props changed)
  stable/8/usr.bin/xlint/   (props changed)

Modified: stable/8/usr.bin/Makefile
==
--- stable/8/usr.bin/Makefile   Mon Oct  4 06:17:45 2010(r213398)
+++ stable/8/usr.bin/Makefile   Mon Oct  4 06:49:12 2010(r213399)
@@ -64,7 +64,7 @@ SUBDIR=   alias \
${_file2c} \
find \
finger \
-   ${_fmt} \
+   fmt \
fold \
${_from} \
fstat \
@@ -293,7 +293,6 @@ _locate=locate
 # XXX msgs?
 .if ${MK_MAIL} != "no"
 _biff= biff
-_fmt=  fmt
 _from= from
 _mail= mail
 _msgs= msgs
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213467 - in stable/8: lib/libgeom sbin/geom/class/sched sbin/geom/core sys/geom

[Xin LI]

Author: delphij
Date: Wed Oct  6 00:13:55 2010
New Revision: 213467
URL: http://svn.freebsd.org/changeset/base/213467

Log:
  MFC r202454,202457,202458,202586,207842,207844,208099:
  
  Expose stripesize and stripeoffset via kernel sysctl as well as userland
  library and the geom(8) utility.

Modified:
  stable/8/lib/libgeom/geom_util.c
  stable/8/lib/libgeom/geom_xml2tree.c
  stable/8/lib/libgeom/libgeom.3
  stable/8/lib/libgeom/libgeom.h
  stable/8/sbin/geom/core/geom.c
  stable/8/sys/geom/geom_dump.c
Directory Properties:
  stable/8/lib/libgeom/   (props changed)
  stable/8/sbin/geom/   (props changed)
  stable/8/sbin/geom/class/part/   (props changed)
  stable/8/sbin/geom/class/sched/gsched.8   (props changed)
  stable/8/sbin/geom/class/stripe/   (props changed)
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/lib/libgeom/geom_util.c
==
--- stable/8/lib/libgeom/geom_util.cTue Oct  5 23:27:06 2010
(r213466)
+++ stable/8/lib/libgeom/geom_util.cWed Oct  6 00:13:55 2010
(r213467)
@@ -114,6 +114,32 @@ g_sectorsize(int fd)
 }
 
 /*
+ * Return stripe size of the given provider.
+ */
+off_t
+g_stripesize(int fd)
+{
+   off_t stripesize;
+
+   if (g_ioctl_arg(fd, DIOCGSTRIPESIZE, &stripesize) == -1)
+   return (-1);
+   return (stripesize);
+}
+
+/*
+ * Return stripe size of the given provider.
+ */
+off_t
+g_stripeoffset(int fd)
+{
+   off_t stripeoffset;
+
+   if (g_ioctl_arg(fd, DIOCGSTRIPEOFFSET, &stripeoffset) == -1)
+   return (-1);
+   return (stripeoffset);
+}
+
+/*
  * Return the correct provider name.
  */
 char *

Modified: stable/8/lib/libgeom/geom_xml2tree.c
==
--- stable/8/lib/libgeom/geom_xml2tree.cTue Oct  5 23:27:06 2010
(r213466)
+++ stable/8/lib/libgeom/geom_xml2tree.cWed Oct  6 00:13:55 2010
(r213467)
@@ -230,6 +230,16 @@ EndElement(void *userData, const char *n
free(p);
return;
}
+   if (!strcmp(name, "stripesize") && mt->provider != NULL) {
+   mt->provider->lg_stripesize = strtoumax(p, NULL, 0);
+   free(p);
+   return;
+   }
+   if (!strcmp(name, "stripeoffset") && mt->provider != NULL) {
+   mt->provider->lg_stripeoffset = strtoumax(p, NULL, 0);
+   free(p);
+   return;
+   }
 
if (!strcmp(name, "config")) {
mt->config = NULL;

Modified: stable/8/lib/libgeom/libgeom.3
==
--- stable/8/lib/libgeom/libgeom.3  Tue Oct  5 23:27:06 2010
(r213466)
+++ stable/8/lib/libgeom/libgeom.3  Wed Oct  6 00:13:55 2010
(r213467)
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 8, 2008
+.Dd January 16, 2010
 .Dt LIBGEOM 3
 .Os
 .Sh NAME
@@ -50,6 +50,8 @@
 .Nm g_close ,
 .Nm g_mediasize ,
 .Nm g_sectorsize ,
+.Nm g_stripeoffset ,
+.Nm g_stripesize ,
 .Nm g_flush ,
 .Nm g_delete ,
 .Nm g_device_path ,
@@ -101,6 +103,10 @@
 .Fn g_mediasize "int fd"
 .Ft ssize_t
 .Fn g_sectorsize "int fd"
+.Ft ssize_t
+.Fn g_stripeoffset "int fd"
+.Ft ssize_t
+.Fn g_stripesize "int fd"
 .Ft int
 .Fn g_flush "int fd"
 .Ft int
@@ -297,6 +303,14 @@ The
 function returns sector size of the given provider.
 .Pp
 The
+.Fn g_stripeoffset
+function returns stripe offset of the given provider.
+.Pp
+The
+.Fn g_stripesize
+function returns stripe size of the given provider.
+.Pp
+The
 .Fn g_flush
 function sends
 .Dv BIO_FLUSH

Modified: stable/8/lib/libgeom/libgeom.h
==
--- stable/8/lib/libgeom/libgeom.h  Tue Oct  5 23:27:06 2010
(r213466)
+++ stable/8/lib/libgeom/libgeom.h  Wed Oct  6 00:13:55 2010
(r213467)
@@ -123,6 +123,8 @@ struct gprovider {
char*lg_mode;
off_t   lg_mediasize;
u_int   lg_sectorsize;
+   off_t   lg_stripeoffset;
+   off_t   lg_stripesize;
struct gconflg_config;
 };
 
@@ -149,6 +151,8 @@ int g_open(const char *, int);
 int g_close(int);
 off_t g_mediasize(int);
 ssize_t g_sectorsize(int);
+off_t g_stripeoffset(int);
+off_t g_stripesize(int);
 int g_flush(int);
 int g_delete(int, off_t, off_t);
 int g_get_ident(int, char *, size_t);

Modified: stable/8/sbin/geom/core/geom.c
==
--- stable/8/sbin/geom/core/geom.c  Tue Oct  5 23:27:06 2010

svn commit: r213487 - head/gnu/usr.bin/groff/tmac

[Xin LI]

Author: delphij
Date: Wed Oct  6 18:20:07 2010
New Revision: 213487
URL: http://svn.freebsd.org/changeset/base/213487

Log:
  Add definition for FreeBSD 7.4, which will be used in a manual page change.
  
  Reviewed by:  ru
  MFC after:3 days

Modified:
  head/gnu/usr.bin/groff/tmac/mdoc.local

Modified: head/gnu/usr.bin/groff/tmac/mdoc.local
==
--- head/gnu/usr.bin/groff/tmac/mdoc.local  Wed Oct  6 17:47:13 2010
(r213486)
+++ head/gnu/usr.bin/groff/tmac/mdoc.local  Wed Oct  6 18:20:07 2010
(r213487)
@@ -76,6 +76,7 @@
 .\" FreeBSD releases not found in doc-common
 .ds doc-operating-system-FreeBSD-7.27.2
 .ds doc-operating-system-FreeBSD-7.37.3
+.ds doc-operating-system-FreeBSD-7.47.4
 .ds doc-operating-system-FreeBSD-8.08.0
 .ds doc-operating-system-FreeBSD-8.18.1
 .ds doc-operating-system-FreeBSD-9.09.0
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213488 - head/libexec/tftpd

[Xin LI]

Author: delphij
Date: Wed Oct  6 18:20:39 2010
New Revision: 213488
URL: http://svn.freebsd.org/changeset/base/213488

Log:
  Use a defined FreeBSD version.
  
  MFC after:3 days

Modified:
  head/libexec/tftpd/tftpd.8

Modified: head/libexec/tftpd/tftpd.8
==
--- head/libexec/tftpd/tftpd.8  Wed Oct  6 18:20:07 2010(r213487)
+++ head/libexec/tftpd/tftpd.8  Wed Oct  6 18:20:39 2010(r213488)
@@ -245,14 +245,14 @@ and the
 and
 .Fl W
 options were introduced in
-.Fx 7 .
+.Fx 7.4 .
 .Pp
 Support for Timeout Interval and Transfer Size Options (RFC2349)
 was introduced in
 .Fx 5.0 ,
 support for the TFTP Blocksize Option (RFC2348) and the blksize2 option
 was introduced in
-.Fx 7 .
+.Fx 7.4 .
 .Sh BUGS
 Files larger than 33488896 octets (65535 blocks) cannot be transferred
 without client and server supporting blocksize negotiation (RFC2348).
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213503 - stable/8/usr.bin/gzip

[Xin LI]

Author: delphij
Date: Thu Oct  7 00:29:07 2010
New Revision: 213503
URL: http://svn.freebsd.org/changeset/base/213503

Log:
  MFC r213044:
  
  In the past gunzip(1) write()'s after each inflate return.  This is
  not optimal from a performance standpoint since the write buffer is
  not necessarily be filled up when the inflate rountine reached the
  end of input buffer and it's not the end of file.
  
  This problem gets uncovered by trying to pipe gunzip -c output to
  a GEOM device directly, which enforces the writes be multiple of
  sector size.
  
  Sponsored by: iXsystems, Inc.
  Reported by:  jpaetzel

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

Modified: stable/8/usr.bin/gzip/gzip.c
==
--- stable/8/usr.bin/gzip/gzip.cWed Oct  6 23:47:52 2010
(r213502)
+++ stable/8/usr.bin/gzip/gzip.cThu Oct  7 00:29:07 2010
(r213503)
@@ -916,6 +916,8 @@ gz_uncompress(int in, int out, char *pre
switch (error) {
/* Z_BUF_ERROR goes with Z_FINISH... */
case Z_BUF_ERROR:
+   if (z.avail_out > 0 && !done_reading)
+   continue;
case Z_STREAM_END:
case Z_OK:
break;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213504 - stable/7/usr.bin/gzip

[Xin LI]

Author: delphij
Date: Thu Oct  7 00:30:29 2010
New Revision: 213504
URL: http://svn.freebsd.org/changeset/base/213504

Log:
  MFC r210344:
  
  In the past gunzip(1) write()'s after each inflate return.  This is
  not optimal from a performance standpoint since the write buffer is
  not necessarily be filled up when the inflate rountine reached the
  end of input buffer and it's not the end of file.
  
  This problem gets uncovered by trying to pipe gunzip -c output to
  a GEOM device directly, which enforces the writes be multiple of
  sector size.
  
  Sponsored by: iXsystems, Inc.
  Reported by:  jpaetzel

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

Modified: stable/7/usr.bin/gzip/gzip.c
==
--- stable/7/usr.bin/gzip/gzip.cThu Oct  7 00:29:07 2010
(r213503)
+++ stable/7/usr.bin/gzip/gzip.cThu Oct  7 00:30:29 2010
(r213504)
@@ -920,6 +920,8 @@ gz_uncompress(int in, int out, char *pre
switch (error) {
/* Z_BUF_ERROR goes with Z_FINISH... */
case Z_BUF_ERROR:
+   if (z.avail_out > 0 && !done_reading)
+   continue;
case Z_STREAM_END:
case Z_OK:
break;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213505 - stable/8/sys/netinet

[Xin LI]

Author: delphij
Date: Thu Oct  7 00:36:58 2010
New Revision: 213505
URL: http://svn.freebsd.org/changeset/base/213505

Log:
  MFC r211059:
  
  Address an edge condition that we found at work, where the carp(4)
  interface goes to issue LINK_UP, then LINK_DOWN, then LINK_UP at
  cold boot.  This behavior is not observed when carp(4) interface
  is created slightly later, when the underlying interface is fully
  up.
  
  Before this change what happen at boot is roughly:
  
   - ifconfig creates em0 interface;
   - ifconfig clones a carp device using em0;
 (em0's link state is DOWN at this point)
   - carp state: INIT -> BACKUP [*]
   - carp state: BACKUP -> MASTER
   - [Some negotiate between em0 and switch]
   - em0 kicks up link state change event
 (em0's link state is now up DOWN at this point)
   - do_link_state_change() -> carp_carpdev_state()
   - carp state: MASTER -> INIT (via carp_set_state(sc, INIT)) [+]
   - carp state: INIT -> BACKUP
   - carp state: BACKUP -> MASTER
  
  At the [*] stage, em0 did not received any broadcast message from other
  node, and assume our node is the master, thus carp(4) sets the link
  state to "UP" after becoming a master.  At [+], the master status
  is forcely set to "INIT", then an election is casted, after which our
  node would actually become a master.
  
  We believe that at the [*] stage, the master status should remain as
  "INIT" since the underlying parent interface's link state is not up.
  
  Obtained from:  iXsystems, Inc.
  Reported by:jpaetzel

Modified:
  stable/8/sys/netinet/ip_carp.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/netinet/ip_carp.c
==
--- stable/8/sys/netinet/ip_carp.c  Thu Oct  7 00:30:29 2010
(r213504)
+++ stable/8/sys/netinet/ip_carp.c  Thu Oct  7 00:36:58 2010
(r213505)
@@ -1379,7 +1379,8 @@ carp_setrun(struct carp_softc *sc, sa_fa
CARP_SCLOCK_ASSERT(sc);
 
if (SC2IFP(sc)->if_flags & IFF_UP &&
-   sc->sc_vhid > 0 && (sc->sc_naddrs || sc->sc_naddrs6))
+   sc->sc_vhid > 0 && (sc->sc_naddrs || sc->sc_naddrs6) &&
+   sc->sc_carpdev->if_link_state == LINK_STATE_UP)
SC2IFP(sc)->if_drv_flags |= IFF_DRV_RUNNING;
else {
SC2IFP(sc)->if_drv_flags &= ~IFF_DRV_RUNNING;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213506 - stable/7/sys/netinet

[Xin LI]

Author: delphij
Date: Thu Oct  7 00:37:40 2010
New Revision: 213506
URL: http://svn.freebsd.org/changeset/base/213506

Log:
  MFC r211059:
  
  Address an edge condition that we found at work, where the carp(4)
  interface goes to issue LINK_UP, then LINK_DOWN, then LINK_UP at
  cold boot.  This behavior is not observed when carp(4) interface
  is created slightly later, when the underlying interface is fully
  up.
  
  Before this change what happen at boot is roughly:
  
   - ifconfig creates em0 interface;
   - ifconfig clones a carp device using em0;
 (em0's link state is DOWN at this point)
   - carp state: INIT -> BACKUP [*]
   - carp state: BACKUP -> MASTER
   - [Some negotiate between em0 and switch]
   - em0 kicks up link state change event
 (em0's link state is now up DOWN at this point)
   - do_link_state_change() -> carp_carpdev_state()
   - carp state: MASTER -> INIT (via carp_set_state(sc, INIT)) [+]
   - carp state: INIT -> BACKUP
   - carp state: BACKUP -> MASTER
  
  At the [*] stage, em0 did not received any broadcast message from other
  node, and assume our node is the master, thus carp(4) sets the link
  state to "UP" after becoming a master.  At [+], the master status
  is forcely set to "INIT", then an election is casted, after which our
  node would actually become a master.
  
  We believe that at the [*] stage, the master status should remain as
  "INIT" since the underlying parent interface's link state is not up.
  
  Obtained from:  iXsystems, Inc.
  Reported by:jpaetzel

Modified:
  stable/7/sys/netinet/ip_carp.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/netinet/ip_carp.c
==
--- stable/7/sys/netinet/ip_carp.c  Thu Oct  7 00:36:58 2010
(r213505)
+++ stable/7/sys/netinet/ip_carp.c  Thu Oct  7 00:37:40 2010
(r213506)
@@ -1349,7 +1349,8 @@ carp_setrun(struct carp_softc *sc, sa_fa
CARP_SCLOCK_ASSERT(sc);
 
if (SC2IFP(sc)->if_flags & IFF_UP &&
-   sc->sc_vhid > 0 && (sc->sc_naddrs || sc->sc_naddrs6))
+   sc->sc_vhid > 0 && (sc->sc_naddrs || sc->sc_naddrs6) &&
+   sc->sc_carpdev->if_link_state == LINK_STATE_UP)
SC2IFP(sc)->if_drv_flags |= IFF_DRV_RUNNING;
else {
SC2IFP(sc)->if_drv_flags &= ~IFF_DRV_RUNNING;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213632 - head/share/man/man4

[Xin LI]

Author: delphij
Date: Fri Oct  8 21:29:48 2010
New Revision: 213632
URL: http://svn.freebsd.org/changeset/base/213632

Log:
  Document net.link.lagg.failover_rx_all.
  
  MFC after:1 week

Modified:
  head/share/man/man4/lagg.4

Modified: head/share/man/man4/lagg.4
==
--- head/share/man/man4/lagg.4  Fri Oct  8 20:58:48 2010(r213631)
+++ head/share/man/man4/lagg.4  Fri Oct  8 21:29:48 2010(r213632)
@@ -16,7 +16,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 29, 2009
+.Dd October 8, 2010
 .Dt LAGG 4
 .Os
 .Sh NAME
@@ -73,11 +73,19 @@ The interface link state is used to vali
 not.
 .Bl -tag -width loadbalance
 .It Ic failover
-Sends and receives traffic only through the master port.
+Sends traffic only through the master port.
 If the master port becomes unavailable,
 the next active port is used.
 The first interface added is the master port;
 any interfaces added after that are used as failover devices.
+.Pp
+By default, received traffic is only accepted when they are received
+through the master port.
+This constraint can be relaxed by setting the
+.Va net.link.lagg.failover_rx_all
+.Xr sysctl 8
+variable to a nonzero value,
+which is useful for certain bridged network setups.
 .It Ic fec
 Supports Cisco EtherChannel.
 This is a static setup and does not negotiate aggregation with the peer or
@@ -153,6 +161,7 @@ device as a workaround.)
 .Sh SEE ALSO
 .Xr ng_fec 4 ,
 .Xr ng_one2many 4 ,
+.Xr sysctl 8 ,
 .Xr ifconfig 8
 .Sh HISTORY
 The
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213640 - in stable: 7/gnu/usr.bin/groff/tmac 8/gnu/usr.bin/groff/tmac

[Xin LI]

Author: delphij
Date: Sat Oct  9 00:34:58 2010
New Revision: 213640
URL: http://svn.freebsd.org/changeset/base/213640

Log:
  MFC r213487:
  
  Add definition for FreeBSD 7.4, which will be used in a manual page change.

Modified:
  stable/8/gnu/usr.bin/groff/tmac/mdoc.local
Directory Properties:
  stable/8/gnu/usr.bin/groff/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/7/gnu/usr.bin/groff/tmac/mdoc.local   (contents, props changed)
Directory Properties:
  stable/7/gnu/usr.bin/groff/   (props changed)

Modified: stable/8/gnu/usr.bin/groff/tmac/mdoc.local
==
--- stable/8/gnu/usr.bin/groff/tmac/mdoc.local  Fri Oct  8 23:34:45 2010
(r213639)
+++ stable/8/gnu/usr.bin/groff/tmac/mdoc.local  Sat Oct  9 00:34:58 2010
(r213640)
@@ -72,6 +72,7 @@
 .\" FreeBSD releases not found in doc-common
 .ds doc-operating-system-FreeBSD-7.27.2
 .ds doc-operating-system-FreeBSD-7.37.3
+.ds doc-operating-system-FreeBSD-7.47.4
 .ds doc-operating-system-FreeBSD-8.08.0
 .ds doc-operating-system-FreeBSD-8.18.1
 .ds doc-operating-system-FreeBSD-9.09.0
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213640 - in stable: 7/gnu/usr.bin/groff/tmac 8/gnu/usr.bin/groff/tmac

[Xin LI]

Author: delphij
Date: Sat Oct  9 00:34:58 2010
New Revision: 213640
URL: http://svn.freebsd.org/changeset/base/213640

Log:
  MFC r213487:
  
  Add definition for FreeBSD 7.4, which will be used in a manual page change.

Modified:
  stable/7/gnu/usr.bin/groff/tmac/mdoc.local   (contents, props changed)
Directory Properties:
  stable/7/gnu/usr.bin/groff/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/8/gnu/usr.bin/groff/tmac/mdoc.local
Directory Properties:
  stable/8/gnu/usr.bin/groff/   (props changed)

Modified: stable/7/gnu/usr.bin/groff/tmac/mdoc.local
==
--- stable/7/gnu/usr.bin/groff/tmac/mdoc.local  Fri Oct  8 23:34:45 2010
(r213639)
+++ stable/7/gnu/usr.bin/groff/tmac/mdoc.local  Sat Oct  9 00:34:58 2010
(r213640)
@@ -72,6 +72,7 @@
 .ds doc-operating-system-FreeBSD-7.17.1
 .ds doc-operating-system-FreeBSD-7.27.2
 .ds doc-operating-system-FreeBSD-7.37.3
+.ds doc-operating-system-FreeBSD-7.47.4
 .ds doc-operating-system-FreeBSD-8.08.0
 .ds doc-operating-system-FreeBSD-8.18.1
 .ds doc-operating-system-FreeBSD-9.09.0
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213641 - in stable: 7/libexec/tftpd 8/libexec/tftpd

[Xin LI]

Author: delphij
Date: Sat Oct  9 00:36:32 2010
New Revision: 213641
URL: http://svn.freebsd.org/changeset/base/213641

Log:
  MFC r213488:
  
  Use a defined FreeBSD version.

Modified:
  stable/8/libexec/tftpd/tftpd.8
Directory Properties:
  stable/8/libexec/tftpd/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/7/libexec/tftpd/tftpd.8
Directory Properties:
  stable/7/libexec/tftpd/   (props changed)

Modified: stable/8/libexec/tftpd/tftpd.8
==
--- stable/8/libexec/tftpd/tftpd.8  Sat Oct  9 00:34:58 2010
(r213640)
+++ stable/8/libexec/tftpd/tftpd.8  Sat Oct  9 00:36:32 2010
(r213641)
@@ -245,14 +245,14 @@ and the
 and
 .Fl W
 options were introduced in
-.Fx 7 .
+.Fx 7.4 .
 .Pp
 Support for Timeout Interval and Transfer Size Options (RFC2349)
 was introduced in
 .Fx 5.0 ,
 support for the TFTP Blocksize Option (RFC2348) and the blksize2 option
 was introduced in
-.Fx 7 .
+.Fx 7.4 .
 .Sh BUGS
 Files larger than 33488896 octets (65535 blocks) cannot be transferred
 without client and server supporting blocksize negotiation (RFC2348).
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213641 - in stable: 7/libexec/tftpd 8/libexec/tftpd

[Xin LI]

Author: delphij
Date: Sat Oct  9 00:36:32 2010
New Revision: 213641
URL: http://svn.freebsd.org/changeset/base/213641

Log:
  MFC r213488:
  
  Use a defined FreeBSD version.

Modified:
  stable/7/libexec/tftpd/tftpd.8
Directory Properties:
  stable/7/libexec/tftpd/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/8/libexec/tftpd/tftpd.8
Directory Properties:
  stable/8/libexec/tftpd/   (props changed)

Modified: stable/7/libexec/tftpd/tftpd.8
==
--- stable/7/libexec/tftpd/tftpd.8  Sat Oct  9 00:34:58 2010
(r213640)
+++ stable/7/libexec/tftpd/tftpd.8  Sat Oct  9 00:36:32 2010
(r213641)
@@ -245,14 +245,14 @@ and the
 and
 .Fl W
 options were introduced in
-.Fx 7 .
+.Fx 7.4 .
 .Pp
 Support for Timeout Interval and Transfer Size Options (RFC2349)
 was introduced in
 .Fx 5.0 ,
 support for the TFTP Blocksize Option (RFC2348) and the blksize2 option
 was introduced in
-.Fx 7 .
+.Fx 7.4 .
 .Sh BUGS
 Files larger than 33488896 octets (65535 blocks) cannot be transferred
 without client and server supporting blocksize negotiation (RFC2348).
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213687 - in stable: 7/sys/netinet 7/sys/netinet6 8/sys/netinet 8/sys/netinet6

[Xin LI]

Author: delphij
Date: Mon Oct 11 11:25:37 2010
New Revision: 213687
URL: http://svn.freebsd.org/changeset/base/213687

Log:
  MFC r213225:
  
  Add a bandaid for a long-standing race condition during route entry
  un-expiring.
  
  The previous version of code have no locking when testing rt_refcnt.
  The result of the lack of locking may result in a condition where
  a routing entry have a reference count but at the same time have
  RTPRF_OURS bit set and an expiration timer.  These would eventually
  lead to a panic:
  
panic: rtqkill route really not free
  
  When the system have ICMP redirects accepted from local gateway
  in a moderate frequency, for instance.
  
  Commit this workaround for now until we have some better solution.
  
  PR:   kern/149804
  Reviewed by:  bz
  Tested by:Zhao Xin, Pete French

Modified:
  stable/8/sys/netinet/in_rmx.c
  stable/8/sys/netinet6/in6_rmx.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/7/sys/netinet/in_rmx.c
  stable/7/sys/netinet6/in6_rmx.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/netinet/in_rmx.c
==
--- stable/8/sys/netinet/in_rmx.c   Mon Oct 11 09:42:30 2010
(r213686)
+++ stable/8/sys/netinet/in_rmx.c   Mon Oct 11 11:25:37 2010
(r213687)
@@ -121,12 +121,13 @@ in_matroute(void *v_arg, struct radix_no
struct radix_node *rn = rn_match(v_arg, head);
struct rtentry *rt = (struct rtentry *)rn;
 
-   /*XXX locking? */
-   if (rt && rt->rt_refcnt == 0) { /* this is first reference */
+   if (rt) {
+   RT_LOCK(rt);
if (rt->rt_flags & RTPRF_OURS) {
rt->rt_flags &= ~RTPRF_OURS;
rt->rt_rmx.rmx_expire = 0;
}
+   RT_UNLOCK(rt);
}
return rn;
 }

Modified: stable/8/sys/netinet6/in6_rmx.c
==
--- stable/8/sys/netinet6/in6_rmx.c Mon Oct 11 09:42:30 2010
(r213686)
+++ stable/8/sys/netinet6/in6_rmx.c Mon Oct 11 11:25:37 2010
(r213687)
@@ -193,11 +193,13 @@ in6_matroute(void *v_arg, struct radix_n
struct radix_node *rn = rn_match(v_arg, head);
struct rtentry *rt = (struct rtentry *)rn;
 
-   if (rt && rt->rt_refcnt == 0) { /* this is first reference */
+   if (rt) {
+   RT_LOCK(rt);
if (rt->rt_flags & RTPRF_OURS) {
rt->rt_flags &= ~RTPRF_OURS;
rt->rt_rmx.rmx_expire = 0;
}
+   RT_UNLOCK(rt);
}
return rn;
 }
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213687 - in stable: 7/sys/netinet 7/sys/netinet6 8/sys/netinet 8/sys/netinet6

[Xin LI]

Author: delphij
Date: Mon Oct 11 11:25:37 2010
New Revision: 213687
URL: http://svn.freebsd.org/changeset/base/213687

Log:
  MFC r213225:
  
  Add a bandaid for a long-standing race condition during route entry
  un-expiring.
  
  The previous version of code have no locking when testing rt_refcnt.
  The result of the lack of locking may result in a condition where
  a routing entry have a reference count but at the same time have
  RTPRF_OURS bit set and an expiration timer.  These would eventually
  lead to a panic:
  
panic: rtqkill route really not free
  
  When the system have ICMP redirects accepted from local gateway
  in a moderate frequency, for instance.
  
  Commit this workaround for now until we have some better solution.
  
  PR:   kern/149804
  Reviewed by:  bz
  Tested by:Zhao Xin, Pete French

Modified:
  stable/7/sys/netinet/in_rmx.c
  stable/7/sys/netinet6/in6_rmx.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/8/sys/netinet/in_rmx.c
  stable/8/sys/netinet6/in6_rmx.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/7/sys/netinet/in_rmx.c
==
--- stable/7/sys/netinet/in_rmx.c   Mon Oct 11 09:42:30 2010
(r213686)
+++ stable/7/sys/netinet/in_rmx.c   Mon Oct 11 11:25:37 2010
(r213687)
@@ -140,12 +140,13 @@ in_matroute(void *v_arg, struct radix_no
struct radix_node *rn = rn_match(v_arg, head);
struct rtentry *rt = (struct rtentry *)rn;
 
-   /*XXX locking? */
-   if (rt && rt->rt_refcnt == 0) { /* this is first reference */
+   if (rt) {
+   RT_LOCK(rt);
if (rt->rt_flags & RTPRF_OURS) {
rt->rt_flags &= ~RTPRF_OURS;
rt->rt_rmx.rmx_expire = 0;
}
+   RT_UNLOCK(rt);
}
return rn;
 }

Modified: stable/7/sys/netinet6/in6_rmx.c
==
--- stable/7/sys/netinet6/in6_rmx.c Mon Oct 11 09:42:30 2010
(r213686)
+++ stable/7/sys/netinet6/in6_rmx.c Mon Oct 11 11:25:37 2010
(r213687)
@@ -207,11 +207,13 @@ in6_matroute(void *v_arg, struct radix_n
struct radix_node *rn = rn_match(v_arg, head);
struct rtentry *rt = (struct rtentry *)rn;
 
-   if (rt && rt->rt_refcnt == 0) { /* this is first reference */
+   if (rt) {
+   RT_LOCK(rt);
if (rt->rt_flags & RTPRF_OURS) {
rt->rt_flags &= ~RTPRF_OURS;
rt->rt_rmx.rmx_expire = 0;
}
+   RT_UNLOCK(rt);
}
return rn;
 }
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r214028 - vendor/netcat/dist

[Xin LI]

Author: delphij
Date: Mon Oct 18 19:44:45 2010
New Revision: 214028
URL: http://svn.freebsd.org/changeset/base/214028

Log:
  Import nc from OpenBSD's OPENBSD_4_8 as of today.

Modified:
  vendor/netcat/dist/nc.1
  vendor/netcat/dist/netcat.c
  vendor/netcat/dist/socks.c

Modified: vendor/netcat/dist/nc.1
==
--- vendor/netcat/dist/nc.1 Mon Oct 18 19:14:59 2010(r214027)
+++ vendor/netcat/dist/nc.1 Mon Oct 18 19:44:45 2010(r214028)
@@ -1,4 +1,4 @@
-.\" $OpenBSD: nc.1,v 1.53 2010/02/23 23:00:52 schwarze Exp $
+.\" $OpenBSD: nc.1,v 1.55 2010/07/25 07:51:39 guenther Exp $
 .\"
 .\" Copyright (c) 1996 David Sacerdote
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: February 23 2010 $
+.Dd $Mdocdate: July 3 2010 $
 .Dt NC 1
 .Os
 .Sh NAME
@@ -42,7 +42,7 @@
 .Op Fl p Ar source_port
 .Op Fl s Ar source_ip_address
 .Op Fl T Ar ToS
-.Op Fl V Ar rdomain
+.Op Fl V Ar rtable
 .Op Fl w Ar timeout
 .Op Fl X Ar proxy_protocol
 .Oo Xo
@@ -179,8 +179,8 @@ Specifies to use
 sockets.
 .It Fl u
 Use UDP instead of the default option of TCP.
-.It Fl V Ar rdomain
-Set the routing domain.
+.It Fl V Ar rtable
+Set the routing table to be used.
 The default is 0.
 .It Fl v
 Have
@@ -317,7 +317,7 @@ when it might be necessary to verify wha
 in response to commands issued by the client.
 For example, to retrieve the home page of a web site:
 .Bd -literal -offset indent
-$ echo -n "GET / HTTP/1.0\er\en\er\en" | nc host.example.com 80
+$ printf "GET / HTTP/1.0\er\en\er\en" | nc host.example.com 80
 .Ed
 .Pp
 Note that this also displays the headers sent by the web server.

Modified: vendor/netcat/dist/netcat.c
==
--- vendor/netcat/dist/netcat.c Mon Oct 18 19:14:59 2010(r214027)
+++ vendor/netcat/dist/netcat.c Mon Oct 18 19:44:45 2010(r214028)
@@ -1,4 +1,4 @@
-/* $OpenBSD: netcat.c,v 1.95 2010/02/27 00:58:56 nicm Exp $ */
+/* $OpenBSD: netcat.c,v 1.98 2010/07/03 04:44:51 guenther Exp $ */
 /*
  * Copyright (c) 2001 Eric Jackson 
  *
@@ -84,7 +84,7 @@ int   Iflag;  /* TCP receive 
buffer siz
 intOflag;  /* TCP send buffer size */
 intSflag;  /* TCP MD5 signature option */
 intTflag = -1; /* IP Type of Service */
-u_int  rdomain;
+u_int  rtableid;
 
 int timeout = -1;
 int family = AF_UNSPEC;
@@ -189,10 +189,10 @@ main(int argc, char *argv[])
uflag = 1;
break;
case 'V':
-   rdomain = (unsigned int)strtonum(optarg, 0,
+   rtableid = (unsigned int)strtonum(optarg, 0,
RT_TABLEID_MAX, &errstr);
if (errstr)
-   errx(1, "rdomain %s: %s", errstr, optarg);
+   errx(1, "rtable %s: %s", errstr, optarg);
break;
case 'v':
vflag = 1;
@@ -323,11 +323,11 @@ main(int argc, char *argv[])
 */
if (uflag) {
int rv, plen;
-   char buf[8192];
+   char buf[16384];
struct sockaddr_storage z;
 
len = sizeof(z);
-   plen = jflag ? 8192 : 1024;
+   plen = jflag ? 16384 : 2048;
rv = recvfrom(s, buf, plen, MSG_PEEK,
(struct sockaddr *)&z, &len);
if (rv < 0)
@@ -507,10 +507,10 @@ remote_connect(const char *host, const c
res0->ai_protocol)) < 0)
continue;
 
-   if (rdomain) {
-   if (setsockopt(s, IPPROTO_IP, SO_RDOMAIN, &rdomain,
-   sizeof(rdomain)) == -1)
-   err(1, "setsockopt SO_RDOMAIN");
+   if (rtableid) {
+   if (setsockopt(s, IPPROTO_IP, SO_RTABLE, &rtableid,
+   sizeof(rtableid)) == -1)
+   err(1, "setsockopt SO_RTABLE");
}
 
/* Bind to a local port or source address if specified. */
@@ -581,10 +581,10 @@ local_listen(char *host, char *port, str
res0->ai_protocol)) < 0)
continue;
 
-   if (rdomain) {
-   if (setsockopt(s, IPPROTO_IP, SO_RDOMAIN, &rdomain,
-   sizeof(rdomain)) == -1)
-   

svn commit: r214029 - vendor/netcat/4.8

[Xin LI]

Author: delphij
Date: Mon Oct 18 19:45:24 2010
New Revision: 214029
URL: http://svn.freebsd.org/changeset/base/214029

Log:
  Tag for OpenBSD 4.8's nc(1).

Added:
  vendor/netcat/4.8/
 - copied from r214028, vendor/netcat/dist/
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r214047 - in head: contrib/netcat usr.bin/nc

[Xin LI]

Author: delphij
Date: Tue Oct 19 00:01:53 2010
New Revision: 214047
URL: http://svn.freebsd.org/changeset/base/214047

Log:
  MFV: nc(1) from OpenBSD 4.8.
  
  While I'm there, bump WARNS level to 2 as the vendor
  have the right printf format string now.
  
  MFC after:1 month
  Obtained from:OpenBSD

Modified:
  head/contrib/netcat/nc.1
  head/contrib/netcat/netcat.c
  head/contrib/netcat/socks.c
  head/usr.bin/nc/Makefile
Directory Properties:
  head/contrib/netcat/   (props changed)

Modified: head/contrib/netcat/nc.1
==
--- head/contrib/netcat/nc.1Mon Oct 18 23:37:56 2010(r214046)
+++ head/contrib/netcat/nc.1Tue Oct 19 00:01:53 2010(r214047)
@@ -1,4 +1,4 @@
-.\" $OpenBSD: nc.1,v 1.53 2010/02/23 23:00:52 schwarze Exp $
+.\" $OpenBSD: nc.1,v 1.55 2010/07/25 07:51:39 guenther Exp $
 .\"
 .\" Copyright (c) 1996 David Sacerdote
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 3, 2010
+.Dd July 25, 2010
 .Dt NC 1
 .Os
 .Sh NAME
@@ -46,7 +46,7 @@
 .Op Fl p Ar source_port
 .Op Fl s Ar source_ip_address
 .Op Fl T Ar ToS
-.Op Fl V Ar fib
+.Op Fl V Ar rtable
 .Op Fl w Ar timeout
 .Op Fl X Ar proxy_protocol
 .Oo Xo
@@ -201,8 +201,10 @@ Specifies to use
 sockets.
 .It Fl u
 Use UDP instead of the default option of TCP.
-.It Fl V Ar fib
-Set the routing table (FIB).
+.It Fl V Ar rtable
+Set the routing table
+.Pq Dq FIB
+to be used.
 The default is 0.
 .It Fl v
 Have

Modified: head/contrib/netcat/netcat.c
==
--- head/contrib/netcat/netcat.cMon Oct 18 23:37:56 2010
(r214046)
+++ head/contrib/netcat/netcat.cTue Oct 19 00:01:53 2010
(r214047)
@@ -1,4 +1,4 @@
-/* $OpenBSD: netcat.c,v 1.95 2010/02/27 00:58:56 nicm Exp $ */
+/* $OpenBSD: netcat.c,v 1.98 2010/07/03 04:44:51 guenther Exp $ */
 /*
  * Copyright (c) 2001 Eric Jackson 
  *
@@ -93,7 +93,7 @@ int   Iflag;  /* TCP receive 
buffer siz
 intOflag;  /* TCP send buffer size */
 intSflag;  /* TCP MD5 signature option */
 intTflag = -1; /* IP Type of Service */
-u_int  rdomain;
+u_int  rtableid;
 
 int timeout = -1;
 int family = AF_UNSPEC;
@@ -139,7 +139,6 @@ main(int argc, char *argv[])
{ NULL, 0,  NULL,   0 }
};
 
-   rdomain = 0;
ret = 1;
ipsec_count = 0;
s = 0;
@@ -235,10 +234,10 @@ main(int argc, char *argv[])
case 'V':
if (sysctlbyname("net.fibs", &numfibs, &intsize, NULL, 
0) == -1)
errx(1, "Multiple FIBS not supported");
-   rdomain = (unsigned int)strtonum(optarg, 0,
+   rtableid = (unsigned int)strtonum(optarg, 0,
numfibs - 1, &errstr);
if (errstr)
-   errx(1, "FIB %s: %s", errstr, optarg);
+   errx(1, "rtable %s: %s", errstr, optarg);
break;
case 'v':
vflag = 1;
@@ -371,11 +370,11 @@ main(int argc, char *argv[])
 */
if (uflag) {
int rv, plen;
-   char buf[8192];
+   char buf[16384];
struct sockaddr_storage z;
 
len = sizeof(z);
-   plen = jflag ? 8192 : 1024;
+   plen = jflag ? 16384 : 2048;
rv = recvfrom(s, buf, plen, MSG_PEEK,
(struct sockaddr *)&z, &len);
if (rv < 0)
@@ -561,8 +560,8 @@ remote_connect(const char *host, const c
add_ipsec_policy(s, ipsec_policy[1]);
 #endif
 
-   if (rdomain) {
-   if (setfib(rdomain) == -1)
+   if (rtableid) {
+   if (setfib(rtableid) == -1)
err(1, "setfib");
}
 
@@ -634,8 +633,8 @@ local_listen(char *host, char *port, str
res0->ai_protocol)) < 0)
continue;
 
-   if (rdomain) {
-   if (setfib(rdomain) == -1)
+   if (rtableid) {
+   if (setfib(rtableid) == -1)
err(1, "setfib");
}
 
@@ -680,12 +679,12 @@ void
 readwrite(int nfd)
 {
struct pollfd pfd[2];
-   unsigned char buf[8192];
+   unsigned char buf[16384];
int n, wfd = fileno(stdin);
int lfd = fileno(stdout);
int plen;
 
-   plen = jflag ? 8192 :

svn commit: r214066 - head/share/man/man4

[Xin LI]

Author: delphij
Date: Tue Oct 19 17:49:55 2010
New Revision: 214066
URL: http://svn.freebsd.org/changeset/base/214066

Log:
  Clarify that lagg(4) sends/receives on active port, not the master port.
  
  Note that this still seems to be a little bit confusing as the concept of
  "master" is different from what people would expect on a networking
  equipment.

Modified:
  head/share/man/man4/lagg.4

Modified: head/share/man/man4/lagg.4
==
--- head/share/man/man4/lagg.4  Tue Oct 19 17:15:22 2010(r214065)
+++ head/share/man/man4/lagg.4  Tue Oct 19 17:49:55 2010(r214066)
@@ -16,7 +16,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 8, 2010
+.Dd October 18, 2010
 .Dt LAGG 4
 .Os
 .Sh NAME
@@ -73,14 +73,14 @@ The interface link state is used to vali
 not.
 .Bl -tag -width loadbalance
 .It Ic failover
-Sends traffic only through the master port.
+Sends traffic only through the active port.
 If the master port becomes unavailable,
 the next active port is used.
 The first interface added is the master port;
 any interfaces added after that are used as failover devices.
 .Pp
 By default, received traffic is only accepted when they are received
-through the master port.
+through the active port.
 This constraint can be relaxed by setting the
 .Va net.link.lagg.failover_rx_all
 .Xr sysctl 8
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r213784 - head/lib/libz

[Xin LI]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

On 10/13/10 09:34, Warner Losh wrote:
> Author: imp
> Date: Wed Oct 13 16:34:08 2010
> New Revision: 213784
> URL: http://svn.freebsd.org/changeset/base/213784
> 
> Log:
>   Revert 212517 to restore pristine state of this file

Thanks!

- -- 
Xin LI http://www.delphij.net/
FreeBSD - The Power to Serve!  Live free or die
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.16 (FreeBSD)

iQEcBAEBCAAGBQJMvhNRAAoJEATO+BI/yjfBWasIALq1Pu6yb2RF4pfqY2AOyq06
EfV4MpWhY2+KYTYkS5zViAN9+hR9f/ncmMpIDemBXX5i/0Zq57KpuaYN/t26zDQ/
uoHj/jK2nxR8RmCNx4lWJ0LoShhkKLA+Gx1z0C1Ebg1iOIe0Ni/ekcvU6+80WX3e
zKq/TqBSnIJaR0CS/MES/vrnf/MJn0EfLXSKArH/urC9HZUz9aiacbVDpmFBoSPR
WJdsfshHOeG7GSHP2ExZewKl+EgBG1JGRFExHtxEKecGwgihu9k0AlBEukrlb8A1
mEXGUXT5bHCZTvkkrnYiSZaFUiukNe+GsMDkJ7K5Y1eL5g8ZQbq6gY7UwlAnOrY=
=NFxi
-END PGP SIGNATURE-
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r214111 - in stable/8: share/man/man4 sys/net

[Xin LI]

Author: delphij
Date: Wed Oct 20 17:42:10 2010
New Revision: 214111
URL: http://svn.freebsd.org/changeset/base/214111

Log:
  MFC r212100 (emaste),213632,214066:
  
  Add a new syslog knob, net.link.lagg.failover_rx_all, to control
  whether to accept input packets on any link in a failover lagg,
  and add the corresponding documentation.

Modified:
  stable/8/share/man/man4/lagg.4
  stable/8/sys/net/if_lagg.c
Directory Properties:
  stable/8/share/man/man4/   (props changed)
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/share/man/man4/lagg.4
==
--- stable/8/share/man/man4/lagg.4  Wed Oct 20 16:47:09 2010
(r214110)
+++ stable/8/share/man/man4/lagg.4  Wed Oct 20 17:42:10 2010
(r214111)
@@ -16,7 +16,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 29, 2009
+.Dd October 18, 2010
 .Dt LAGG 4
 .Os
 .Sh NAME
@@ -73,11 +73,19 @@ The interface link state is used to vali
 not.
 .Bl -tag -width loadbalance
 .It Ic failover
-Sends and receives traffic only through the master port.
+Sends traffic only through the active port.
 If the master port becomes unavailable,
 the next active port is used.
 The first interface added is the master port;
 any interfaces added after that are used as failover devices.
+.Pp
+By default, received traffic is only accepted when they are received
+through the active port.
+This constraint can be relaxed by setting the
+.Va net.link.lagg.failover_rx_all
+.Xr sysctl 8
+variable to a nonzero value,
+which is useful for certain bridged network setups.
 .It Ic fec
 Supports Cisco EtherChannel.
 This is a static setup and does not negotiate aggregation with the peer or
@@ -153,6 +161,7 @@ device as a workaround.)
 .Sh SEE ALSO
 .Xr ng_fec 4 ,
 .Xr ng_one2many 4 ,
+.Xr sysctl 8 ,
 .Xr ifconfig 8
 .Sh HISTORY
 The

Modified: stable/8/sys/net/if_lagg.c
==
--- stable/8/sys/net/if_lagg.c  Wed Oct 20 16:47:09 2010(r214110)
+++ stable/8/sys/net/if_lagg.c  Wed Oct 20 17:42:10 2010(r214111)
@@ -159,6 +159,14 @@ static const struct {
{ LAGG_PROTO_NONE,  NULL }
 };
 
+SYSCTL_DECL(_net_link);
+SYSCTL_NODE(_net_link, OID_AUTO, lagg, CTLFLAG_RW, 0, "Link Aggregation");
+
+static int lagg_failover_rx_all = 0; /* Allow input on any failover links */
+SYSCTL_INT(_net_link_lagg, OID_AUTO, failover_rx_all, CTLFLAG_RW,
+&lagg_failover_rx_all, 0,
+"Accept input from any interface in a failover lagg");
+
 static int
 lagg_modevent(module_t mod, int type, void *data)
 {
@@ -1498,7 +1506,7 @@ lagg_fail_input(struct lagg_softc *sc, s
struct ifnet *ifp = sc->sc_ifp;
struct lagg_port *tmp_tp;
 
-   if (lp == sc->sc_primary) {
+   if (lp == sc->sc_primary || lagg_failover_rx_all) {
m->m_pkthdr.rcvif = ifp;
return (m);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r214112 - in stable/7: share/man/man4 sys/net

[Xin LI]

Author: delphij
Date: Wed Oct 20 17:58:12 2010
New Revision: 214112
URL: http://svn.freebsd.org/changeset/base/214112

Log:
  MFC r190527,190528,190531:
  
  190527(sam):
  fix wired-wireless failover example and remove incorrect
  comment about WPA not working
  
  190528(sam):
  remove bogus nwid use; that's a compat shim for netbsd
  
  190531(bruffer):
  Fix typo.
  
  MFC r212100 (emaste),213632,214066:
  
  Add a new syslog knob, net.link.lagg.failover_rx_all, to control
  whether to accept input packets on any link in a failover lagg,
  and add the corresponding documentation.

Modified:
  stable/7/share/man/man4/lagg.4
  stable/7/sys/net/if_lagg.c
Directory Properties:
  stable/7/share/man/man4/   (props changed)
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/share/man/man4/lagg.4
==
--- stable/7/share/man/man4/lagg.4  Wed Oct 20 17:42:10 2010
(r214111)
+++ stable/7/share/man/man4/lagg.4  Wed Oct 20 17:58:12 2010
(r214112)
@@ -16,7 +16,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 17, 2007
+.Dd October 18, 2010
 .Dt LAGG 4
 .Os
 .Sh NAME
@@ -73,11 +73,19 @@ The interface link state is used to vali
 not.
 .Bl -tag -width loadbalance
 .It Ic failover
-Sends and receives traffic only through the master port.
+Sends traffic only through the active port.
 If the master port becomes unavailable,
 the next active port is used.
 The first interface added is the master port;
 any interfaces added after that are used as failover devices.
+.Pp
+By default, received traffic is only accepted when they are received
+through the active port.
+This constraint can be relaxed by setting the
+.Va net.link.lagg.failover_rx_all
+.Xr sysctl 8
+variable to a nonzero value,
+which is useful for certain bridged network setups.
 .It Ic fec
 Supports Cisco EtherChannel.
 This is a static setup and does not negotiate aggregation with the peer or
@@ -142,13 +150,18 @@ Whenever the wired master interface is u
 device will be used:
 .Bd -literal -offset indent
 # ifconfig em0 up
-# ifconfig ath0 nwid my_net up
-# ifconfig lagg0 laggproto failover laggport em0 laggport ath0 \e
+# ifconfig ath0 ether 00:11:22:33:44:55
+# ifconfig create wlan0 wlandev ath0 ssid my_net up
+# ifconfig lagg0 laggproto failover laggport em0 laggport wlan0 \e
192.168.1.1 netmask 255.255.255.0
 .Ed
+.Pp
+(Note the mac address of the wireless device is forced to match the wired
+device as a workaround.)
 .Sh SEE ALSO
 .Xr ng_fec 4 ,
 .Xr ng_one2many 4 ,
+.Xr sysctl 8 ,
 .Xr ifconfig 8
 .Sh HISTORY
 The
@@ -172,6 +185,3 @@ There is no way to configure LACP admini
 and port priorities.
 The current implementation always performs active-mode LACP and uses 0x8000 as
 system and port priorities.
-.Pp
-WPA security does not currently work correctly with a wireless interface added
-to the lagg port.

Modified: stable/7/sys/net/if_lagg.c
==
--- stable/7/sys/net/if_lagg.c  Wed Oct 20 17:42:10 2010(r214111)
+++ stable/7/sys/net/if_lagg.c  Wed Oct 20 17:58:12 2010(r214112)
@@ -159,6 +159,14 @@ static const struct {
{ LAGG_PROTO_NONE,  NULL }
 };
 
+SYSCTL_DECL(_net_link);
+SYSCTL_NODE(_net_link, OID_AUTO, lagg, CTLFLAG_RW, 0, "Link Aggregation");
+
+static int lagg_failover_rx_all = 0; /* Allow input on any failover links */
+SYSCTL_INT(_net_link_lagg, OID_AUTO, failover_rx_all, CTLFLAG_RW,
+&lagg_failover_rx_all, 0,
+"Accept input from any interface in a failover lagg");
+
 static int
 lagg_modevent(module_t mod, int type, void *data)
 {
@@ -1476,7 +1484,7 @@ lagg_fail_input(struct lagg_softc *sc, s
struct ifnet *ifp = sc->sc_ifp;
struct lagg_port *tmp_tp;
 
-   if (lp == sc->sc_primary) {
+   if (lp == sc->sc_primary || lagg_failover_rx_all) {
m->m_pkthdr.rcvif = ifp;
return (m);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r214125 - head/sys/kern

[Xin LI]

Author: delphij
Date: Thu Oct 21 08:57:25 2010
New Revision: 214125
URL: http://svn.freebsd.org/changeset/base/214125

Log:
  In syscall_module_handler(): all switch branches return, remove
  unreached code as pointed out in a Chinese forum [1].
  
  [1] http://www.freebsdchina.org/forum/viewtopic.php?t=50619
  
  Pointed out by:   btw616 
  MFC after:1 month

Modified:
  head/sys/kern/kern_syscalls.c

Modified: head/sys/kern/kern_syscalls.c
==
--- head/sys/kern/kern_syscalls.c   Thu Oct 21 06:52:14 2010
(r214124)
+++ head/sys/kern/kern_syscalls.c   Thu Oct 21 08:57:25 2010
(r214125)
@@ -184,10 +184,7 @@ syscall_module_handler(struct module *mo
return EOPNOTSUPP;
}
 
-   if (data->chainevh)
-   return (data->chainevh(mod, what, data->chainarg));
-   else
-   return (0);
+   /* NOTREACHED */
 }
 
 int
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r214125 - head/sys/kern

[Xin LI]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

On 10/21/10 04:46, John Baldwin wrote:
> On Thursday, October 21, 2010 4:57:25 am Xin LI wrote:
>> Author: delphij
>> Date: Thu Oct 21 08:57:25 2010
>> New Revision: 214125
>> URL: http://svn.freebsd.org/changeset/base/214125
>>
>> Log:
>>   In syscall_module_handler(): all switch branches return, remove
>>   unreached code as pointed out in a Chinese forum [1].
>>   
>>   [1] http://www.freebsdchina.org/forum/viewtopic.php?t=50619
>>   
>>   Pointed out by:btw616 
>>   MFC after: 1 month
> 
> I think this exposes a bug though in that the default case doesn't pass 
> through to chainevh.  The default case should look more like the removed code 
> (except returning EOPNOTSUPP instead of 0 if there is no chainevh).

Hmm...  It sounds reasonable in theory (so that modules can handle
events other than MOD_LOAD/UNLOAD) at least, while I don't think it's
really being used anywhere.

Will the attached patch look reasonable?  (If data->chainevh is NULL
then operation is not supported, if not then delegate to the module).

Cheers,
- -- 
Xin LI http://www.delphij.net/
FreeBSD - The Power to Serve!  Live free or die
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.16 (FreeBSD)

iQEcBAEBCAAGBQJMwI+cAAoJEATO+BI/yjfBADUH/21dtdgSziij8hNi8ef5xOZH
QMbGRoHNUREVfuAnAevGNDotSonaRv+VEs5k9raRqqYFdtst6KzNjVQuumJsskmq
+6j7rSPXQvAmgEf6JgEZmjU/WzRbs4lozMjUOx0TW6ZSTtiXq+PSvmMe7q9iydiT
YKOj8E/itVFjKY2qMGNkAQ893qzIWvptDR9QGJP+m+8usTnYvAlk8vQw3XhfR/ws
MNE726rDNwD2sblH2IZI0dt/xy8i6mD5Ef1aM4KEkeussBjGlLAktSS6qFB71lql
JpGC9SCelhJRci6gLTvAbAyIe9hoFf8C7P+AbFXgVNMQxYWIHSzQr5BktwxSpc0=
=C6jc
-END PGP SIGNATURE-
Index: sys/kern/kern_syscalls.c
===
--- sys/kern/kern_syscalls.c(revision 214146)
+++ sys/kern/kern_syscalls.c(working copy)
@@ -181,7 +181,9 @@
error = syscall_deregister(data->offset, &data->old_sysent);
return (error);
default:
-   return EOPNOTSUPP;
+   if (data->chainevh)
+   return (data->chainevh(mod, what, data->chainarg));
+   return (EOPNOTSUPP);
}
 
/* NOTREACHED */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r214181 - head/sys/kern

[Xin LI]

Author: delphij
Date: Thu Oct 21 20:31:50 2010
New Revision: 214181
URL: http://svn.freebsd.org/changeset/base/214181

Log:
  Call chainevh callback when we are invoked with neither MOD_LOAD nor
  MOD_UNLOAD.  This makes it possible to add custom hooks for other module
  events.
  
  Return EOPNOTSUPP when there is no callback available.
  
  Pointed out by:   jhb
  Reviewed by:  jhb
  MFC after:1 month

Modified:
  head/sys/kern/kern_syscalls.c

Modified: head/sys/kern/kern_syscalls.c
==
--- head/sys/kern/kern_syscalls.c   Thu Oct 21 20:30:35 2010
(r214180)
+++ head/sys/kern/kern_syscalls.c   Thu Oct 21 20:31:50 2010
(r214181)
@@ -181,7 +181,9 @@ syscall_module_handler(struct module *mo
error = syscall_deregister(data->offset, &data->old_sysent);
return (error);
default:
-   return EOPNOTSUPP;
+   if (data->chainevh)
+   return (data->chainevh(mod, what, data->chainarg));
+   return (EOPNOTSUPP);
}
 
/* NOTREACHED */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r214431 - head/bin/rm

[Xin LI]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

On 10/27/10 14:48, Alexander Best wrote:
> On Wed Oct 27 10, Doug Barton wrote:
>> On 10/27/10 14:26, Alexander Best wrote:
>>> are in fact COW fs the only exception where the -P flag won't work? before
>>> r213582 LFS was mentioned here and that the block size must be fixed.
>>> also the comment in rm.c says that -P won't work for any logging file 
>>> systems.
>>> i'm not a fs expert, but i think mentioning that -P won't work for COW fs 
>>> isn't
>>> enough.
>>
>> What may be a better approach is to confirm the fs' that DO work, list 
>> them, and then add something to the effect of, "This feature is unlikely 
>> to work on other file systems."
> 
> i don't think that's a good approach, because then the rm(1) has to be changed
> everytime freebsd gets a new fs which works with the -P option. i think it's
> better to list which fs semantics DON'T work. so if freebsd gets a new fs,
> users simply have to know which semantics the new fs is based on and can 
> decide
> for themselves whether the -P switch will work or not.
> 
> so far the -P option doesn't seem to work for:
> 
> - COW fs and/or
> - fs with a variable block size and/or
> - fs which do journaling
> 
> please correct me if i got anything wrong. so i think having such a list in 
> the
> rm(1) manual would be very nice (maybe improving the comment in rm.c too).

I think what really defeats -P is the fact that the file system or
underlying data storage would not overwrite data on a file at sync().
 COW is of course one of the case, journaling MAY defeat -P but is not
guaranteed.  FS with variable block size - I believe this really depends
on the implementation.

If I understood the code correctly, UFS, UFS+SU, UFS+SUJ, msdosfs and
ext2fs supports rm -P as long as they are not being put on gjournal'ed
disk, ZFS zvol, etc., and no snapshot is being used.

It seems to be hard for me to conclude all cases in short, plain English
but I'm all for improvements to the manual page to describe that in an
elegant and precise manner.

Maybe something like:

===
BUGS

The -P option assumes that the underlying storage overwrites file block
when data is written on existing offset.  Several factors including the
file system and its backing store could defeat the assumption, this
includes, but is not limited to file systems that uses Copy-On-Write
strategy (e.g. ZFS or UFS when snapshot is being used), or backing
datastore that does journaling, etc.  In addition, only regular files
are overwritten, other types of files are not.
===

Cheers,
- -- 
Xin LI http://www.delphij.net/
FreeBSD - The Power to Serve!  Live free or die
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.16 (FreeBSD)

iQEcBAEBCAAGBQJMyKicAAoJEATO+BI/yjfBElYIAMP70g1a+YheuKD14NXugVTU
sG4KEWAjRSZCe808f46AXU+wJePnRFkYVKD+A+6aH63y/r2V0e3CVMUYZZXr4l/d
HJRnZjJK9e/YJv8pcCpq7PgnmPzMa4m4BQNYVJoNGbPd75V27wMi3hgBzzPrJxWL
aBuB31hpU32PcpvzQgBPLiNzjEuLRq5be42HjgTPT1qGwSMEQcLgXOfG9l6TS27s
I5n5KPU7dEFt0Z+3ljQM+F3Fk2wmy/EOAeRcZL89xvFZIAYmtVrL3UcniHALPRSn
CAbGrNpCbvh2RZvJX1Cwu3H+PVIlIcl2uG/aiOEC7m/tA29LfPPXG0IzUN9qVLc=
=LQen
-END PGP SIGNATURE-
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r227802 - head/sys/fs/tmpfs

[Xin LI]

Author: delphij
Date: Mon Nov 21 20:26:22 2011
New Revision: 227802
URL: http://svn.freebsd.org/changeset/base/227802

Log:
  Improve the way to calculate available pages in tmpfs:
  
   - Don't deduct wired pages from total usable counts because it does not
 make any sense.  To make things worse, on systems where swap size is
 smaller than physical memory and use a lot of wired pages (e.g. ZFS),
 tmpfs can suddenly have free space of 0 because of this;
   - Count cached pages as available; [1]
   - Don't count inactive pages as available, technically we could but that
 might be too aggressive; [1]
  
  [1] Suggested by kib@
  
  MFC after:1 week

Modified:
  head/sys/fs/tmpfs/tmpfs.h

Modified: head/sys/fs/tmpfs/tmpfs.h
==
--- head/sys/fs/tmpfs/tmpfs.h   Mon Nov 21 20:07:12 2011(r227801)
+++ head/sys/fs/tmpfs/tmpfs.h   Mon Nov 21 20:26:22 2011(r227802)
@@ -502,11 +502,8 @@ inttmpfs_truncate(struct vnode *, off_t
 static __inline size_t
 tmpfs_mem_info(void)
 {
-   size_t size;
 
-   size = swap_pager_avail + cnt.v_free_count + cnt.v_inactive_count;
-   size -= size > cnt.v_wire_count ? cnt.v_wire_count : size;
-   return size;
+   return (swap_pager_avail + cnt.v_free_count + cnt.v_cache_count);
 }
 
 /* Returns the maximum size allowed for a tmpfs file system.  This macro
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r227802 - head/sys/fs/tmpfs

[Xin LI]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

For the record, in our talk kib@ also suggested that it would be
worthwhile to add "reserved" swap pages for tmpfs so that
administrators can have guaranteed space for tmpfs as well.  This is
not implemented in this changeset.

Cheers,
- -- 
Xin LI https://www.delphij.net/
FreeBSD - The Power to Serve!   Live free or die
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.18 (FreeBSD)

iQEcBAEBCAAGBQJOyrSyAAoJEATO+BI/yjfB+JcIAJ/LpqOlZa05CRzCFuZouBPZ
K+DyxALxOEwOxkC4iVrAuhUCSAXew8RcpMl52UjbPiMh4tFLs4cqyrIQ0GXvRO9L
lOGVaM+YxRQBjnU7Xh2FgQV75C5yVmWwey2FAVWfcv9545If8fqH8t5u5IlaL46z
jePIfLr5681xuZetWC7vlU63ZR6khOTIB+vVnekI0frPiNVgLKmeKIQIkjM/NNQt
x81ssKxBxM10BHG9dh54s8YLYCEM2AGPhuAv0TIFXVlq5/W2Vk6cMwettDJ9+WBG
GeJm2H2I+dlR8Hn7r0c2/QEt+XeKTOcz8CF+CznWfz1JnbsMM+NJqdI6gW0eH34=
=rsl4
-END PGP SIGNATURE-
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r227910 - releng/9.0/etc stable/9/etc

[Xin LI]

Author: delphij
Date: Wed Nov 23 21:41:31 2011
New Revision: 227910
URL: http://svn.freebsd.org/changeset/base/227910

Log:
  MFC r225849:
  
  Test if the interface is afif in dhcpif() and syncdhcpif(), as
  done in ipv6_autoconfif.
  
  This fixes a regression that causes e.g. ifconfig_DEFAULT="DHCP"
  to run on non-afif interfaces like pfsync0, which in turn would
  cause excessive delay on system startup.
  
  Sponsored by: iXsystems, Inc.
  Reviewed by:  hrs (freebsd-rc@)
  Approved by:  re (bz)

Modified:
  stable/9/etc/network.subr
Directory Properties:
  stable/9/etc/   (props changed)

Changes in other areas also in this revision:
Modified:
  releng/9.0/etc/network.subr
Directory Properties:
  releng/9.0/etc/   (props changed)

Modified: stable/9/etc/network.subr
==
--- stable/9/etc/network.subr   Wed Nov 23 21:19:38 2011(r227909)
+++ stable/9/etc/network.subr   Wed Nov 23 21:41:31 2011(r227910)
@@ -297,6 +297,10 @@ dhcpif()
local _tmpargs _arg
_tmpargs=`_ifconfig_getargs $1`
 
+   if noafif $1; then
+   return 1
+   fi
+
for _arg in $_tmpargs; do
case $_arg in
[Dd][Hh][Cc][Pp])
@@ -322,6 +326,10 @@ syncdhcpif()
local _tmpargs _arg
_tmpargs=`_ifconfig_getargs $1`
 
+   if noafif $1; then
+   return 1
+   fi
+
for _arg in $_tmpargs; do
case $_arg in
[Nn][Oo][Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp])
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r227910 - releng/9.0/etc stable/9/etc

[Xin LI]

Author: delphij
Date: Wed Nov 23 21:41:31 2011
New Revision: 227910
URL: http://svn.freebsd.org/changeset/base/227910

Log:
  MFC r225849:
  
  Test if the interface is afif in dhcpif() and syncdhcpif(), as
  done in ipv6_autoconfif.
  
  This fixes a regression that causes e.g. ifconfig_DEFAULT="DHCP"
  to run on non-afif interfaces like pfsync0, which in turn would
  cause excessive delay on system startup.
  
  Sponsored by: iXsystems, Inc.
  Reviewed by:  hrs (freebsd-rc@)
  Approved by:  re (bz)

Modified:
  releng/9.0/etc/network.subr
Directory Properties:
  releng/9.0/etc/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/9/etc/network.subr
Directory Properties:
  stable/9/etc/   (props changed)

Modified: releng/9.0/etc/network.subr
==
--- releng/9.0/etc/network.subr Wed Nov 23 21:19:38 2011(r227909)
+++ releng/9.0/etc/network.subr Wed Nov 23 21:41:31 2011(r227910)
@@ -297,6 +297,10 @@ dhcpif()
local _tmpargs _arg
_tmpargs=`_ifconfig_getargs $1`
 
+   if noafif $1; then
+   return 1
+   fi
+
for _arg in $_tmpargs; do
case $_arg in
[Dd][Hh][Cc][Pp])
@@ -322,6 +326,10 @@ syncdhcpif()
local _tmpargs _arg
_tmpargs=`_ifconfig_getargs $1`
 
+   if noafif $1; then
+   return 1
+   fi
+
for _arg in $_tmpargs; do
case $_arg in
[Nn][Oo][Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp])
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r227963 - head/sbin/camcontrol

[Xin LI]

Author: delphij
Date: Fri Nov 25 07:11:02 2011
New Revision: 227963
URL: http://svn.freebsd.org/changeset/base/227963

Log:
  Fix build.

Modified:
  head/sbin/camcontrol/util.c

Modified: head/sbin/camcontrol/util.c
==
--- head/sbin/camcontrol/util.c Fri Nov 25 07:10:59 2011(r227962)
+++ head/sbin/camcontrol/util.c Fri Nov 25 07:11:02 2011(r227963)
@@ -162,7 +162,7 @@ arg_put(void *hook __unused, int letter,
  *0: unconfirmed
  */
 int
-get_confirmation()
+get_confirmation(void)
 {
char str[1024];
int response = -1;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r228099 - head/usr.bin/grep

[Xin LI]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

On 11/28/11 12:16, Gabor Kovesdan wrote:
> Author: gabor Date: Mon Nov 28 20:16:55 2011 New Revision: 228099 
> URL: http://svn.freebsd.org/changeset/base/228099
> 
> Log: - Create links to the xz and lzma versions even if BSD grep is
> not the default. Nor GNU nor liblzma in base provides such
> functionality so it may be useful.

This is useful but could be confusing since xzgrep's behavior could be
different from zgrep.

Another topic would be ObsoleteFiles.inc (or
OptionalObsoleteFiles.inc) needs to be updated for this as well.

Cheers,
- -- 
Xin LI https://www.delphij.net/
FreeBSD - The Power to Serve!   Live free or die
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.18 (FreeBSD)

iQEcBAEBCAAGBQJO0+2DAAoJEATO+BI/yjfBdY8H/j06mWzfsQYqXLLTA8T2G7kj
fo9VqE3FrdZ43kuaSV+IsZOuXGJHA9ttSCuvbByq9VhD3n0Ybr3XyB032B5FuoIg
yLGSQe1olsStAvMaYCfMdxEyjptMsxFbOhtGN1p3Whb69HT6Hp58SlEiQ//LUgdW
oCAJagbDg3pUsYP/qCehharT2X4EaE2m0aqXc/FPOXUWLOZ/8+nnkbBz8BO0D6Gj
pMrVNFt+42py4K+g7pYhfbY6iv6KXhs00M5KCRDQs/aPZmDcqLGf01XAmaJUMgUY
qoCVCg9naP26oYNgQHLlUrE72EY9q4zK+s9B502f4PPoxrUxp28n1Hc8lce5Y3U=
=XzVB
-END PGP SIGNATURE-
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r228099 - head/usr.bin/grep

[Xin LI]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

On 11/28/11 15:58, Gábor Kövesdán wrote:
> On 2011.11.28. 21:22, Xin LI wrote:
>> This is useful but could be confusing since xzgrep's behavior
>> could be different from zgrep.
> What do you refer to exactly? That zgrep is GNU grep and xzgrep is
> BSD grep? I acknowledge that this is not documented but xzgrep is
> a

Yes.

> non-standard addition so personally think it is acceptable.
> Someone called my attention to the archivers/xz port that had a
> wrapper script for grep, callled xzgrep. This was installed with
> the port but is not installed in base any more so I got the
> suggestion to implement it in BSD grep and I think it is a better
> idea than a wrapper script and it was easy to support. So with this
> change, this functionality can be used again w/o installing the
> port although it is not documented.

I'm not quite convinced but your reasoning do have something so let's
keep it as-is for now, at least.  Eventually we would have the two
behave the same so it would not even be a problem for the future.

>> Another topic would be ObsoleteFiles.inc (or 
>> OptionalObsoleteFiles.inc) needs to be updated for this as well.
> I don't think they should be updated. From now on, xzgrep and such
> are always created and they always point to BSD grep, which can be 
> /usr/bin/grep or /usr/bin/bsdgrep depending on WITH_BSD_GREP. But
> they always exist and point to one or another. I cannot think of
> any case when they should be removed.

Ah ok, I thought there was an option to disable building of bsdgrep
but I were wrong here.  Sorry for the noise.

Cheers,
- -- 
Xin LI https://www.delphij.net/
FreeBSD - The Power to Serve!   Live free or die
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.18 (FreeBSD)

iQEcBAEBCAAGBQJO1Cg9AAoJEATO+BI/yjfB+yAIAK7v7GJNaBIa25TFnbw4siRb
c7LZ0VOp2W3i+QlmzhoWDFkW4SLedol93dKiD5ymDAhTrgaN/KS1ul2vb3kYrrr7
ZblinAfb1/NSWEtmQaUqZffExT1wBpGhLPRKm979Mn6BMHgaV5f+PqKw36uTwuqA
9O8AFZnEsplkf5FI71758yXugS48DzJnaAD/7/jC7v/l2GNHs7l+HMTBOS50/I/2
mLX98uerCYvIZ9U51Le4J9WI62oN9HcmVqTG0brUvVYCyEtL7Cjf8MrYE3b1m16l
q5YU1uyTMQPTpQhIlRGUe80hcNN0kROpjR5hez0i/2gKXp3BSKVPyB0peTC34n0=
=6v/S
-END PGP SIGNATURE-
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r228119 - head/usr.sbin/mfiutil

[Xin LI]

Author: delphij
Date: Tue Nov 29 08:16:14 2011
New Revision: 228119
URL: http://svn.freebsd.org/changeset/base/228119

Log:
  In build_volume(), check if arrays is allocated before traversing its
  items.  While parsing the arrays input, it's possible that we reach the
  error path before initializing the 'arrays' pointer, which in turn leads
  to a NULL deference.
  
  Submitted by: Garrett Cooper
  MFC after:1 week

Modified:
  head/usr.sbin/mfiutil/mfi_config.c

Modified: head/usr.sbin/mfiutil/mfi_config.c
==
--- head/usr.sbin/mfiutil/mfi_config.c  Tue Nov 29 07:59:45 2011
(r228118)
+++ head/usr.sbin/mfiutil/mfi_config.c  Tue Nov 29 08:16:14 2011
(r228119)
@@ -820,9 +820,11 @@ error:
free(config);
free(state.volumes);
free(state.arrays);
-   for (i = 0; i < narrays; i++)
-   free(arrays[i].drives);
-   free(arrays);
+   if (arrays != NULL) {
+   for (i = 0; i < narrays; i++)
+   free(arrays[i].drives);
+   free(arrays);
+   }
close(fd);
 
return (error);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r228511 - head

[Xin LI]

Author: delphij
Date: Wed Dec 14 23:22:40 2011
New Revision: 228511
URL: http://svn.freebsd.org/changeset/base/228511

Log:
  Reflect the move of eventtimers(7) to eventtimers(4).

Modified:
  head/ObsoleteFiles.inc

Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc  Wed Dec 14 22:26:39 2011(r228510)
+++ head/ObsoleteFiles.inc  Wed Dec 14 23:22:40 2011(r228511)
@@ -38,6 +38,8 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20111214: eventtimers(7) moved to eventtimers(4)
+OLD_FILES+=usr/share/man/man7/eventtimers.7.gz
 # 2025: amd(4) removed
 OLD_FILES+=usr/share/man/man4/amd.4.gz
 # 2025: libodialog removed
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r228520 - head/sys/nfsserver

[Xin LI]

Author: delphij
Date: Thu Dec 15 02:26:53 2011
New Revision: 228520
URL: http://svn.freebsd.org/changeset/base/228520

Log:
  Honor NFSv3 commit call (RFC 1813, Section 3.3.21) where when count is 0,
  the full length from offset is being flushed.  Note that for now VOP_FSYNC
  does not support offset and length parameters so we still do the same full
  VOP_FSYNC.  This issue was reported at FreeNAS support site as FreeNAS
  ticket #1096.
  
  Submitted by: "ceckerle" 
  Prodded by:   gcooper
  Reviewed by:  rmacklem
  MFC after:2 weeks

Modified:
  head/sys/nfsserver/nfs_serv.c

Modified: head/sys/nfsserver/nfs_serv.c
==
--- head/sys/nfsserver/nfs_serv.c   Thu Dec 15 01:05:38 2011
(r228519)
+++ head/sys/nfsserver/nfs_serv.c   Thu Dec 15 02:26:53 2011
(r228520)
@@ -3454,7 +3454,12 @@ nfsrv_commit(struct nfsrv_descript *nfsd
}
for_ret = VOP_GETATTR(vp, &bfor, cred);
 
-   if (cnt > MAX_COMMIT_COUNT) {
+   /*
+* RFC 1813 3.3.21: if count is 0, a flush from offset to the end of 
file
+* is done.  At this time VOP_FSYNC does not accept offset and byte 
count
+* parameters so call VOP_FSYNC the whole file for now.
+*/
+   if (cnt == 0 || cnt > MAX_COMMIT_COUNT) {
/*
 * Give up and do the whole thing
 */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r228724 - in head/sys: amd64/conf i386/conf

[Xin LI]

Author: delphij
Date: Tue Dec 20 00:16:52 2011
New Revision: 228724
URL: http://svn.freebsd.org/changeset/base/228724

Log:
  Add comments in NOTES to say what viawd is.

Modified:
  head/sys/amd64/conf/NOTES
  head/sys/i386/conf/NOTES

Modified: head/sys/amd64/conf/NOTES
==
--- head/sys/amd64/conf/NOTES   Mon Dec 19 23:39:08 2011(r228723)
+++ head/sys/amd64/conf/NOTES   Tue Dec 20 00:16:52 2011(r228724)
@@ -455,6 +455,7 @@ device  tpm
 #
 # ichwd: Intel ICH watchdog timer
 # amdsbwd: AMD SB7xx watchdog timer
+# viawd: VIA south bridge watchdog timer
 #
 device ichwd
 device amdsbwd

Modified: head/sys/i386/conf/NOTES
==
--- head/sys/i386/conf/NOTESMon Dec 19 23:39:08 2011(r228723)
+++ head/sys/i386/conf/NOTESTue Dec 20 00:16:52 2011(r228724)
@@ -828,6 +828,7 @@ hint.pcf.0.irq="5"
 #
 # ichwd: Intel ICH watchdog timer
 # amdsbwd: AMD SB7xx watchdog timer
+# viawd: VIA south bridge watchdog timer
 #
 device ichwd
 device amdsbwd
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r228843 - head/contrib/telnet/libtelnet head/crypto/heimdal/appl/telnet/libtelnet head/include head/lib/libc/gen head/lib/libc/iconv head/lib/libc/include head/lib/libc/net head/libexe

[Xin Li]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 12/23/11 07:58, John Baldwin wrote:
> On Friday, December 23, 2011 10:00:38 am Colin Percival wrote:
>> Author: cperciva Date: Fri Dec 23 15:00:37 2011 New Revision:
>> 228843 URL: http://svn.freebsd.org/changeset/base/228843
>> 
>> Log: Fix a problem whereby a corrupt DNS record can cause named
>> to crash. [11:06]
>> 
>> Add an API for alerting internal libc routines to the presence
>> of "unsafe" paths post-chroot, and use it in ftpd. [11:07]
> 
> Eh, the whole libc_dlopen() thing looks like a gross hack (and who
> came up with that weird symbol name for a public API).  Is it
> really even needed given the other fix to have ftpd drop privilege
> before execing a helper program?  I guess the main reason I don't
> like it is it doesn't do

This is not sufficient if only privileges are dropped.  The attacker
can still get e.g. a shell or start an IRC bot if the application is
not careful enough.

The current form the patch is, is based on a lengthy discussion
between secteam@ and re@ and we did thought about other alternatives,
like using a wrapper around chroot(2) and contain everything in it, or
check permissions on certain "important" files, etc.  These would
require changes to chroot(2) semantics which could break existing
installations and the outcome could be quite silent which eventually
results in this.

Cheers,
- -- 
Xin LI https://www.delphij.net/
FreeBSD - The Power to Serve!   Live free or die
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.18 (FreeBSD)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk701LcACgkQOfuToMruuMAoqACgiDXP636IAhXnEpa54UBQa9SW
2ncAnRulYPS4+BtqizIP2BEiu4bhmJss
=C2U1
-END PGP SIGNATURE-
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r228843 - head/contrib/telnet/libtelnet head/crypto/heimdal/appl/telnet/libtelnet head/include head/lib/libc/gen head/lib/libc/iconv head/lib/libc/include head/lib/libc/net head/libexe

[Xin LI]

On Fri, Dec 23, 2011 at 4:19 PM, Doug Barton  wrote:
> On 12/23/2011 10:42, Alexander Kabaev wrote:
>> On Fri, 23 Dec 2011 20:29:59 +0200
>> Kostik Belousov  wrote:
>>
>>> On Fri, Dec 23, 2011 at 01:20:34PM -0500, Alexander Kabaev wrote:
>>>> On Fri, 23 Dec 2011 19:51:43 +0200
>>>> Kostik Belousov  wrote:
>>>>
>>>>> On Fri, Dec 23, 2011 at 12:06:44PM -0500, Alexander Kabaev wrote:
>>>>>> On Fri, 23 Dec 2011 11:22:34 -0500
>>>>>> John Baldwin  wrote:
>>>>>>
>>>>>>> On Friday, December 23, 2011 10:58:46 am John Baldwin wrote:
>>>>>>>> On Friday, December 23, 2011 10:00:38 am Colin Percival
>>>>>>>> wrote:
>>>>>>>>> Author: cperciva
>>>>>>>>> Date: Fri Dec 23 15:00:37 2011
>>>>>>>>> New Revision: 228843
>>>>>>>>> URL: http://svn.freebsd.org/changeset/base/228843
>>>>>>>>>
>>>>>>>>> Log:
>>>>>>>>>   Fix a problem whereby a corrupt DNS record can cause
>>>>>>>>> named to crash. [11:06]
>>>>>>>>>   Add an API for alerting internal libc routines to the
>>>>>>>>> presence of "unsafe" paths post-chroot, and use it in
>>>>>>>>> ftpd. [11:07]
>>>>>>>>
>>>>>>>> Eh, the whole libc_dlopen() thing looks like a gross hack
>>>>>>>> (and who came up with that weird symbol name for a public
>>>>>>>> API). Is it really even needed given the other fix to
>>>>>>>> have ftpd drop privilege before execing a helper program?
>>>>>>>> I guess the main reason I don't like it is it doesn't do
>>>>>>>> anything to address the more general problem.  I would have
>>>>>>>> expected instead something to restrict dlopen() entirely
>>>>>>>> including from other libraries than just libc in certain
>>>>>>>> circumstances.
>>>>>>>
>>>>>>> At the very least if we feel that the libc_dlopen() thing is a
>>>>>>> temporary band-aid, we should move the new symbols into the
>>>>>>> private namespace so we can remove them once the better fix
>>>>>>> is in rather than being required to support them forever.
>>>>> libc_dlopen() is not exposed.
>>>>> The __FreeBSD_libc_enter_restricted_mode() is, and its name is
>>>>> ugly exactly to note the ugly intent. I do not see how the symbol
>>>>> can go int FBSDprivate_1.0 when it was supposed to be used by
>>>>> third-party applications.
>>>>>
>>>>> Putting this hack into rtld itself IMO has to wide consequences.
>>>>> For libc, we can enumerate the points that stop work after the
>>>>> call, but for the generic applications the consequences are
>>>>> undefined.
>>>>>>>
>>>>>>> --
>>>>>>> John Baldwin
>>>>>>
>>>>>> Pardon for not catching that when I had a chance to influence
>>>>>> the outcome, but I would like to voice my support to tucking the
>>>>>> ugliness into private version namespace.
>>>>>>
>>>>>> --
>>>>>> Alexander Kabaev
>>>>>
>>>> Putting symbol into official namespace implies that we are willing
>>>> to provide and maintain it forever, which I do not think was the
>>>> intent for the function in question. FBSD_PRIVATE says nothing
>>>> about who should and should not link to it, only the level of API
>>>> stability one has to expect in the end. If/when we have better
>>>> security mechanisms (capsicum?) available to users by default, this
>>>> should be ripped out with extreme prejudice.
>>>
>>> The API is offered as a solution to third-parties. Telling them to use
>>> the API that is known to be broken in future is wrong step for the
>>> project, IMO.
>>>
>>> I doubt that proftpd will 'go capsicum'.
>>
>> Then proftp will have to contend with being known security hazard.
>> Spamming every supported branch with the symbol that cries just to
>> support programs that chroot into arbitrary environments and trust
>> anything at all there is wrong step for the project. Committing to
>> support said symbol for all of the eternity is even bigger mistake.
>
> I agree with those that have concerns about this solution. It seems ugly
> and painful, and if the vulnerability is so fundamental to chroot and/or
> nsdispatch then it seems that more than ftp would be affected.

That's correct, this affects ALL applications that does chroot into a
hostile environment where /etc and /lib can be controlled by
unprivileged user, which is in my opinion fundamentally insecure in
the first place.

Cheers,
-- 
Xin LI  https://www.delphij.net/
FreeBSD - The Power to Serve! Live free or die
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r228843 - head/contrib/telnet/libtelnet head/crypto/heimdal/appl/telnet/libtelnet head/include head/lib/libc/gen head/lib/libc/iconv head/lib/libc/include head/lib/libc/net head/libexe

[Xin LI]

On Sat, Dec 24, 2011 at 2:05 AM, Andrey Chernov  wrote:
> On Fri, Dec 23, 2011 at 07:51:43PM +0200, Kostik Belousov wrote:
>> The __FreeBSD_libc_enter_restricted_mode() is, and its name is ugly
>> exactly to note the ugly intent. I do not see how the symbol can go
>
> There must be no ugly intents and names. This whole idea just proves yet
> one our @secteam ugliness.
>
> There must be ischroot(2) the same way we already have issetugid(2).

chroot(2) can create legitimate and secure environment where dlopen(2)
is safe and necessary.

Cheers,
-- 
Xin LI  https://www.delphij.net/
FreeBSD - The Power to Serve! Live free or die
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r228843 - head/contrib/telnet/libtelnet head/crypto/heimdal/appl/telnet/libtelnet head/include head/lib/libc/gen head/lib/libc/iconv head/lib/libc/include head/lib/libc/net head/libexe

[Xin LI]

On Sat, Dec 24, 2011 at 2:39 AM, Andrey Chernov  wrote:
> On Sat, Dec 24, 2011 at 02:26:20AM -0800, Xin LI wrote:
>> chroot(2) can create legitimate and secure environment where dlopen(2)
>> is safe and necessary.
>
> Yes, so ischroot() check can be used only into that places where libc's
> libc_dlopen() currently used, i.e. placed into libc_dlopen() itself.

So it's Okay to break NSS in chroot jail?

Cheers,
-- 
Xin LI  https://www.delphij.net/
FreeBSD - The Power to Serve! Live free or die
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r228843 - head/contrib/telnet/libtelnet head/crypto/heimdal/appl/telnet/libtelnet head/include head/lib/libc/gen head/lib/libc/iconv head/lib/libc/include head/lib/libc/net head/libexe

[Xin LI]

2011/12/24 Edward Tomasz Napierała :
> Wiadomość napisana przez Andrey Chernov w dniu 24 gru 2011, o godz. 11:50:
>> On Sat, Dec 24, 2011 at 02:45:21AM -0800, Xin LI wrote:
>>> On Sat, Dec 24, 2011 at 2:39 AM, Andrey Chernov  wrote:
>>>> On Sat, Dec 24, 2011 at 02:26:20AM -0800, Xin LI wrote:
>>>>> chroot(2) can create legitimate and secure environment where dlopen(2)
>>>>> is safe and necessary.
>>>>
>>>> Yes, so ischroot() check can be used only into that places where libc's
>>>> libc_dlopen() currently used, i.e. placed into libc_dlopen() itself.
>>>
>>> So it's Okay to break NSS in chroot jail?
>>
>> We need general solution. We simple can't count all possible and future
>> ftpd's arround the world and insert __FreeBSD_libc_enter_restricted_mode()
>> into them. I even not mention other programs that may use chroot() too. If
>> some component like auth is critical for chroot, it should be restricted
>> in general scope.
>
> How about adding a check in dlopen(3) to make sure the file being opened
> is owned either by us (getuid(3)) or root and is not writable by anyone else?

Won't work because the binary might be run by privileged but chroot
user.  Again, this is the first proposal that we have considered.

Cheers,
-- 
Xin LI  https://www.delphij.net/
FreeBSD - The Power to Serve! Live free or die
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r228894 - vendor/netcat/dist

[Xin LI]

Author: delphij
Date: Mon Dec 26 08:59:17 2011
New Revision: 228894
URL: http://svn.freebsd.org/changeset/base/228894

Log:
  Import nc from OpenBSD 5.0.

Modified:
  vendor/netcat/dist/netcat.c

Modified: vendor/netcat/dist/netcat.c
==
--- vendor/netcat/dist/netcat.c Mon Dec 26 08:21:29 2011(r228893)
+++ vendor/netcat/dist/netcat.c Mon Dec 26 08:59:17 2011(r228894)
@@ -1,4 +1,4 @@
-/* $OpenBSD: netcat.c,v 1.100 2011/01/09 22:16:46 jeremy Exp $ */
+/* $OpenBSD: netcat.c,v 1.101 2011/06/21 17:31:07 mikeb Exp $ */
 /*
  * Copyright (c) 2001 Eric Jackson 
  *
@@ -552,7 +552,7 @@ remote_connect(const char *host, const c
continue;
 
if (rtableid) {
-   if (setsockopt(s, IPPROTO_IP, SO_RTABLE, &rtableid,
+   if (setsockopt(s, SOL_SOCKET, SO_RTABLE, &rtableid,
sizeof(rtableid)) == -1)
err(1, "setsockopt SO_RTABLE");
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r228895 - vendor/netcat/5.0

[Xin LI]

Author: delphij
Date: Mon Dec 26 09:03:28 2011
New Revision: 228895
URL: http://svn.freebsd.org/changeset/base/228895

Log:
  Tag nc from OpenBSD 5.0.

Added:
  vendor/netcat/5.0/
 - copied from r228894, vendor/netcat/dist/
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r228896 - head/contrib/netcat

[Xin LI]

Author: delphij
Date: Mon Dec 26 09:07:08 2011
New Revision: 228896
URL: http://svn.freebsd.org/changeset/base/228896

Log:
  Merge from OpenBSD 5.0 (this is a dummy change, the vendor change does not
  apply to us).

Modified:
  head/contrib/netcat/netcat.c
Directory Properties:
  head/contrib/netcat/   (props changed)

Modified: head/contrib/netcat/netcat.c
==
--- head/contrib/netcat/netcat.cMon Dec 26 09:03:28 2011
(r228895)
+++ head/contrib/netcat/netcat.cMon Dec 26 09:07:08 2011
(r228896)
@@ -1,4 +1,4 @@
-/* $OpenBSD: netcat.c,v 1.100 2011/01/09 22:16:46 jeremy Exp $ */
+/* $OpenBSD: netcat.c,v 1.101 2011/06/21 17:31:07 mikeb Exp $ */
 /*
  * Copyright (c) 2001 Eric Jackson 
  *
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r228910 - head/lib/libc/sys

[Xin LI]

Author: delphij
Date: Tue Dec 27 10:34:00 2011
New Revision: 228910
URL: http://svn.freebsd.org/changeset/base/228910

Log:
  Update rtprio(2) manual page to reflect the latest changes in -CURRENT as
  well as provide documentation for rtprio_thread(2) system call.
  
  MFC after:1 month
  X-MFC-after:  r228470

Modified:
  head/lib/libc/sys/Makefile.inc
  head/lib/libc/sys/rtprio.2

Modified: head/lib/libc/sys/Makefile.inc
==
--- head/lib/libc/sys/Makefile.inc  Tue Dec 27 10:21:57 2011
(r228909)
+++ head/lib/libc/sys/Makefile.inc  Tue Dec 27 10:34:00 2011
(r228910)
@@ -188,6 +188,7 @@ MLINKS+=read.2 pread.2 read.2 preadv.2 r
 MLINKS+=readlink.2 readlinkat.2
 MLINKS+=recv.2 recvfrom.2 recv.2 recvmsg.2
 MLINKS+=rename.2 renameat.2
+MLINKS+=rtprio.2 rtprio_thread.2
 .if !defined(NO_P1003_1B)
 MLINKS+=sched_get_priority_max.2 sched_get_priority_min.2 \
sched_get_priority_max.2 sched_rr_get_interval.2

Modified: head/lib/libc/sys/rtprio.2
==
--- head/lib/libc/sys/rtprio.2  Tue Dec 27 10:21:57 2011(r228909)
+++ head/lib/libc/sys/rtprio.2  Tue Dec 27 10:34:00 2011(r228910)
@@ -1,3 +1,4 @@
+.\"-
 .\" Copyright (c) 1994, Henrik Vestergaard Draboel
 .\" All rights reserved.
 .\"
@@ -26,15 +27,40 @@
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
+.\"-
+.\" Copyright (c) 2011 Xin LI 
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"notice, this list of conditions and the following disclaimer in the
+.\"documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 23, 1994
+.Dd December 27, 2011
 .Dt RTPRIO 2
 .Os
 .Sh NAME
-.Nm rtprio
-.Nd examine or modify a process realtime or idle priority
+.Nm rtprio ,
+.Nm rtprio_thread
+.Nd examine or modify realtime or idle priority
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
@@ -42,11 +68,18 @@
 .In sys/rtprio.h
 .Ft int
 .Fn rtprio "int function" "pid_t pid" "struct rtprio *rtp"
+.Ft int
+.Fn rtprio_thread "int function" "lwpid_t lwpid" "struct rtprio *rtp"
 .Sh DESCRIPTION
 The
 .Fn rtprio
 system call
-is used to lookup or change the realtime or idle priority of a process.
+is used to lookup or change the realtime or idle priority of a process,
+or the calling thread.
+The
+.Fn rtprio_thread
+system call
+is used to lookup or change the realtime or idle priority of a thread.
 .Pp
 The
 .Fa function
@@ -54,10 +87,31 @@ argument
 specifies the operation to be performed.
 RTP_LOOKUP to lookup the current priority,
 and RTP_SET to set the priority.
-The
+.Pp
+For the
+.Fn rtprio
+system call,
+the
 .Fa pid
 argument
-specifies the process to be used, 0 for the current process.
+specifies the process to operate on,
+0 for the calling thread.
+When
+.Fa pid
+is non-zero,
+the system call reports the highest priority in the process,
+or sets all threads' priority in the process,
+depending on value of the
+.Fa function
+argument.
+.Pp
+For the
+.Fn rtprio_thread
+system call,
+the
+.Fa lwpid
+specifies the thread to operate on,
+0 for the calling thread.
 .Pp
 The
 .Fa *rtp
@@ -83,12 +137,12 @@ field ranges between 0 and
 .Pp
 Realtime and idle priority is inherited through fork() and exec().
 .Pp
-A realtime process can only be preempted by a process of equal or
-higher priority, or by an interrupt; idle priority processes will run only

svn commit: r228917 - head/usr.sbin/rtprio

[Xin LI]

Author: delphij
Date: Tue Dec 27 20:03:57 2011
New Revision: 228917
URL: http://svn.freebsd.org/changeset/base/228917

Log:
   - Fail when the utility is not invoked as rtprio nor idprio.
   - use warnx() to tell the user whether a process is running in normal,
 idle or realtime priority. with the old code it would have been possible
 for another process to send data to stdout between
printf("%s: ", p);
 and
printf("* priority\n");
 and thus break the formatting.
   - 'rtprio 10 -0' triggeres non-intuitive behavior.  It would first set the
 priority of itself to 10 *and* would then try to execute '-0'. Of course,
 setting the priority of [id|rt]prio itself doesn't make a lot of sense,
 but it is intuitive compared to the previous behavior.
   - 'rtprio -t --1' will actually pass over the '-1' to rtprio().  Now
 invoking rtprio like this will catch the wrong usage before passing
 over the invalid argument to rtprio().
   - Garrett Cooper suggested to add further diagnostics where the failure
 occures, if execvp fails.
  
  PR:   bin/154042
  Submitted by: arundel
  MFC after:1 month

Modified:
  head/usr.sbin/rtprio/rtprio.c

Modified: head/usr.sbin/rtprio/rtprio.c
==
--- head/usr.sbin/rtprio/rtprio.c   Tue Dec 27 15:59:51 2011
(r228916)
+++ head/usr.sbin/rtprio/rtprio.c   Tue Dec 27 20:03:57 2011
(r228917)
@@ -53,20 +53,17 @@ int
 main(int argc, char *argv[])
 {
struct rtprio rtp;
-   char *p;
-   pid_t proc;
+   const char *progname;
+   pid_t proc = 0;
 
-   /* find basename */
-   if ((p = rindex(argv[0], '/')) == NULL)
-   p = argv[0];
-   else
-   ++p;
-   proc = 0;
+   progname = getprogname();
 
-   if (!strcmp(p, "rtprio"))
+   if (strcmp(progname, "rtprio") == 0)
rtp.type = RTP_PRIO_REALTIME;
-   else if (!strcmp(p, "idprio"))
+   else if (strcmp(progname, "idprio") == 0)
rtp.type = RTP_PRIO_IDLE;
+   else
+   errx(1, "invalid progname");
 
switch (argc) {
case 2:
@@ -76,20 +73,19 @@ main(int argc, char *argv[])
case 1:
if (rtprio(RTP_LOOKUP, proc, &rtp) != 0)
err(1, "RTP_LOOKUP");
-   printf("%s: ", p);
switch (rtp.type) {
case RTP_PRIO_REALTIME:
case RTP_PRIO_FIFO:
-   printf("realtime priority %d\n", rtp.prio);
+   warnx("realtime priority %d", rtp.prio);
break;
case RTP_PRIO_NORMAL:
-   printf("normal priority\n");
+   warnx("normal priority");
break;
case RTP_PRIO_IDLE:
-   printf("idle priority %d\n", rtp.prio);
+   warnx("idle priority %d", rtp.prio);
break;
default:
-   printf("invalid priority type %d\n", rtp.type);
+   errx(1, "invalid priority type %d", rtp.type);
break;
}
exit(0);
@@ -110,18 +106,18 @@ main(int argc, char *argv[])
break;
}
 
-   if (argv[2][0] == '-')
-   proc = parseint(argv[2] + 1, "pid");
-   if (rtprio(RTP_SET, proc, &rtp) != 0)
-   err(1, "RTP_SET");
-
-   if (proc == 0) {
+   if (argv[2][0] == '-') {
+   proc = parseint(argv[2], "pid");
+   proc = abs(proc);
+   if (rtprio(RTP_SET, proc, &rtp) != 0)
+   err(1, "RTP_SET");
+   } else {
execvp(argv[2], &argv[2]);
-   err(1, "%s", argv[2]);
+   err(1, "execvp: %s", argv[2]);
}
exit(0);
}
-   exit(1);
+   /* NOTREACHED */
 }
 
 static int
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r228924 - head/include

[Xin LI]

Author: delphij
Date: Wed Dec 28 05:35:33 2011
New Revision: 228924
URL: http://svn.freebsd.org/changeset/base/228924

Log:
  In POSIX.1-2008:
  
  P_tmpdir [OB XSI]  Default directory prefix for tempnam().
  
  This macro is used in a lot of places in legacy applications,
  and is why we see a lot of programs written for e.g. Linux
  store volatile temporary files in /var/tmp and not /tmp.
  
  MFC after:2 months

Modified:
  head/include/stdio.h

Modified: head/include/stdio.h
==
--- head/include/stdio.hTue Dec 27 23:53:00 2011(r228923)
+++ head/include/stdio.hWed Dec 28 05:35:33 2011(r228924)
@@ -205,7 +205,7 @@ __END_DECLS
 
 /* System V/ANSI C; this is the wrong way to do this, do *not* use these. */
 #if __XSI_VISIBLE
-#defineP_tmpdir"/var/tmp/"
+#defineP_tmpdir"/tmp/"
 #endif
 #defineL_tmpnam1024/* XXX must be == PATH_MAX */
 #defineTMP_MAX 308915776
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r228940 - in head: share/man/man4 sys/amd64/conf sys/conf sys/dev/hpt27xx sys/i386/conf sys/modules sys/modules/hpt27xx

[Xin LI]

 the following SAS
+controllers:
+.Pp
+.Bl -bullet -compact
+.It
+HighPoint's RocketRAID 271x series
+.It
+HighPoint's RocketRAID 272x series
+.It
+HighPoint's RocketRAID 274x series
+.It
+HighPoint's RocketRAID 276x series
+.It
+HighPoint's RocketRAID 278x series
+.El
+.Sh NOTES
+The
+.Nm
+driver only works on the i386 and amd64 platforms as it requires a binary
+blob object from the manufacturer which they only supply for these platforms.
+The
+.Nm
+driver does
+.Em not
+work on i386 with
+.Xr pae 4
+enabled.
+.Sh SEE ALSO
+.Xr kld 4 ,
+.Xr kldload 8 ,
+.Xr loader 8
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Fx 10.0 .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+device driver was written by
+.An HighPoint Technologies, Inc. .
+This manual page was written by
+.An Xin LI Aq delp...@freebsd.org
+for iXsystems, Inc.

Modified: head/sys/amd64/conf/NOTES
==
--- head/sys/amd64/conf/NOTES   Wed Dec 28 22:49:28 2011(r228939)
+++ head/sys/amd64/conf/NOTES   Wed Dec 28 23:26:58 2011(r228940)
@@ -388,6 +388,10 @@ device aac
 device aacp# SCSI Passthrough interface (optional, CAM required)
 
 #
+# Highpoint RocketRAID 27xx.
+device hpt27xx
+
+#
 # Highpoint RocketRAID 182x.
 device hptmv
 

Modified: head/sys/conf/files.amd64
==
--- head/sys/conf/files.amd64   Wed Dec 28 22:49:28 2011(r228939)
+++ head/sys/conf/files.amd64   Wed Dec 28 23:26:58 2011(r228940)
@@ -58,6 +58,10 @@ os+%DIKED-nve.h  optionalnve pci 
\
no-implicit-rule no-obj before-depend   \
clean   "os+%DIKED-nve.h"
 #
+hpt27xx_lib.o  optionalhpt27xx \
+   dependency  "$S/dev/hpt27xx/amd64-elf.hpt27xx_lib.o.uu" \
+   compile-with"uudecode < $S/dev/hpt27xx/amd64-elf.hpt27xx_lib.o.uu" \
+   no-implicit-rule
 hptmvraid.ooptionalhptmv   \
dependency  "$S/dev/hptmv/amd64-elf.raid.o.uu"  \
compile-with"uudecode < $S/dev/hptmv/amd64-elf.raid.o.uu" \
@@ -187,6 +191,9 @@ dev/fdc/fdc.c   optionalfdc
 dev/fdc/fdc_acpi.c optionalfdc
 dev/fdc/fdc_isa.c  optionalfdc isa
 dev/fdc/fdc_pccard.c   optionalfdc pccard
+dev/hpt27xx/os_bsd.c   optionalhpt27xx
+dev/hpt27xx/osm_bsd.c  optionalhpt27xx
+dev/hpt27xx/hpt27xx_config.c   optionalhpt27xx
 dev/hptmv/entry.c  optionalhptmv
 dev/hptmv/mv.c optionalhptmv
 dev/hptmv/gui_lib.coptionalhptmv

Modified: head/sys/conf/files.i386
==
--- head/sys/conf/files.i386Wed Dec 28 22:49:28 2011(r228939)
+++ head/sys/conf/files.i386Wed Dec 28 23:26:58 2011(r228940)
@@ -57,6 +57,10 @@ os+%DIKED-nve.h  optionalnve pci 
\
no-implicit-rule no-obj before-depend   \
clean   "os+%DIKED-nve.h"
 #
+hpt27xx_lib.o  optionalhpt27xx \
+   dependency  "$S/dev/hpt27xx/i386-elf.hpt27xx_lib.o.uu"  \
+   compile-with"uudecode < $S/dev/hpt27xx/i386-elf.hpt27xx_lib.o.uu" \
+   no-implicit-rule
 hptmvraid.ooptionalhptmv   \
dependency  "$S/dev/hptmv/i386-elf.raid.o.uu"   \
compile-with"uudecode < $S/dev/hptmv/i386-elf.raid.o.uu"\
@@ -174,6 +178,9 @@ dev/fe/if_fe_isa.c  optional fe isa
 dev/glxiic/glxiic.coptional glxiic
 dev/glxsb/glxsb.c  optional glxsb
 dev/glxsb/glxsb_hash.c optional glxsb
+dev/hpt27xx/os_bsd.c   optional hpt27xx
+dev/hpt27xx/osm_bsd.c  optional hpt27xx
+dev/hpt27xx/hpt27xx_config.c   optional hpt27xx
 dev/hptmv/entry.c  optional hptmv
 dev/hptmv/mv.c optional hptmv
 dev/hptmv/gui_lib.coptional hptmv

Added: head/sys/dev/hpt27xx/README
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/dev/hpt27xx/README Wed Dec 28 23:26:58 2011(r228940)
@@ -0,0 +1,196 @@
+RocketRAID Controller Driver for FreeBSD
+Copyright (C) 2011 HighPoint Technologies, Inc. All rights reserved.
+
+#
+Revision History:
+   v1.0 2011-12-27
+First source code release
+
+###

svn commit: r229381 - in stable: 8/etc/defaults 8/etc/periodic/daily 9/etc/defaults 9/etc/periodic/daily

[Xin LI]

Author: delphij
Date: Tue Jan  3 10:22:09 2012
New Revision: 229381
URL: http://svn.freebsd.org/changeset/base/229381

Log:
  MFC r226471 (se):
  
  Add missing default values for daily/800.scrub-zfs for documentation
  purposes. No functional change, since all parameters are set to their
  default values.
  
  MFC r226865 (delphij):
  
  Increase default scrub threshold from 30 days to 5 weeks.  Using
  whole weeks makes it easier to predicate when the scrub would
  happen.
  
  Requested by: gjb

Modified:
  stable/9/etc/defaults/periodic.conf
  stable/9/etc/periodic/daily/800.scrub-zfs
Directory Properties:
  stable/9/etc/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/8/etc/defaults/periodic.conf
  stable/8/etc/periodic/daily/800.scrub-zfs
Directory Properties:
  stable/8/etc/   (props changed)

Modified: stable/9/etc/defaults/periodic.conf
==
--- stable/9/etc/defaults/periodic.conf Tue Jan  3 10:02:44 2012
(r229380)
+++ stable/9/etc/defaults/periodic.conf Tue Jan  3 10:22:09 2012
(r229381)
@@ -147,6 +147,12 @@ daily_status_pkg_changes_enable="NO"   
#
 daily_queuerun_enable="YES"# Run mail queue
 daily_submit_queuerun="YES"# Also submit queue
 
+# 800.scrub-zfs
+daily_scrub_zfs_enable="NO"
+daily_scrub_zfs_pools=""   # empty string selects all pools
+daily_scrub_zfs_default_threshold="35" # days between scrubs
+#daily_scrub_zfs_${poolname}_threshold="35"# pool specific threshold
+
 # 999.local
 daily_local="/etc/daily.local" # Local scripts
 

Modified: stable/9/etc/periodic/daily/800.scrub-zfs
==
--- stable/9/etc/periodic/daily/800.scrub-zfs   Tue Jan  3 10:02:44 2012
(r229380)
+++ stable/9/etc/periodic/daily/800.scrub-zfs   Tue Jan  3 10:22:09 2012
(r229381)
@@ -15,7 +15,7 @@ then
 source_periodic_confs
 fi
 
-: ${daily_scrub_zfs_default_threshold=30}
+: ${daily_scrub_zfs_default_threshold=35}
 
 case "$daily_scrub_zfs_enable" in
 [Yy][Ee][Ss])
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229381 - in stable: 8/etc/defaults 8/etc/periodic/daily 9/etc/defaults 9/etc/periodic/daily

[Xin LI]

Author: delphij
Date: Tue Jan  3 10:22:09 2012
New Revision: 229381
URL: http://svn.freebsd.org/changeset/base/229381

Log:
  MFC r226471 (se):
  
  Add missing default values for daily/800.scrub-zfs for documentation
  purposes. No functional change, since all parameters are set to their
  default values.
  
  MFC r226865 (delphij):
  
  Increase default scrub threshold from 30 days to 5 weeks.  Using
  whole weeks makes it easier to predicate when the scrub would
  happen.
  
  Requested by: gjb

Modified:
  stable/8/etc/defaults/periodic.conf
  stable/8/etc/periodic/daily/800.scrub-zfs
Directory Properties:
  stable/8/etc/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/9/etc/defaults/periodic.conf
  stable/9/etc/periodic/daily/800.scrub-zfs
Directory Properties:
  stable/9/etc/   (props changed)

Modified: stable/8/etc/defaults/periodic.conf
==
--- stable/8/etc/defaults/periodic.conf Tue Jan  3 10:02:44 2012
(r229380)
+++ stable/8/etc/defaults/periodic.conf Tue Jan  3 10:22:09 2012
(r229381)
@@ -144,6 +144,12 @@ daily_status_ntpd_enable="NO"  
# Check
 daily_queuerun_enable="YES"# Run mail queue
 daily_submit_queuerun="YES"# Also submit queue
 
+# 800.scrub-zfs
+daily_scrub_zfs_enable="NO"
+daily_scrub_zfs_pools=""   # empty string selects all pools
+daily_scrub_zfs_default_threshold="35" # days between scrubs
+#daily_scrub_zfs_${poolname}_threshold="35"# pool specific threshold
+
 # 999.local
 daily_local="/etc/daily.local" # Local scripts
 

Modified: stable/8/etc/periodic/daily/800.scrub-zfs
==
--- stable/8/etc/periodic/daily/800.scrub-zfs   Tue Jan  3 10:02:44 2012
(r229380)
+++ stable/8/etc/periodic/daily/800.scrub-zfs   Tue Jan  3 10:22:09 2012
(r229381)
@@ -15,7 +15,7 @@ then
 source_periodic_confs
 fi
 
-: ${daily_scrub_zfs_default_threshold=30}
+: ${daily_scrub_zfs_default_threshold=35}
 
 case "$daily_scrub_zfs_enable" in
 [Yy][Ee][Ss])
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229416 - head/sys/dev/tws

[Xin LI]

Author: delphij
Date: Tue Jan  3 20:17:35 2012
New Revision: 229416
URL: http://svn.freebsd.org/changeset/base/229416

Log:
  Don't forget to release queue lock when allocation of memory failed.
  
  Submitted by: Sascha Wildner 
  Obtained from:DragonFly
  MFC after:2 weeks

Modified:
  head/sys/dev/tws/tws.c

Modified: head/sys/dev/tws/tws.c
==
--- head/sys/dev/tws/tws.c  Tue Jan  3 19:47:32 2012(r229415)
+++ head/sys/dev/tws/tws.c  Tue Jan  3 20:17:35 2012(r229416)
@@ -685,6 +685,7 @@ tws_init_reqs(struct tws_softc *sc, u_in
 {
 if (bus_dmamap_create(sc->data_tag, 0, &sc->reqs[i].dma_map)) {
 /* log a ENOMEM failure msg here */
+   mtx_unlock(&sc->q_lock);
 return(FAILURE);
 } 
 sc->reqs[i].cmd_pkt =  &cmd_buf[i];
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r229459 - head/lib/libc/sys

[Xin LI]

Author: delphij
Date: Wed Jan  4 02:04:20 2012
New Revision: 229459
URL: http://svn.freebsd.org/changeset/base/229459

Log:
  Document the fact that chroot(2) is no longer part of POSIX since SUSv3
  and add a SECURITY CONSIDERATIONS section for recommended practices.

Modified:
  head/lib/libc/sys/chroot.2

Modified: head/lib/libc/sys/chroot.2
==
--- head/lib/libc/sys/chroot.2  Wed Jan  4 02:03:15 2012(r229458)
+++ head/lib/libc/sys/chroot.2  Wed Jan  4 02:04:20 2012(r229459)
@@ -28,7 +28,7 @@
 .\" @(#)chroot.2   8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd June 4, 1993
+.Dd January 3, 2012
 .Dt CHROOT 2
 .Os
 .Sh NAME
@@ -134,9 +134,27 @@ The
 .Fn chroot
 system call appeared in
 .Bx 4.2 .
+It was marked as
+.Dq legacy
+in
+.St -susv2 ,
+and was removed in subsequent standards.
 .Sh BUGS
 If the process is able to change its working directory to the target
 directory, but another access control check fails (such as a check for
 open directories, or a MAC check), it is possible that this system
 call may return an error, with the working directory of the process
 left changed.
+.Sh SECURITY CONSIDERATIONS
+The system have many hardcoded paths to files where it may load after
+the process starts.
+It is generally recommended to drop privileges immediately after a
+successful
+.Nm
+call,
+and restrict write access to a limited subtree of the
+.Nm
+root,
+for instance,
+setup the sandbox so that the sandboxed user will have no write
+access to any well-known system directories.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r214854 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Xin LI]

Author: delphij
Date: Fri Nov  5 22:18:09 2010
New Revision: 214854
URL: http://svn.freebsd.org/changeset/base/214854

Log:
  Validate whether the zfs_cmd_t submitted from userland is not smaller than
  what we have.  Without the check the kernel could accessing memory that
  does not belong to the request struct.
  
  Note that we do not test if the struct equals in size at this time, which
  may faciliate forward compatibility with newer binaries.
  
  Reviewed by:  pjd at MeetBSD CA '2010
  MFC after:1 week

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Fri Nov 
 5 21:47:58 2010(r214853)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Fri Nov 
 5 22:18:09 2010(r214854)
@@ -3627,6 +3627,14 @@ zfsdev_ioctl(struct cdev *dev, u_long cm
uint_t vec;
int error;
 
+   /*
+* Check if we have sufficient kernel memory allocated
+* for the zfs_cmd_t request.  Bail out if not so we
+* will not access undefined memory region.
+*/
+   if (IOCPARM_LEN(cmd) < sizeof(zfs_cmd_t))
+   return (EINVAL);
+
vec = ZFS_IOC(cmd);
 
if (vec >= sizeof (zfs_ioc_vec) / sizeof (zfs_ioc_vec[0]))
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r214857 - head/contrib/top

[Xin LI]

Author: delphij
Date: Sat Nov  6 03:59:21 2010
New Revision: 214857
URL: http://svn.freebsd.org/changeset/base/214857

Log:
  Inverse display of top(1)'s table header when running in inactive mode.
  
  MFC after:2 weeks

Modified:
  head/contrib/top/display.c
  head/contrib/top/top.h

Modified: head/contrib/top/display.c
==
--- head/contrib/top/display.c  Sat Nov  6 01:09:00 2010(r214856)
+++ head/contrib/top/display.c  Sat Nov  6 03:59:21 2010(r214857)
@@ -694,7 +694,7 @@ char *text;
int width;
 
s = NULL;
-   width = display_width;
+   width = screen_width;
header_length = strlen(text);
if (header_length >= width) {
s = malloc((width + 1) * sizeof(char));
@@ -702,6 +702,14 @@ char *text;
return (NULL);
strncpy(s, text, width);
s[width] = '\0';
+   } else {
+   s = malloc((width + 1) * sizeof(char));
+   if (s == NULL)
+   return (NULL);
+   strncpy(s, text, width);
+   while (screen_width > header_length)
+   s[header_length++] = ' ';
+   s[width] = '\0';
}
return (s);
 }
@@ -726,7 +734,7 @@ char *text;
 if (header_status == ON)
 {
putchar('\n');
-   fputs(text, stdout);
+   standout(text, stdout);
lastline++;
 }
 else if (header_status == ERASE)

Modified: head/contrib/top/top.h
==
--- head/contrib/top/top.h  Sat Nov  6 01:09:00 2010(r214856)
+++ head/contrib/top/top.h  Sat Nov  6 03:59:21 2010(r214857)
@@ -14,7 +14,7 @@
 extern int Header_lines;   /* 7 */
 
 /* Maximum number of columns allowed for display */
-#define MAX_COLS   128
+#define MAX_COLS   512
 
 /* Log base 2 of 1024 is 10 (2^10 == 1024) */
 #define LOG102410
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r214911 - stable/8/etc/periodic/security

[Xin LI]

Author: delphij
Date: Sun Nov  7 11:39:48 2010
New Revision: 214911
URL: http://svn.freebsd.org/changeset/base/214911

Log:
  Revert r214897 in order to finish the merge properly without stopping
  svn2cvs.
  
  Pointy hat to:delphij

Deleted:
  stable/8/etc/periodic/security/460.chkportsum
Modified:
  stable/8/etc/periodic/security/Makefile

Modified: stable/8/etc/periodic/security/Makefile
==
--- stable/8/etc/periodic/security/Makefile Sun Nov  7 11:12:30 2010
(r214910)
+++ stable/8/etc/periodic/security/Makefile Sun Nov  7 11:39:48 2010
(r214911)
@@ -6,7 +6,6 @@ FILES=  100.chksetuid \
200.chkmounts \
300.chkuid0 \
400.passwdless \
-   460.chkportsum \
410.logincheck \
700.kernelmsg \
800.loginfail \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r214912 - in stable/8/etc: defaults periodic/security

[Xin LI]

Author: delphij
Date: Sun Nov  7 11:51:57 2010
New Revision: 214912
URL: http://svn.freebsd.org/changeset/base/214912

Log:
  Redo r214897:
  
  MFC r211141 (gabor)
  
  - Fixes to the chkportsum script to handle better some special cases,
like spaces in filename
  
  Submitted by:   Alex Kozlov 
  
  MFC r210254 (gabor)
  
  - Add a periodic script, which can be used to find installed ports' files with
mismatched checksum
  
  PR: conf/124641
  Submitted by:   Alex Kozlov 

Added:
  stable/8/etc/periodic/security/460.chkportsum
 - copied, changed from r210254, head/etc/periodic/security/460.chkportsum
Modified:
  stable/8/etc/defaults/periodic.conf
  stable/8/etc/periodic/security/Makefile
Directory Properties:
  stable/8/etc/periodic/security/   (props changed)

Modified: stable/8/etc/defaults/periodic.conf
==
--- stable/8/etc/defaults/periodic.conf Sun Nov  7 11:39:48 2010
(r214911)
+++ stable/8/etc/defaults/periodic.conf Sun Nov  7 11:51:57 2010
(r214912)
@@ -171,6 +171,9 @@ daily_status_security_passwdless_enable=
 # 410.logincheck
 daily_status_security_logincheck_enable="YES"
 
+# 460.chkportsum
+daily_status_security_chkportsum_enable="NO"   # Check ports w/ wrong checksum
+
 # 500.ipfwdenied
 daily_status_security_ipfwdenied_enable="YES"
 

Copied and modified: stable/8/etc/periodic/security/460.chkportsum (from 
r210254, head/etc/periodic/security/460.chkportsum)
==
--- head/etc/periodic/security/460.chkportsum   Mon Jul 19 20:19:14 2010
(r210254, copy source)
+++ stable/8/etc/periodic/security/460.chkportsum   Sun Nov  7 11:51:57 
2010(r214912)
@@ -42,20 +42,20 @@ echo 'Checking for ports with mismatched
 
 case "${daily_status_security_chkportsum_enable}" in
[Yy][Ee][Ss])
+   set -f
pkg_info -ga 2>/dev/null | \
-   while read one two three; do
-   case ${one} in
+   while IFS= read -r line; do
+   set -- $line
+   case $1 in
Information)
-   case ${two} in
- for) name=${three%%:} ;;
-   *) name='??' ;;
+   case $2 in
+   for) name="${3%%:}" ;;
+   *) name='??' ;;
esac
;;
Mismatched|'') ;;
-   *)
-   if [ -n ${name} ]; then
-   echo ${name}: ${one}
-   fi
+   *) [ -n "${name}" ] &&
+   echo "${name}: ${line%% fails the original MD5 
checksum}"
;;
esac
done

Modified: stable/8/etc/periodic/security/Makefile
==
--- stable/8/etc/periodic/security/Makefile Sun Nov  7 11:39:48 2010
(r214911)
+++ stable/8/etc/periodic/security/Makefile Sun Nov  7 11:51:57 2010
(r214912)
@@ -7,6 +7,7 @@ FILES=  100.chksetuid \
300.chkuid0 \
400.passwdless \
410.logincheck \
+   460.chkportsum \
700.kernelmsg \
800.loginfail \
900.tcpwrap \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215045 - in head: etc/periodic/security tools/build/mk

[Xin LI]

Author: delphij
Date: Tue Nov  9 18:46:44 2010
New Revision: 215045
URL: http://svn.freebsd.org/changeset/base/215045

Log:
  Hide 460.chkportsum in MK_PKGTOOLS != no case.
  
  Submitted by: Alex Kozlov 
  MFC after:2 weeks

Modified:
  head/etc/periodic/security/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/etc/periodic/security/Makefile
==
--- head/etc/periodic/security/Makefile Tue Nov  9 18:46:09 2010
(r215044)
+++ head/etc/periodic/security/Makefile Tue Nov  9 18:46:44 2010
(r215045)
@@ -7,7 +7,6 @@ FILES=  100.chksetuid \
300.chkuid0 \
400.passwdless \
410.logincheck \
-   460.chkportsum \
700.kernelmsg \
800.loginfail \
900.tcpwrap \
@@ -28,4 +27,8 @@ FILES+=   500.ipfwdenied \
 FILES+=520.pfdenied
 .endif
 
+.if ${MK_PKGTOOLS} != "no"
+FILES+=460.chkportsum
+.endif
+
 .include 

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc   Tue Nov  9 18:46:09 
2010(r215044)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc   Tue Nov  9 18:46:44 
2010(r215045)
@@ -1790,6 +1790,7 @@ OLD_FILES+=usr/share/man/man8/tftp-proxy
 
 .if ${MK_PKGTOOLS} == no
 OLD_FILES+=etc/periodic/daily/490.status-pkg-changes
+OLD_FILES+=etc/periodic/security/460.chkportsum
 OLD_FILES+=etc/periodic/weekly/400.status-pkg
 OLD_FILES+=usr/include/pkg.h
 OLD_FILES+=usr/lib/libpkg.a
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215155 - in stable: 7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs 8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Xin LI]

Author: delphij
Date: Fri Nov 12 01:45:29 2010
New Revision: 215155
URL: http://svn.freebsd.org/changeset/base/215155

Log:
  MFC r214854:
  
  Validate whether the zfs_cmd_t submitted from userland is not smaller than
  what we have.  Without the check the kernel could accessing memory that
  does not belong to the request struct.
  
  Note that we do not test if the struct equals in size at this time, which
  may faciliate forward compatibility with newer binaries.

Modified:
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==
--- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Fri Nov 
12 01:40:29 2010(r215154)
+++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Fri Nov 
12 01:45:29 2010(r215155)
@@ -3621,6 +3621,14 @@ zfsdev_ioctl(struct cdev *dev, u_long cm
uint_t vec;
int error;
 
+   /*
+* Check if we have sufficient kernel memory allocated
+* for the zfs_cmd_t request.  Bail out if not so we
+* will not access undefined memory region.
+*/
+   if (IOCPARM_LEN(cmd) < sizeof(zfs_cmd_t))
+   return (EINVAL);
+
vec = ZFS_IOC(cmd);
 
if (vec >= sizeof (zfs_ioc_vec) / sizeof (zfs_ioc_vec[0]))
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215155 - in stable: 7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs 8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Xin LI]

Author: delphij
Date: Fri Nov 12 01:45:29 2010
New Revision: 215155
URL: http://svn.freebsd.org/changeset/base/215155

Log:
  MFC r214854:
  
  Validate whether the zfs_cmd_t submitted from userland is not smaller than
  what we have.  Without the check the kernel could accessing memory that
  does not belong to the request struct.
  
  Note that we do not test if the struct equals in size at this time, which
  may faciliate forward compatibility with newer binaries.

Modified:
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==
--- stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Fri Nov 
12 01:40:29 2010(r215154)
+++ stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Fri Nov 
12 01:45:29 2010(r215155)
@@ -2989,6 +2989,14 @@ zfsdev_ioctl(struct cdev *dev, u_long cm
uint_t vec;
int error;
 
+   /*
+* Check if we have sufficient kernel memory allocated
+* for the zfs_cmd_t request.  Bail out if not so we
+* will not access undefined memory region.
+*/
+   if (IOCPARM_LEN(cmd) < sizeof(zfs_cmd_t))
+   return (EINVAL);
+
vec = ZFS_IOC(cmd);
 
if (vec >= sizeof (zfs_ioc_vec) / sizeof (zfs_ioc_vec[0]))
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215234 - head/sys/dev/arcmsr

[Xin LI]

Author: delphij
Date: Sat Nov 13 08:58:36 2010
New Revision: 215234
URL: http://svn.freebsd.org/changeset/base/215234

Log:
  Update to vendor release 1.20.00.19.
  
  Bug fixes:
* Fixed "inquiry data fails comparion at DV1 step"
* Fixed bad range input in bus_alloc_resource for ADAPTER_TYPE_B
* Fixed arcmsr driver prevent arcsas support for Areca SAS HBA ARC13x0
  
  Many thanks to Areca for continuing to support FreeBSD.
  
  This commit is intended for MFC before 8.2-RELEASE.
  
  Submitted by:   Ching-Lung Huang 

Modified:
  head/sys/dev/arcmsr/arcmsr.c
  head/sys/dev/arcmsr/arcmsr.h

Modified: head/sys/dev/arcmsr/arcmsr.c
==
--- head/sys/dev/arcmsr/arcmsr.cSat Nov 13 06:07:39 2010
(r215233)
+++ head/sys/dev/arcmsr/arcmsr.cSat Nov 13 08:58:36 2010
(r215234)
@@ -38,29 +38,32 @@
 ** History
 **
 **REV# DATENAME DESCRIPTION
-** 1.00.00.003/31/2004Erich ChenFirst release
-** 1.20.00.02   11/29/2004 Erich Chenbug fix with 
arcmsr_bus_reset when PHY error
-** 1.20.00.034/19/2005 Erich Chenadd SATA 24 Ports 
adapter type support
+** 1.00.00.003/31/2004 Erich Chen   First 
release
+** 1.20.00.02   11/29/2004 Erich Chen   bug 
fix with arcmsr_bus_reset when PHY error
+** 1.20.00.034/19/2005 Erich Chen   add 
SATA 24 Ports adapter type support
 **   clean unused function
-** 1.20.00.129/12/2005 Erich Chenbug fix with abort 
command handling, 
+** 1.20.00.129/12/2005 Erich Chen   bug fix with 
abort command handling, 
 **   firmware version 
check 
 **   and firmware update 
notify for hardware bug fix
 **   handling if none zero 
high part physical address 
 **   of srb resource 
-** 1.20.00.138/18/2006 Erich Chenremove pending srb 
and report busy
+** 1.20.00.138/18/2006 Erich Chen   remove 
pending srb and report busy
 **   add iop message xfer 
 **   with scsi 
pass-through command
 **   add new device id of 
sas raid adapters 
 **   code fit for SPARC64 
& PPC 
-** 1.20.00.14   02/05/2007 Erich Chenbug fix for incorrect 
ccb_h.status report
+** 1.20.00.14   02/05/2007 Erich Chen   bug 
fix for incorrect ccb_h.status report
 **   and cause 
g_vfs_done() read write error
-** 1.20.00.15   10/10/2007 Erich Chensupport new RAID 
adapter type ARC120x
-** 1.20.00.16   10/10/2009 Erich ChenBug fix for RAID 
adapter type ARC120x
+** 1.20.00.15   10/10/2007 Erich Chen   
support new RAID adapter type ARC120x
+** 1.20.00.16   10/10/2009 Erich Chen   Bug 
fix for RAID adapter type ARC120x
 **   bus_dmamem_alloc() 
with BUS_DMA_ZERO
-** 1.20.00.17   07/15/2010 Ching Huang   Added support ARC1880
-**  report 
CAM_DEV_NOT_THERE instead of CAM_SEL_TIMEOUT when device failed,
-**  prevent 
cam_periph_error removing all LUN devices of one Target id
-**  for any one LUN device 
failed
+** 1.20.00.17  07/15/2010  Ching Huang 
 Added support ARC1880
+** 
 report CAM_DEV_NOT_THERE instead of 
CAM_SEL_TIMEOUT when device failed,
+** 
 prevent cam_periph_error removing all LUN 
devices of one Target id
+** 
 for any one LUN device failed
+**1.20.00.18   10/14/2010  Ching Huang 
 Fixed "inquiry data fails comparion at DV1 step"
+** 10/25/2010  Ching Huang 
 Fixed bad range input in bus_alloc_resource for ADAPTER_TYPE_B
+**1.20.00.1

svn commit: r215236 - in head: include lib/libc/gen

[Xin LI]

Author: delphij
Date: Sat Nov 13 10:38:06 2010
New Revision: 215236
URL: http://svn.freebsd.org/changeset/base/215236

Log:
  Sync with OpenBSD, primarily better signal and terminal handling.
  
  Obtained from:OpenBSD
  MFC after:2 weeks

Modified:
  head/include/readpassphrase.h
  head/lib/libc/gen/readpassphrase.3
  head/lib/libc/gen/readpassphrase.c

Modified: head/include/readpassphrase.h
==
--- head/include/readpassphrase.h   Sat Nov 13 09:28:49 2010
(r215235)
+++ head/include/readpassphrase.h   Sat Nov 13 10:38:06 2010
(r215236)
@@ -1,31 +1,24 @@
-/* $OpenBSD: /usr/local/www/cvsroot/OpenBSD/src/include/readpassphrase.h,v 
1.2 2002/02/16 21:27:17 millert Exp $   */
+/* $OpenBSD: readpassphrase.h,v 1.5 2003/06/17 21:56:23 millert Exp $  
*/
 /* $FreeBSD$   */
 
 /*
- * Copyright (c) 2000 Todd C. Miller 
- * All rights reserved.
+ * Copyright (c) 2000, 2002 Todd C. Miller 
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *notice, this list of conditions and the following disclaimer in the
- *documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission.
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F39502-99-1-0512.
  */
 
 #ifndef _READPASSPHRASE_H_
@@ -37,6 +30,7 @@
 #define RPP_FORCELOWER  0x04   /* Force input to lower case. */
 #define RPP_FORCEUPPER  0x08   /* Force input to upper case. */
 #define RPP_SEVENBIT0x10   /* Strip the high bit from input. */
+#define RPP_STDIN   0x20   /* Read from stdin, not /dev/tty */
 
 #include 
 #include 

Modified: head/lib/libc/gen/readpassphrase.3
==
--- head/lib/libc/gen/readpassphrase.3  Sat Nov 13 09:28:49 2010
(r215235)
+++ head/lib/libc/gen/readpassphrase.3  Sat Nov 13 10:38:06 2010
(r215236)
@@ -1,33 +1,26 @@
-.\"$OpenBSD: readpassphrase.3,v 1.7 2001/12/15 15:37:51 millert Exp $
+.\"$OpenBSD: readpassphrase.3,v 1.17 2007/05/31 19:19:28 jmc Exp $
 .\"
-.\" Copyright (c) 2000 Todd C. Miller 
-.\" All rights reserved.
+.\" Copyright (c) 2000, 2002 Todd C. Miller 
 .\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"notice, this list of conditions and the following disclaimer in the
-.\"documentation and/or other materials provided with the distribution.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"derived from this software without specific prior written permissi

svn commit: r215280 - head/sys/dev/arcmsr

[Xin LI]

Author: delphij
Date: Sun Nov 14 05:05:41 2010
New Revision: 215280
URL: http://svn.freebsd.org/changeset/base/215280

Log:
  Workaround build for PAE case for now - revert the PHYS
  case to previous panic behavior.
  
  I have a real fix that changes the sg dma tag allocation
  to be limited to the under 4GB address space but would
  prefer to have review before committing.

Modified:
  head/sys/dev/arcmsr/arcmsr.c

Modified: head/sys/dev/arcmsr/arcmsr.c
==
--- head/sys/dev/arcmsr/arcmsr.cSun Nov 14 05:01:40 2010
(r215279)
+++ head/sys/dev/arcmsr/arcmsr.cSun Nov 14 05:05:41 2010
(r215280)
@@ -2470,11 +2470,15 @@ static void arcmsr_action(struct cam_sim
splx(s);
}
else {  /* Buffer is physical */
+#ifdef PAE
+   panic("arcmsr: CAM_DATA_PHYS 
not supported");
+#else
struct bus_dma_segment seg;

seg.ds_addr = 
(bus_addr_t)pccb->csio.data_ptr;
seg.ds_len = 
pccb->csio.dxfer_len;
arcmsr_execute_srb(srb, &seg, 
1, 0);
+#endif
}
} else { 
/* Scatter/gather list */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215445 - stable/8/contrib/netcat

[Xin LI]

Author: delphij
Date: Thu Nov 18 01:14:18 2010
New Revision: 215445
URL: http://svn.freebsd.org/changeset/base/215445

Log:
  MFC through r214047: nc from OpenBSD 4.8.

Modified:
  stable/8/contrib/netcat/nc.1
  stable/8/contrib/netcat/netcat.c
  stable/8/contrib/netcat/socks.c
Directory Properties:
  stable/8/contrib/netcat/   (props changed)

Modified: stable/8/contrib/netcat/nc.1
==
--- stable/8/contrib/netcat/nc.1Wed Nov 17 23:13:02 2010
(r215444)
+++ stable/8/contrib/netcat/nc.1Thu Nov 18 01:14:18 2010
(r215445)
@@ -1,4 +1,4 @@
-.\" $OpenBSD: nc.1,v 1.53 2010/02/23 23:00:52 schwarze Exp $
+.\" $OpenBSD: nc.1,v 1.55 2010/07/25 07:51:39 guenther Exp $
 .\"
 .\" Copyright (c) 1996 David Sacerdote
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 3, 2010
+.Dd July 25, 2010
 .Dt NC 1
 .Os
 .Sh NAME
@@ -46,7 +46,7 @@
 .Op Fl p Ar source_port
 .Op Fl s Ar source_ip_address
 .Op Fl T Ar ToS
-.Op Fl V Ar fib
+.Op Fl V Ar rtable
 .Op Fl w Ar timeout
 .Op Fl X Ar proxy_protocol
 .Oo Xo
@@ -201,8 +201,10 @@ Specifies to use
 sockets.
 .It Fl u
 Use UDP instead of the default option of TCP.
-.It Fl V Ar fib
-Set the routing table (FIB).
+.It Fl V Ar rtable
+Set the routing table
+.Pq Dq FIB
+to be used.
 The default is 0.
 .It Fl v
 Have

Modified: stable/8/contrib/netcat/netcat.c
==
--- stable/8/contrib/netcat/netcat.cWed Nov 17 23:13:02 2010
(r215444)
+++ stable/8/contrib/netcat/netcat.cThu Nov 18 01:14:18 2010
(r215445)
@@ -1,4 +1,4 @@
-/* $OpenBSD: netcat.c,v 1.95 2010/02/27 00:58:56 nicm Exp $ */
+/* $OpenBSD: netcat.c,v 1.98 2010/07/03 04:44:51 guenther Exp $ */
 /*
  * Copyright (c) 2001 Eric Jackson 
  *
@@ -93,7 +93,7 @@ int   Iflag;  /* TCP receive 
buffer siz
 intOflag;  /* TCP send buffer size */
 intSflag;  /* TCP MD5 signature option */
 intTflag = -1; /* IP Type of Service */
-u_int  rdomain;
+u_int  rtableid;
 
 int timeout = -1;
 int family = AF_UNSPEC;
@@ -139,7 +139,6 @@ main(int argc, char *argv[])
{ NULL, 0,  NULL,   0 }
};
 
-   rdomain = 0;
ret = 1;
ipsec_count = 0;
s = 0;
@@ -235,10 +234,10 @@ main(int argc, char *argv[])
case 'V':
if (sysctlbyname("net.fibs", &numfibs, &intsize, NULL, 
0) == -1)
errx(1, "Multiple FIBS not supported");
-   rdomain = (unsigned int)strtonum(optarg, 0,
+   rtableid = (unsigned int)strtonum(optarg, 0,
numfibs - 1, &errstr);
if (errstr)
-   errx(1, "FIB %s: %s", errstr, optarg);
+   errx(1, "rtable %s: %s", errstr, optarg);
break;
case 'v':
vflag = 1;
@@ -371,11 +370,11 @@ main(int argc, char *argv[])
 */
if (uflag) {
int rv, plen;
-   char buf[8192];
+   char buf[16384];
struct sockaddr_storage z;
 
len = sizeof(z);
-   plen = jflag ? 8192 : 1024;
+   plen = jflag ? 16384 : 2048;
rv = recvfrom(s, buf, plen, MSG_PEEK,
(struct sockaddr *)&z, &len);
if (rv < 0)
@@ -561,8 +560,8 @@ remote_connect(const char *host, const c
add_ipsec_policy(s, ipsec_policy[1]);
 #endif
 
-   if (rdomain) {
-   if (setfib(rdomain) == -1)
+   if (rtableid) {
+   if (setfib(rtableid) == -1)
err(1, "setfib");
}
 
@@ -634,8 +633,8 @@ local_listen(char *host, char *port, str
res0->ai_protocol)) < 0)
continue;
 
-   if (rdomain) {
-   if (setfib(rdomain) == -1)
+   if (rtableid) {
+   if (setfib(rtableid) == -1)
err(1, "setfib");
}
 
@@ -680,12 +679,12 @@ void
 readwrite(int nfd)
 {
struct pollfd pfd[2];
-   unsigned char buf[8192];
+   unsigned char buf[16384];
int n, wfd = fileno(stdin);
int lfd = fileno(stdout);
int plen;
 
-   plen = jflag ? 8192 : 1024;
+   plen = jflag ? 16384 : 2048;
 
/* Setup Network FD */
pfd[0].fd = nfd;
@@ -827,10 +826,9 @@ build_por

svn commit: r215446 - stable/7/contrib/netcat

[Xin LI]

Author: delphij
Date: Thu Nov 18 01:21:55 2010
New Revision: 215446
URL: http://svn.freebsd.org/changeset/base/215446

Log:
  MFC through r214047: nc from OpenBSD 4.8.

Modified:
  stable/7/contrib/netcat/nc.1
  stable/7/contrib/netcat/netcat.c
  stable/7/contrib/netcat/socks.c
Directory Properties:
  stable/7/contrib/netcat/   (props changed)

Modified: stable/7/contrib/netcat/nc.1
==
--- stable/7/contrib/netcat/nc.1Thu Nov 18 01:14:18 2010
(r215445)
+++ stable/7/contrib/netcat/nc.1Thu Nov 18 01:21:55 2010
(r215446)
@@ -1,4 +1,4 @@
-.\" $OpenBSD: nc.1,v 1.50 2009/06/05 06:47:12 jmc Exp $
+.\" $OpenBSD: nc.1,v 1.55 2010/07/25 07:51:39 guenther Exp $
 .\"
 .\" Copyright (c) 1996 David Sacerdote
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 5 2009
+.Dd July 25, 2010
 .Dt NC 1
 .Os
 .Sh NAME
@@ -36,7 +36,7 @@
 .Sh SYNOPSIS
 .Nm nc
 .Bk -words
-.Op Fl 46DdEhklnorStUuvz
+.Op Fl 46DdEhklnrStUuvz
 .Op Fl e Ar IPsec_policy
 .Op Fl I Ar length
 .Op Fl i Ar interval
@@ -46,13 +46,13 @@
 .Op Fl p Ar source_port
 .Op Fl s Ar source_ip_address
 .Op Fl T Ar ToS
-.Op Fl V Ar fib
+.Op Fl V Ar rtable
 .Op Fl w Ar timeout
 .Op Fl X Ar proxy_protocol
 .Oo Xo
 .Fl x Ar proxy_address Ns Oo : Ns
-.Ar port Oc Oc
-.Xc
+.Ar port Oc
+.Xc Oc
 .Op Ar hostname
 .Op Ar port
 .Ek
@@ -158,16 +158,6 @@ TCP_NOOPT
 socket option.
 .It Fl O Ar length
 Specifies the size of the TCP send buffer.
-When
-.It Fl o
-.Dq Once-only mode .
-By default,
-.Nm
-does not terminate on EOF condition on input,
-but continues until the network side has been closed down.
-Specifying
-.Fl o
-will make it terminate on EOF as well.
 .It Fl P Ar proxy_username
 Specifies a username to present to a proxy server that requires authentication.
 If no username is specified then authentication will not be attempted.
@@ -206,11 +196,15 @@ This makes it possible to use
 .Nm
 to script telnet sessions.
 .It Fl U
-Specifies to use Unix Domain Sockets.
+Specifies to use
+.Ux Ns -domain
+sockets.
 .It Fl u
 Use UDP instead of the default option of TCP.
-.It Fl V Ar fib
-Set the routing table (FIB).
+.It Fl V Ar rtable
+Set the routing table
+.Pq Dq FIB
+to be used.
 The default is 0.
 .It Fl v
 Have
@@ -347,7 +341,7 @@ when it might be necessary to verify wha
 in response to commands issued by the client.
 For example, to retrieve the home page of a web site:
 .Bd -literal -offset indent
-$ echo -n "GET / HTTP/1.0\er\en\er\en" | nc host.example.com 80
+$ printf "GET / HTTP/1.0\er\en\er\en" | nc host.example.com 80
 .Ed
 .Pp
 Note that this also displays the headers sent by the web server.
@@ -428,7 +422,9 @@ outgoing traffic only.
 .Pp
 .Dl $ nc -e 'out ipsec esp/transport//require' host.example.com 42
 .Pp
-Create and listen on a Unix Domain Socket:
+Create and listen on a
+.Ux Ns -domain
+socket:
 .Pp
 .Dl $ nc -lU /var/tmp/dsocket
 .Pp

Modified: stable/7/contrib/netcat/netcat.c
==
--- stable/7/contrib/netcat/netcat.cThu Nov 18 01:14:18 2010
(r215445)
+++ stable/7/contrib/netcat/netcat.cThu Nov 18 01:21:55 2010
(r215446)
@@ -1,4 +1,4 @@
-/* $OpenBSD: netcat.c,v 1.93 2009/06/05 00:18:10 claudio Exp $ */
+/* $OpenBSD: netcat.c,v 1.98 2010/07/03 04:44:51 guenther Exp $ */
 /*
  * Copyright (c) 2001 Eric Jackson 
  *
@@ -72,14 +72,12 @@
 #define PORT_MAX_LEN   6
 
 /* Command Line Options */
-intEflag;  /* Use IPsec ESP */
 intdflag;  /* detached, no stdin */
 unsigned int iflag;/* Interval Flag */
 intjflag;  /* use jumbo frames if we can */
 intkflag;  /* More than one connect */
 intlflag;  /* Bind to local port */
 intnflag;  /* Don't do name look up */
-intoflag;  /* Once only: stop on EOF */
 intFreeBSD_Oflag;  /* Do not use TCP options */
 char   *Pflag; /* Proxy username */
 char   *pflag; /* Localport flag */
@@ -95,7 +93,7 @@ int   Iflag;  /* TCP receive 
buffer siz
 intOflag;  /* TCP send buffer size */
 intSflag;  /* TCP MD5 signature option */
 intTflag = -1; /* IP Type of Service */
-u_int  rdomain;
+u_int  rtableid;
 
 int timeout = -1;
 int family = AF_UNSPEC;
@@ -141,7 +139,6 @@ main(int argc, char *argv[])
{ NULL, 0,  NULL,   0 }
};
 
-   rdomain = 0;
ret = 1;
ipsec_count = 0;
s = 0;
@@ -151,7 +148,7 @@ main(int argc, char *argv[])
 

svn commit: r215514 - stable/7/contrib/netcat

[Xin LI]

Author: delphij
Date: Fri Nov 19 09:59:41 2010
New Revision: 215514
URL: http://svn.freebsd.org/changeset/base/215514

Log:
  RELENG_7 does not have IP_BINDANY yet so hide it under ifdef.
  
  Reported by:  tinderbox

Modified:
  stable/7/contrib/netcat/netcat.c

Modified: stable/7/contrib/netcat/netcat.c
==
--- stable/7/contrib/netcat/netcat.cFri Nov 19 09:49:14 2010
(r215513)
+++ stable/7/contrib/netcat/netcat.cFri Nov 19 09:59:41 2010
(r215514)
@@ -569,8 +569,10 @@ remote_connect(const char *host, const c
if (sflag || pflag) {
struct addrinfo ahints, *ares;
 
+#ifdef IP_BINDANY
/* try IP_BINDANY, but don't insist */
setsockopt(s, IPPROTO_IP, IP_BINDANY, &on, sizeof(on));
+#endif
memset(&ahints, 0, sizeof(struct addrinfo));
ahints.ai_family = res0->ai_family;
ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215628 - stable/8/sys/kern

[Xin LI]

Author: delphij
Date: Sun Nov 21 12:40:16 2010
New Revision: 215628
URL: http://svn.freebsd.org/changeset/base/215628

Log:
  MFC r214125:
  
  In syscall_module_handler(): all switch branches return, remove
  unreached code as pointed out in a Chinese forum [1].
  
  [1] http://www.freebsdchina.org/forum/viewtopic.php?t=50619
  
  Pointed out by:   btw616 
  
  MFC r214181:
  
  Call chainevh callback when we are invoked with neither MOD_LOAD nor
  MOD_UNLOAD.  This makes it possible to add custom hooks for other module
  events.
  
  Return EOPNOTSUPP when there is no callback available.
  
  Pointed out by:   jhb
  Reviewed by:  jhb

Modified:
  stable/8/sys/kern/kern_syscalls.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/kern/kern_syscalls.c
==
--- stable/8/sys/kern/kern_syscalls.c   Sun Nov 21 12:33:11 2010
(r215627)
+++ stable/8/sys/kern/kern_syscalls.c   Sun Nov 21 12:40:16 2010
(r215628)
@@ -127,13 +127,12 @@ syscall_module_handler(struct module *mo
error = syscall_deregister(data->offset, &data->old_sysent);
return (error);
default:
-   return EOPNOTSUPP;
+   if (data->chainevh)
+   return (data->chainevh(mod, what, data->chainarg));
+   return (EOPNOTSUPP);
}
 
-   if (data->chainevh)
-   return (data->chainevh(mod, what, data->chainarg));
-   else
-   return (0);
+   /* NOTREACHED */
 }
 
 int
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r215708 - head/sys/compat/ndis

[Xin LI]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

On 11/22/10 12:46, Bernhard Schmidt wrote:
> Author: bschmidt
> Date: Mon Nov 22 20:46:38 2010
> New Revision: 215708
> URL: http://svn.freebsd.org/changeset/base/215708
> 
> Log:
>   Resurrect amd64 support.
>   - Many drivers on amd64 are picking system uptime, interrupt time and ticks
> via global data structure instead of calling functions for performance
> reasons. For now just patch such address so driver will not trigger page
> fault when trying to access such data. In future, additional callout may
> be added to update data in periodic intervals.
>   - On amd64 we need to allocate "shadow space" on stack before calling any
> function.
>   
>   Submitted by:       Paul B Mahol 

Will this be MFC'ed?

Cheers,
- -- 
Xin LI http://www.delphij.net/
FreeBSD - The Power to Serve!  Live free or die
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.16 (FreeBSD)

iQEcBAEBCAAGBQJM6tuoAAoJEATO+BI/yjfByfcH/15/qNeim1VF5aUK9h6LWPM0
04dB6K3fu3oKEUNY8bD/w06lZZzTPUW/VNrm+bA6/8gKNxP4MgJunty69kmR6tEG
xH67RPz/lVmCMU7zNFByFTGltZVSvyyxrsceD6ZylBaSChBV5UoKBMdDE6cOuPbR
D5V/yVxlwJaJkhtoRN/GbKlEyZkDs6pGmhzSRKOptr0n4PZjpiHVlXAxhlZkpILB
qITYNGvPjyL/3a3nKMz+eBVMqUofjPsDkmCvvApLQumL7FFSCvLGGHnfqe3Pl5Zq
nG5ajDia1wnD2nWdbsFoADv69+T3YYhB8wHwvQ/yGV+h+5NExKjovz4l7AZyEjg=
=gImO
-END PGP SIGNATURE-
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215730 - in stable/8: etc/periodic/security tools/build/mk

[Xin LI]

Author: delphij
Date: Tue Nov 23 01:39:30 2010
New Revision: 215730
URL: http://svn.freebsd.org/changeset/base/215730

Log:
  MFC r204459 (antonie):
  
  Add files to remove when MK_PKGTOOLS=no.
  
  MFC r215045 [1]:
  
  Hide 460.chkportsum in MK_PKGTOOLS != no case.
  
  Submitted by: Alex Kozlov  [1]

Modified:
  stable/8/etc/periodic/security/Makefile
  stable/8/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
  stable/8/etc/periodic/security/   (props changed)
  stable/8/tools/build/mk/   (props changed)

Modified: stable/8/etc/periodic/security/Makefile
==
--- stable/8/etc/periodic/security/Makefile Tue Nov 23 01:32:44 2010
(r215729)
+++ stable/8/etc/periodic/security/Makefile Tue Nov 23 01:39:30 2010
(r215730)
@@ -7,7 +7,6 @@ FILES=  100.chksetuid \
300.chkuid0 \
400.passwdless \
410.logincheck \
-   460.chkportsum \
700.kernelmsg \
800.loginfail \
900.tcpwrap \
@@ -28,4 +27,8 @@ FILES+=   500.ipfwdenied \
 FILES+=520.pfdenied
 .endif
 
+.if ${MK_PKGTOOLS} != "no"
+FILES+=460.chkportsum
+.endif
+
 .include 

Modified: stable/8/tools/build/mk/OptionalObsoleteFiles.inc
==
--- stable/8/tools/build/mk/OptionalObsoleteFiles.inc   Tue Nov 23 01:32:44 
2010(r215729)
+++ stable/8/tools/build/mk/OptionalObsoleteFiles.inc   Tue Nov 23 01:39:30 
2010(r215730)
@@ -1213,6 +1213,23 @@ OLD_FILES+=usr/share/man/man1/nc.1.gz
 # to be filled in
 #.endif
 
+.if ${MK_PKGTOOLS} == no
+OLD_FILES+=etc/periodic/security/460.chkportsum
+OLD_FILES+=etc/periodic/weekly/400.status-pkg
+OLD_FILES+=usr/sbin/pkg_add
+OLD_FILES+=usr/sbin/pkg_create
+OLD_FILES+=usr/sbin/pkg_delete
+OLD_FILES+=usr/sbin/pkg_info
+OLD_FILES+=usr/sbin/pkg_updating
+OLD_FILES+=usr/sbin/pkg_version
+OLD_FILES+=usr/share/man/man1/pkg_add.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_create.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_delete.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_info.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_updating.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_version.1.gz
+.endif
+
 .if ${MK_PROFILE} == no
 OLD_FILES+=usr/lib/libalias_cuseeme_p.a
 OLD_FILES+=usr/lib/libalias_dummy_p.a
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215825 - stable/8/sys/dev/arcmsr

[Xin LI]

Author: delphij
Date: Thu Nov 25 18:21:08 2010
New Revision: 215825
URL: http://svn.freebsd.org/changeset/base/215825

Log:
  MFC r215234:
  
  Update to vendor release 1.20.00.19.
  
  Bug fixes:
* Fixed "inquiry data fails comparion at DV1 step"
* Fixed bad range input in bus_alloc_resource for ADAPTER_TYPE_B
* Fixed arcmsr driver prevent arcsas support for Areca SAS HBA ARC13x0
  
  Many thanks to Areca for continuing to support FreeBSD.
  
  MFC r215280:
  
  Workaround build for PAE case for now - revert the PHYS
  case to previous panic behavior.

Modified:
  stable/8/sys/dev/arcmsr/arcmsr.c
  stable/8/sys/dev/arcmsr/arcmsr.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/arcmsr/arcmsr.c
==
--- stable/8/sys/dev/arcmsr/arcmsr.cThu Nov 25 18:20:28 2010
(r215824)
+++ stable/8/sys/dev/arcmsr/arcmsr.cThu Nov 25 18:21:08 2010
(r215825)
@@ -38,29 +38,32 @@
 ** History
 **
 **REV# DATENAME DESCRIPTION
-** 1.00.00.003/31/2004Erich ChenFirst release
-** 1.20.00.02   11/29/2004 Erich Chenbug fix with 
arcmsr_bus_reset when PHY error
-** 1.20.00.034/19/2005 Erich Chenadd SATA 24 Ports 
adapter type support
+** 1.00.00.003/31/2004 Erich Chen   First 
release
+** 1.20.00.02   11/29/2004 Erich Chen   bug 
fix with arcmsr_bus_reset when PHY error
+** 1.20.00.034/19/2005 Erich Chen   add 
SATA 24 Ports adapter type support
 **   clean unused function
-** 1.20.00.129/12/2005 Erich Chenbug fix with abort 
command handling, 
+** 1.20.00.129/12/2005 Erich Chen   bug fix with 
abort command handling, 
 **   firmware version 
check 
 **   and firmware update 
notify for hardware bug fix
 **   handling if none zero 
high part physical address 
 **   of srb resource 
-** 1.20.00.138/18/2006 Erich Chenremove pending srb 
and report busy
+** 1.20.00.138/18/2006 Erich Chen   remove 
pending srb and report busy
 **   add iop message xfer 
 **   with scsi 
pass-through command
 **   add new device id of 
sas raid adapters 
 **   code fit for SPARC64 
& PPC 
-** 1.20.00.14   02/05/2007 Erich Chenbug fix for incorrect 
ccb_h.status report
+** 1.20.00.14   02/05/2007 Erich Chen   bug 
fix for incorrect ccb_h.status report
 **   and cause 
g_vfs_done() read write error
-** 1.20.00.15   10/10/2007 Erich Chensupport new RAID 
adapter type ARC120x
-** 1.20.00.16   10/10/2009 Erich ChenBug fix for RAID 
adapter type ARC120x
+** 1.20.00.15   10/10/2007 Erich Chen   
support new RAID adapter type ARC120x
+** 1.20.00.16   10/10/2009 Erich Chen   Bug 
fix for RAID adapter type ARC120x
 **   bus_dmamem_alloc() 
with BUS_DMA_ZERO
-** 1.20.00.17   07/15/2010 Ching Huang   Added support ARC1880
-**  report 
CAM_DEV_NOT_THERE instead of CAM_SEL_TIMEOUT when device failed,
-**  prevent 
cam_periph_error removing all LUN devices of one Target id
-**  for any one LUN device 
failed
+** 1.20.00.17  07/15/2010  Ching Huang 
 Added support ARC1880
+** 
 report CAM_DEV_NOT_THERE instead of 
CAM_SEL_TIMEOUT when device failed,
+** 
 prevent cam_periph_error removing all LUN 
devices of one Target id
+** 
 for any one LUN device failed

svn commit: r215835 - head/share/man/man4

[Xin LI]

Author: delphij
Date: Thu Nov 25 19:05:17 2010
New Revision: 215835
URL: http://svn.freebsd.org/changeset/base/215835

Log:
  Add a HARDWARE section.
  
  MFC after:2 weeks

Modified:
  head/share/man/man4/et.4

Modified: head/share/man/man4/et.4
==
--- head/share/man/man4/et.4Thu Nov 25 18:50:59 2010(r215834)
+++ head/share/man/man4/et.4Thu Nov 25 19:05:17 2010(r215835)
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 14, 2008
+.Dd November 25, 2010
 .Dt ET 4
 .Os
 .Sh NAME
@@ -122,6 +122,11 @@ Note that the 1000baseT media type is on
 if it is supported by the adapter.
 For more information on configuring this device, see
 .Xr ifconfig 8 .
+.Sh HARDWARE
+The
+.Nm
+driver supports Agere ET1310 10/100/Gigabit
+Ethernet adapters.
 .Sh TUNABLES
 .Bl -tag -width ".Va hw.et.rx_intr_npkts"
 .It Va hw.et.rx_intr_npkts
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215837 - head/share/man/man4

[Xin LI]

Author: delphij
Date: Thu Nov 25 19:33:39 2010
New Revision: 215837
URL: http://svn.freebsd.org/changeset/base/215837

Log:
  Update manual page with respect to latest driver.
  
  While I'm there remove ARC-1180 which doesn't seem to exist.

Modified:
  head/share/man/man4/arcmsr.4

Modified: head/share/man/man4/arcmsr.4
==
--- head/share/man/man4/arcmsr.4Thu Nov 25 19:22:24 2010
(r215836)
+++ head/share/man/man4/arcmsr.4Thu Nov 25 19:33:39 2010
(r215837)
@@ -24,12 +24,12 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 28, 2008
+.Dd November 25, 2010
 .Dt ARCMSR 4
 .Os
 .Sh NAME
 .Nm arcmsr
-.Nd Areca SATA II RAID Controller driver
+.Nd Areca RAID Controller driver
 .Sh SYNOPSIS
 To compile this driver into the kernel,
 place the following lines in your
@@ -50,11 +50,11 @@ arcmsr_load="YES"
 .Sh DESCRIPTION
 The
 .Nm
-driver provides support for the Areca ARC-11xx and ARC-12xx series of SATA II
-RAID controllers.
+driver provides support for the Areca ARC-11xx, ARC-12xx, ARC-13xx,
+ARC-16xx and ARC-18xx series of SAS and SATA RAID controllers.
 These controllers feature RAID-0, 1, 3, 5, 6, and 10 and
 JBOD acceleration for up to 16 SATA drives.
-Raid level and stripe level
+RAID level and stripe level
 migration, online capacity expansion, hot insertion/removal, automatic failover
 and rebuild, and SMART are also supported.
 Access to the arrays is provided
@@ -82,8 +82,6 @@ ARC-1160
 .It
 ARC-1170
 .It
-ARC-1180
-.It
 ARC-1110ML
 .It
 ARC-1120ML
@@ -92,14 +90,28 @@ ARC-1130ML
 .It
 ARC-1160ML
 .It
+ARC-1200
+.It
+ARC-1201
+.It
 ARC-1210
 .It
+ARC-1212
+.It
 ARC-1220
 .It
+ARC-1222
+.It
 ARC-1230
 .It
+ARC-1231
+.It
 ARC-1260
 .It
+ARC-1261
+.It
+ARC-1270
+.It
 ARC-1280
 .It
 ARC-1210ML
@@ -111,6 +123,16 @@ ARC-1231ML
 ARC-1261ML
 .It
 ARC-1280ML
+.It
+ARC-1380
+.It
+ARC-1381
+.It
+ARC-1680
+.It
+ARC-1681
+.It
+ARC-1880
 .El
 .Sh FILES
 .Bl -tag -width ".Pa /dev/arcmsr?" -compact
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215839 - stable/7/sys/dev/arcmsr

[Xin LI]

Author: delphij
Date: Thu Nov 25 20:09:56 2010
New Revision: 215839
URL: http://svn.freebsd.org/changeset/base/215839

Log:
  MFC r215234:
  
  Update to vendor release 1.20.00.19.
  
  Bug fixes:
* Fixed "inquiry data fails comparion at DV1 step"
* Fixed bad range input in bus_alloc_resource for ADAPTER_TYPE_B
* Fixed arcmsr driver prevent arcsas support for Areca SAS HBA ARC13x0
  
  Many thanks to Areca for continuing to support FreeBSD.
  
  MFC r215280:
  
  Workaround build for PAE case for now - revert the PHYS
  case to previous panic behavior.

Modified:
  stable/7/sys/dev/arcmsr/arcmsr.c
  stable/7/sys/dev/arcmsr/arcmsr.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/arcmsr/arcmsr.c
==
--- stable/7/sys/dev/arcmsr/arcmsr.cThu Nov 25 20:05:11 2010
(r215838)
+++ stable/7/sys/dev/arcmsr/arcmsr.cThu Nov 25 20:09:56 2010
(r215839)
@@ -38,29 +38,32 @@
 ** History
 **
 **REV# DATENAME DESCRIPTION
-** 1.00.00.003/31/2004Erich ChenFirst release
-** 1.20.00.02   11/29/2004 Erich Chenbug fix with 
arcmsr_bus_reset when PHY error
-** 1.20.00.034/19/2005 Erich Chenadd SATA 24 Ports 
adapter type support
+** 1.00.00.003/31/2004 Erich Chen   First 
release
+** 1.20.00.02   11/29/2004 Erich Chen   bug 
fix with arcmsr_bus_reset when PHY error
+** 1.20.00.034/19/2005 Erich Chen   add 
SATA 24 Ports adapter type support
 **   clean unused function
-** 1.20.00.129/12/2005 Erich Chenbug fix with abort 
command handling, 
+** 1.20.00.129/12/2005 Erich Chen   bug fix with 
abort command handling, 
 **   firmware version 
check 
 **   and firmware update 
notify for hardware bug fix
 **   handling if none zero 
high part physical address 
 **   of srb resource 
-** 1.20.00.138/18/2006 Erich Chenremove pending srb 
and report busy
+** 1.20.00.138/18/2006 Erich Chen   remove 
pending srb and report busy
 **   add iop message xfer 
 **   with scsi 
pass-through command
 **   add new device id of 
sas raid adapters 
 **   code fit for SPARC64 
& PPC 
-** 1.20.00.14   02/05/2007 Erich Chenbug fix for incorrect 
ccb_h.status report
+** 1.20.00.14   02/05/2007 Erich Chen   bug 
fix for incorrect ccb_h.status report
 **   and cause 
g_vfs_done() read write error
-** 1.20.00.15   10/10/2007 Erich Chensupport new RAID 
adapter type ARC120x
-** 1.20.00.16   10/10/2009 Erich ChenBug fix for RAID 
adapter type ARC120x
+** 1.20.00.15   10/10/2007 Erich Chen   
support new RAID adapter type ARC120x
+** 1.20.00.16   10/10/2009 Erich Chen   Bug 
fix for RAID adapter type ARC120x
 **   bus_dmamem_alloc() 
with BUS_DMA_ZERO
-** 1.20.00.17   07/15/2010 Ching Huang   Added support ARC1880
-**  report 
CAM_DEV_NOT_THERE instead of CAM_SEL_TIMEOUT when device failed,
-**  prevent 
cam_periph_error removing all LUN devices of one Target id
-**  for any one LUN device 
failed
+** 1.20.00.17  07/15/2010  Ching Huang 
 Added support ARC1880
+** 
 report CAM_DEV_NOT_THERE instead of 
CAM_SEL_TIMEOUT when device failed,
+** 
 prevent cam_periph_error removing all LUN 
devices of one Target id
+** 
 for any one LUN device failed
+**1.20.00.18   10/14/2010  Chi

svn commit: r215851 - in stable/8/release: . picobsd/floppy.tree/sbin

[Xin LI]

Author: delphij
Date: Fri Nov 26 02:15:39 2010
New Revision: 215851
URL: http://svn.freebsd.org/changeset/base/215851

Log:
  MFC r214426: Add a short note about kernel modules in FIXIT mode.

Modified:
  stable/8/release/fixit.profile
Directory Properties:
  stable/8/release/   (props changed)
  stable/8/release/doc/en_US.ISO8859-1/hardware/   (props changed)
  stable/8/release/picobsd/   (props changed)
  stable/8/release/picobsd/floppy.tree/sbin/   (props changed)
  stable/8/release/picobsd/floppy.tree/sbin/dhclient-script   (props changed)
  stable/8/release/picobsd/qemu/   (props changed)
  stable/8/release/picobsd/tinyware/login/   (props changed)
  stable/8/release/powerpc/   (props changed)

Modified: stable/8/release/fixit.profile
==
--- stable/8/release/fixit.profile  Fri Nov 26 02:10:56 2010
(r215850)
+++ stable/8/release/fixit.profile  Fri Nov 26 02:15:39 2010
(r215851)
@@ -25,6 +25,10 @@ echo '| You might want to symlink /mnt/e
 echo '| to /etc after mounting a root filesystem from your disk.  |'
 echo '| tar(1) will not restore all permissions correctly otherwise!  |'
 echo '|   |'
+echo '| In order to load kernel modules you might want to add the |'
+echo '| fixit media to the kern.module_path sysctl variable so that   |'
+echo '| the kernel knows where to find them.  |'
+echo '|   |'
 echo '| Note: you can use the arrow keys to browse through the|'
 echo '| command history of this shell.|'
 echo '+---+'
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215852 - stable/7/release

[Xin LI]

Author: delphij
Date: Fri Nov 26 02:18:52 2010
New Revision: 215852
URL: http://svn.freebsd.org/changeset/base/215852

Log:
  MFC r214426: Add a short note about kernel modules in FIXIT mode.

Modified:
  stable/7/release/fixit.profile
Directory Properties:
  stable/7/release/   (props changed)
  stable/7/release/doc/   (props changed)
  stable/7/release/doc/en_US.ISO8859-1/hardware/   (props changed)
  stable/7/release/picobsd/tinyware/login/   (props changed)

Modified: stable/7/release/fixit.profile
==
--- stable/7/release/fixit.profile  Fri Nov 26 02:15:39 2010
(r215851)
+++ stable/7/release/fixit.profile  Fri Nov 26 02:18:52 2010
(r215852)
@@ -25,6 +25,10 @@ echo '| You might want to symlink /mnt/e
 echo '| to /etc after mounting a root filesystem from your disk.  |'
 echo '| tar(1) will not restore all permissions correctly otherwise!  |'
 echo '|   |'
+echo '| In order to load kernel modules you might want to add the |'
+echo '| fixit media to the kern.module_path sysctl variable so that   |'
+echo '| the kernel knows where to find them.  |'
+echo '|   |'
 echo '| Note: you can use the arrow keys to browse through the|'
 echo '| command history of this shell.|'
 echo '+---+'
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215934 - in stable/8: include lib/libc/gen

[Xin LI]

Author: delphij
Date: Sat Nov 27 06:33:53 2010
New Revision: 215934
URL: http://svn.freebsd.org/changeset/base/215934

Log:
  MFC r215236:
  
  Sync with OpenBSD, primarily better signal and terminal handling.
  
  Obtained from:OpenBSD

Modified:
  stable/8/include/readpassphrase.h
  stable/8/lib/libc/gen/readpassphrase.3
  stable/8/lib/libc/gen/readpassphrase.c
Directory Properties:
  stable/8/include/   (props changed)
  stable/8/lib/libc/   (props changed)
  stable/8/lib/libc/locale/   (props changed)
  stable/8/lib/libc/stdtime/   (props changed)
  stable/8/lib/libc/sys/   (props changed)

Modified: stable/8/include/readpassphrase.h
==
--- stable/8/include/readpassphrase.h   Sat Nov 27 04:46:16 2010
(r215933)
+++ stable/8/include/readpassphrase.h   Sat Nov 27 06:33:53 2010
(r215934)
@@ -1,31 +1,24 @@
-/* $OpenBSD: /usr/local/www/cvsroot/OpenBSD/src/include/readpassphrase.h,v 
1.2 2002/02/16 21:27:17 millert Exp $   */
+/* $OpenBSD: readpassphrase.h,v 1.5 2003/06/17 21:56:23 millert Exp $  
*/
 /* $FreeBSD$   */
 
 /*
- * Copyright (c) 2000 Todd C. Miller 
- * All rights reserved.
+ * Copyright (c) 2000, 2002 Todd C. Miller 
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *notice, this list of conditions and the following disclaimer in the
- *documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission.
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F39502-99-1-0512.
  */
 
 #ifndef _READPASSPHRASE_H_
@@ -37,6 +30,7 @@
 #define RPP_FORCELOWER  0x04   /* Force input to lower case. */
 #define RPP_FORCEUPPER  0x08   /* Force input to upper case. */
 #define RPP_SEVENBIT0x10   /* Strip the high bit from input. */
+#define RPP_STDIN   0x20   /* Read from stdin, not /dev/tty */
 
 #include 
 #include 

Modified: stable/8/lib/libc/gen/readpassphrase.3
==
--- stable/8/lib/libc/gen/readpassphrase.3  Sat Nov 27 04:46:16 2010
(r215933)
+++ stable/8/lib/libc/gen/readpassphrase.3  Sat Nov 27 06:33:53 2010
(r215934)
@@ -1,33 +1,26 @@
-.\"$OpenBSD: readpassphrase.3,v 1.7 2001/12/15 15:37:51 millert Exp $
+.\"$OpenBSD: readpassphrase.3,v 1.17 2007/05/31 19:19:28 jmc Exp $
 .\"
-.\" Copyright (c) 2000 Todd C. Miller 
-.\" All rights reserved.
+.\" Copyright (c) 2000, 2002 Todd C. Miller 
 .\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"notice, this list of conditions 

svn commit: r215935 - in stable/7: include lib/libc/gen

[Xin LI]

Author: delphij
Date: Sat Nov 27 06:35:15 2010
New Revision: 215935
URL: http://svn.freebsd.org/changeset/base/215935

Log:
  MFC r215236:
  
  Sync with OpenBSD, primarily better signal and terminal handling.
  
  Obtained from:OpenBSD

Modified:
  stable/7/include/readpassphrase.h
  stable/7/lib/libc/gen/readpassphrase.3
  stable/7/lib/libc/gen/readpassphrase.c
Directory Properties:
  stable/7/include/   (props changed)
  stable/7/lib/libc/   (props changed)
  stable/7/lib/libc/stdtime/   (props changed)

Modified: stable/7/include/readpassphrase.h
==
--- stable/7/include/readpassphrase.h   Sat Nov 27 06:33:53 2010
(r215934)
+++ stable/7/include/readpassphrase.h   Sat Nov 27 06:35:15 2010
(r215935)
@@ -1,31 +1,24 @@
-/* $OpenBSD: /usr/local/www/cvsroot/OpenBSD/src/include/readpassphrase.h,v 
1.2 2002/02/16 21:27:17 millert Exp $   */
+/* $OpenBSD: readpassphrase.h,v 1.5 2003/06/17 21:56:23 millert Exp $  
*/
 /* $FreeBSD$   */
 
 /*
- * Copyright (c) 2000 Todd C. Miller 
- * All rights reserved.
+ * Copyright (c) 2000, 2002 Todd C. Miller 
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *notice, this list of conditions and the following disclaimer in the
- *documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission.
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F39502-99-1-0512.
  */
 
 #ifndef _READPASSPHRASE_H_
@@ -37,6 +30,7 @@
 #define RPP_FORCELOWER  0x04   /* Force input to lower case. */
 #define RPP_FORCEUPPER  0x08   /* Force input to upper case. */
 #define RPP_SEVENBIT0x10   /* Strip the high bit from input. */
+#define RPP_STDIN   0x20   /* Read from stdin, not /dev/tty */
 
 #include 
 #include 

Modified: stable/7/lib/libc/gen/readpassphrase.3
==
--- stable/7/lib/libc/gen/readpassphrase.3  Sat Nov 27 06:33:53 2010
(r215934)
+++ stable/7/lib/libc/gen/readpassphrase.3  Sat Nov 27 06:35:15 2010
(r215935)
@@ -1,33 +1,26 @@
-.\"$OpenBSD: readpassphrase.3,v 1.7 2001/12/15 15:37:51 millert Exp $
+.\"$OpenBSD: readpassphrase.3,v 1.17 2007/05/31 19:19:28 jmc Exp $
 .\"
-.\" Copyright (c) 2000 Todd C. Miller 
-.\" All rights reserved.
+.\" Copyright (c) 2000, 2002 Todd C. Miller 
 .\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"notice, this list of conditions and the following disclaimer in the
-.\"documentation and/or other materials provided

svn commit: r215991 - head/share/syscons/fonts

[Xin LI]

Author: delphij
Date: Sun Nov 28 09:35:56 2010
New Revision: 215991
URL: http://svn.freebsd.org/changeset/base/215991

Log:
  Add a manual shrinked version of swiss-8x16 as swiss-8x14.
  
  MFC after:2 months

Added:
  head/share/syscons/fonts/swiss-8x14.fnt   (contents, props changed)
Modified:
  head/share/syscons/fonts/Makefile

Modified: head/share/syscons/fonts/Makefile
==
--- head/share/syscons/fonts/Makefile   Sun Nov 28 08:18:16 2010
(r215990)
+++ head/share/syscons/fonts/Makefile   Sun Nov 28 09:35:56 2010
(r215991)
@@ -26,7 +26,7 @@ FILES=armscii8-8x8.fnt armscii8-8x14.fn
koi8-r-8x8.fnt koi8-r-8x14.fnt koi8-r-8x16.fnt \
koi8-rb-8x16.fnt koi8-rc-8x16.fnt \
koi8-u-8x8.fnt koi8-u-8x14.fnt koi8-u-8x16.fnt \
-   swiss-8x16.fnt swiss-8x8.fnt \
+   swiss-8x16.fnt swiss-8x14.fnt swiss-8x8.fnt \
swiss-1251-8x16.fnt swiss-1131-8x16.fnt \
INDEX.fonts
 

Added: head/share/syscons/fonts/swiss-8x14.fnt
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/share/syscons/fonts/swiss-8x14.fnt Sun Nov 28 09:35:56 2010
(r215991)
@@ -0,0 +1,84 @@
+# $FreeBSD$
+begin 644 swiss-8x14
+M$```/$*!y...@9e"/``\?O^9V^?_YWX\``!L
+M_O[^_OY\.!`0.'s...@0```x.!#6_m80.'Q\`!`X?/[^
+M5!`X?'p...@\/!...@``/__Y\/#Y___`#QF0D)F
+M/`#_PYF]O9G#_P`>#AHP>,S,S,QX`#QF9F8\&'X8&!...@`
+M```@,#...@\-c8p'Q^?'AP8$`"!...@x>/GX^'@X&`...@`8/'X8&!...@8?cp89f9f
+m9f...@!f9@!^]/3T=!04%!04'C!XW,[G#'@`
+m_o...@`8/'X8&!...@8&'X\&`#...@\?a@8&!...@8&!...@8&!...@8&!...@8&!A^
+M/!...@,!O\&#```...@_v`p,V;N
+M```D9O]F)```&#P\?G[__P#__WY^/#P8
+m```...@8&!...@8&!...@``!@8=V;,``!L;&S^
+M;&QL_FQL;```$'S6T-!P.!P6%M9\$```QL8,#...@p,&!...@ql8x;&PX<-;<
+MS,S,=...@```!p8,``,&!...@p,#`P,#`P&!@,`#`8&`P,#`P,#`P8
+M&#`...@8_sp\9@``&!A^&!...@<&#``
+m``...@``&!...@```,#...@8,#...@8,#...@8,#``'S&
+MQL;6UM;&QL9\&!...@x>!...@8&!...@8&'x```...@8&#...@p8,#...@```'S&!...@8\
+...@8&!L9\#`S,S,S,_...@p,#`P```#^P,#`_`8&!@;&?```...@p,#\QL;&
+mql9\``...@8&#`P8&#`P,#!\QL;&?,;&QL;&?'S&QL;&?...@8&#!AP
+M```8&``8&``...@8`!p8,`8,&#...@p&`P&`P&
+M`'X``'X```#`8#`8#`8,&#...@p'S&!...@8,&#`P`#`P?,;&
+MQM[>WM[!...@8&!...@8&QL;&?,;&S-CPX/#8S,;&P,#`P,#`P,#`P/X```#&
+M[O[^UM;&QL;&q...@```,;F]O[>SL;&QL;&?,;&QL;&QL;&QGP```#\QL;&
+MQOS`P,#`P'S&QL;&QL;&]MY\#`8`_,;&QL;\V,S,QL8```!\QL#`8#@,
+M!@;&?/\8&!...@8&!...@8&!...@8ql;&QL;&QL;&QGP```#&QL;&QFQL;#...@x
+M$,;&QL;&UM;^[L;&QL9L;#...@x.&QLQL8```##PV9F/#P8&!...@8&```
+M`/X&#`P8&#...@8,#^/#`P,#`P,#`P,#P``,#`8&`P,!...@8#`p&!@,#`#P,
+M#`P,#`P,#`P\```0.&S&`/\``'`P&```
+M`'P&?L;&QGX```#`P,#`_,;&QL;&_`!\QL#`
+MP,9\``...@8&!G[&QL;&QGX`?,;^P,#&?#QF8&#P8&!...@8&!@
+M?L;&QL;&?@;&?`#`P,#`_,;&QL;&q...@```!@8```8&!...@8&!...@8
+...@8```8&!...@8&!L;&?```P,#`QLS8\-C,q...@```#@8&!...@8&!...@8&!...@\
+M`.S^_M;&QL8`_,;&QL;&q...@!\ql;&QL9\_,;&
+MQL;&_,#`P`!^QL;&ql...@8&``#\QL#`P,#``'S`&#QF`'S&QL;&QGP`
+M;&P`?,;&QL;&?&`P&`!\QL;&QL9\&#QF`,;&QL;&QGP```!@
+M,!...@`ql;&QL;&?`!L;`#&QL;&ql...@9\;`!\QL;&QL;&QL9\``!L;`#&
+MQL;&QL;&QGP`&!A^P\#`P,-^&!...@``#al8/!...@\&!...@9op`9f9f/!A^
+M&'X8&`#\QL;&QOS&S\;&!PX;&!...@8/!...@8&!C8<``&#...@`?`9^ql;&
+...@8,&``8&!...@8&!...@8!@P8`'S&QL;&QGP,&#``QL;&QL;&?```
+M``!VW`#\QL;&QL;&=MP`QN;V_M[.QL;&?`9^QL;&?...@``_@!\
+MQL;&ql9\``#^```...@``!@8&`P&QGP``/[`P,``
+...@8&!...@``&#...@8&!...@`_p`8+!@P/``...@8&`#...@x:'P8```8```8&!...@8
+M&!...@8`#9lv-al-@``V&PV-FS8`$011!%$$4011!%$
+M$401JE6J5:I5JE6J5:i5je5ww7?==]uww7?==]u...@8&!...@8&!...@8&!...@8&!...@8
+M&!...@8&!...@8&/@8&!...@8&!...@8&!...@8&/@8...@8&!...@8V-C8V-C;V-C8V-C8V
+M`/XV-C8V-C8``/@8...@8&!...@8V-C8V]@;V-C8V-C8V-C8V-C8V
+M-C8V-C8V-C8``/X&]C8V-C8V-C8V-C8V]@;^-C8V-C8V-OX`
+M```8&!...@8&/@8^`#X&!...@8&!...@8&!...@8&!...@8&!\`
+M```8&!...@8&!...@8_p#_&!...@8&!...@8&!...@8&!...@8&!\8&!...@8&!...@`
+m_p`...@8&!...@8&!C_&!...@8&!...@8&!...@8&!...@?&!\8&!...@8&!...@v-c8v
+M-C8V-S8V-C8V-C8V-C8V-S`_```_,##`0`-AL;&QL;```>,P8,&#\
+=`'Q\?'Q\?'P0"```
+`
+end
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mai

svn commit: r216040 - head/share/syscons/fonts

[Xin LI]

Author: delphij
Date: Mon Nov 29 05:50:20 2010
New Revision: 216040
URL: http://svn.freebsd.org/changeset/base/216040

Log:
  Make German formal clause to be consistent with the keymap counterpart.
  
  Submitted by: arundel
  MFC after:1 week

Modified:
  head/share/syscons/fonts/INDEX.fonts

Modified: head/share/syscons/fonts/INDEX.fonts
==
--- head/share/syscons/fonts/INDEX.fontsMon Nov 29 04:57:46 2010
(r216039)
+++ head/share/syscons/fonts/INDEX.fontsMon Nov 29 05:50:20 2010
(r216040)
@@ -49,7 +49,7 @@
 # Language support: MENU, FONT
 #
 MENU:en:Choose your keyboard font
-MENU:de:W�hle Deine Schrift
+MENU:de:W�hlen Sie Ihre Schrift
 MENU:fr:Choisissez votre fonte �cran
 MENU:pl:Wybierz czcionk� ekranow�
 MENU:es:Escoja el juego de caracteres
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r216130 - head/usr.bin/kdump

[Xin LI]

Author: delphij
Date: Thu Dec  2 18:24:22 2010
New Revision: 216130
URL: http://svn.freebsd.org/changeset/base/216130

Log:
  Decode IPC_CREAT and IPC_EXCL for semget(2).
  
  PR:   bin/152781
  Submitted by: Anton Yuzhaninov 
  MFC after:2 weeks

Modified:
  head/usr.bin/kdump/mksubr

Modified: head/usr.bin/kdump/mksubr
==
--- head/usr.bin/kdump/mksubr   Thu Dec  2 18:01:18 2010(r216129)
+++ head/usr.bin/kdump/mksubr   Thu Dec  2 18:24:22 2010(r216130)
@@ -254,6 +254,8 @@ shmctlname (int cmd) {
 void
 semgetname (int flag) {
int or = 0;
+   if_print_or(flag, IPC_CREAT, or);
+   if_print_or(flag, IPC_EXCL, or);
if_print_or(flag, SEM_R, or);
if_print_or(flag, SEM_A, or);
if_print_or(flag, (SEM_R>>3), or);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r216147 - head/sbin/geom/class/eli

[Xin LI]

Author: delphij
Date: Fri Dec  3 10:06:19 2010
New Revision: 216147
URL: http://svn.freebsd.org/changeset/base/216147

Log:
   * Recommend a overwrite of whole geli provider before use.
   * Correct a typo while I'm there.
  
  Reviewed by:  pjd
  MFC after:2 weeks

Modified:
  head/sbin/geom/class/eli/geli.8

Modified: head/sbin/geom/class/eli/geli.8
==
--- head/sbin/geom/class/eli/geli.8 Fri Dec  3 09:26:56 2010
(r216146)
+++ head/sbin/geom/class/eli/geli.8 Fri Dec  3 10:06:19 2010
(r216147)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 20, 2010
+.Dd December 3, 2010
 .Dt GELI 8
 .Os
 .Sh NAME
@@ -842,7 +842,7 @@ Enter passphrase:
 .Nm
 supports two encryption modes:
 .Nm XTS ,
-which was standarized as
+which was standardized as
 .Nm IEE P1619
 and
 .Nm CBC
@@ -873,6 +873,10 @@ changes with the data he owns without no
 In other words
 .Nm
 will not protect your data against replay attacks.
+.Pp
+It is recommended to write the whole provider before the first use,
+in order to make sure that all sectors and their corresponding
+checksums are properly initialized into a consistent state.
 .Sh SEE ALSO
 .Xr crypto 4 ,
 .Xr gbde 4 ,
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r216147 - head/sbin/geom/class/eli

[Xin LI]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

On 12/03/10 09:15, Ulrich Spörlein wrote:
> On Fri, 03.12.2010 at 10:06:19 +0000, Xin LI wrote:
>> Author: delphij
>> Date: Fri Dec  3 10:06:19 2010
>> New Revision: 216147
>> URL: http://svn.freebsd.org/changeset/base/216147
>>
>> Log:
>>* Recommend a overwrite of whole geli provider before use.
>>* Correct a typo while I'm there.
>>   
>>   Reviewed by:   pjd
>>   MFC after: 2 weeks
>>
>> Modified:
>>   head/sbin/geom/class/eli/geli.8
>>
>> Modified: head/sbin/geom/class/eli/geli.8
>> ==
>> --- head/sbin/geom/class/eli/geli.8  Fri Dec  3 09:26:56 2010
>> (r216146)
>> +++ head/sbin/geom/class/eli/geli.8  Fri Dec  3 10:06:19 2010
>> (r216147)
>> @@ -24,7 +24,7 @@
>>  .\"
>>  .\" $FreeBSD$
>>  .\"
>> -.Dd October 20, 2010
>> +.Dd December 3, 2010
>>  .Dt GELI 8
>>  .Os
>>  .Sh NAME
>> @@ -842,7 +842,7 @@ Enter passphrase:
>>  .Nm
>>  supports two encryption modes:
>>  .Nm XTS ,
>> -which was standarized as
>> +which was standardized as
>>  .Nm IEE P1619
>>  and
>>  .Nm CBC
>> @@ -873,6 +873,10 @@ changes with the data he owns without no
>>  In other words
>>  .Nm
>>  will not protect your data against replay attacks.
>> +.Pp
>> +It is recommended to write the whole provider before the first use,
>> +in order to make sure that all sectors and their corresponding
>> +checksums are properly initialized into a consistent state.
>>  .Sh SEE ALSO
>>  .Xr crypto 4 ,
>>  .Xr gbde 4 ,
> 
> I'm not sure this wording is very helpful. Why should there be a
> "consistent" state? In fact, if you write all zeros to the partition
> before creating the geom, then an attacker pretty much knows how much
> data you have written to the provider. I'm not saying this weakens any
> security, but I think the current phrasing will confuse the reader. What
> needs to be consistent? What does writing to the provider mean?
> 
> Or am I mixing up provider and consumer here?

How would you like the attached patch?

Cheers,
- -- 
Xin LI http://www.delphij.net/
FreeBSD - The Power to Serve!  Live free or die
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.16 (FreeBSD)

iQEcBAEBCAAGBQJM+UkvAAoJEATO+BI/yjfBP1oIANH6E0mTqQWc8b0WFd61YYTr
t2YTiJGyUXa1bt9LnhQr8iasCYKx9AqAHO0sDMjezo94jYfpyW/C0jYD7vj+fuIP
m84CWUfbKC079REhvv/j9t+mbcEFiQK3u4I3nG/ArNSbjXZUOvkav3c20rGHtwEy
ncwGWwTB/5Z5zIT4hPS4e6hiUSR5afBQu+Ww0CqyK2S3w6cdY/kQyyFH8De4TbnX
MBhJw/74Y6mRM0PjsIuISP59ZxV5OelWz/DZmcP6tNXmpv3ExW6TmD4ov9X/9eYS
WRNi2ygNpGMKHx/8RqKtDOdQ1R0nz9lKUt3Zg5q8GhGS0Lce4GuoaRr0XWQD19I=
=ipPy
-END PGP SIGNATURE-
Index: geli.8
===
--- geli.8  (revision 216157)
+++ geli.8  (working copy)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 3, 2010
+.Dd December 4, 2010
 .Dt GELI 8
 .Os
 .Sh NAME
@@ -874,7 +874,15 @@
 .Nm
 will not protect your data against replay attacks.
 .Pp
-It is recommended to write the whole provider before the first use,
+The
+.Nm
+class does not distinguish whether data is written after its creation,
+therefore, read from
+.Dq uninitialized
+area may result in false positives on data corruption.
+It is recommended to write the whole provider
+.Pq for instance, Pa /dev/ Ns Ao prov Ac Ns .eli
+before its first use, ideally with random data,
 in order to make sure that all sectors and their corresponding
 checksums are properly initialized into a consistent state.
 .Sh SEE ALSO
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r216344 - stable/8/share/syscons/fonts

[Xin LI]

Author: delphij
Date: Fri Dec 10 00:52:54 2010
New Revision: 216344
URL: http://svn.freebsd.org/changeset/base/216344

Log:
  MFC r216040:
  
  Make German formal clause to be consistent with the keymap counterpart.
  
  Submitted by: arundel
  Approved by:  re (kensmith, bz)

Modified:
  stable/8/share/syscons/fonts/INDEX.fonts
Directory Properties:
  stable/8/share/syscons/   (props changed)

Modified: stable/8/share/syscons/fonts/INDEX.fonts
==
--- stable/8/share/syscons/fonts/INDEX.fontsThu Dec  9 23:57:23 2010
(r216343)
+++ stable/8/share/syscons/fonts/INDEX.fontsFri Dec 10 00:52:54 2010
(r216344)
@@ -49,7 +49,7 @@
 # Language support: MENU, FONT
 #
 MENU:en:Choose your keyboard font
-MENU:de:W�hle Deine Schrift
+MENU:de:W�hlen Sie Ihre Schrift
 MENU:fr:Choisissez votre fonte �cran
 MENU:pl:Wybierz czcionk� ekranow�
 MENU:es:Escoja el juego de caracteres
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"