Date: Fri, 2 Jun 2006 11:19:26 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 98328 for review Message-ID: <200606021119.k52BJQP8073046@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=98328 Change 98328 by jb@jb_freebsd2 on 2006/06/02 11:19:24 IFC Affected files ... .. //depot/projects/dtrace/src/MAINTAINERS#5 integrate .. //depot/projects/dtrace/src/etc/defaults/rc.conf#10 integrate .. //depot/projects/dtrace/src/etc/devd.conf#2 integrate .. //depot/projects/dtrace/src/etc/hosts.allow#2 integrate .. //depot/projects/dtrace/src/etc/rc.d/Makefile#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/bridge#1 branch .. //depot/projects/dtrace/src/etc/rc.d/devd#2 integrate .. //depot/projects/dtrace/src/etc/rc.d/netif#2 integrate .. //depot/projects/dtrace/src/lib/libc/gen/getgrent.c#3 integrate .. //depot/projects/dtrace/src/lib/libc/sys/truncate.2#2 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#11 integrate .. //depot/projects/dtrace/src/sbin/ipfw/ipfw2.c#4 integrate .. //depot/projects/dtrace/src/sbin/mount_msdosfs/mount_msdosfs.c#2 integrate .. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#7 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/busdma_machdep.c#4 integrate .. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/dtrace/src/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/pccbb/pccbb.c#5 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#2 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c#2 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#2 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#2 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/xfs_attr.c#2 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/xfs_bit.c#2 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/xfs_dfrag.c#2 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/xfs_dir2_trace.c#2 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/xfs_inode.c#2 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/xfs_iomap.c#2 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/xfs_trans.c#2 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/xfs_vfsops.c#2 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/xfs_vnodeops.c#2 integrate .. //depot/projects/dtrace/src/sys/i386/i386/busdma_machdep.c#4 integrate .. //depot/projects/dtrace/src/sys/ia64/conf/NOTES#2 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/busdma_machdep.c#3 integrate .. //depot/projects/dtrace/src/sys/kern/kern_switch.c#2 integrate .. //depot/projects/dtrace/src/sys/net/if.c#2 integrate .. //depot/projects/dtrace/src/sys/net/if_media.h#2 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_node.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/dtrace/src/sys/vm/vm_page.c#3 integrate .. //depot/projects/dtrace/src/usr.sbin/bluetooth/hccontrol/hccontrol.c#3 integrate .. //depot/projects/dtrace/src/usr.sbin/cron/cron/do_command.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/cron/cron/popen.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/ypserv/yp_access.c#2 integrate .. //depot/projects/dtrace/www/de/docs/books.sgml#3 integrate .. //depot/projects/dtrace/www/de/docs/man.sgml#2 integrate .. //depot/projects/dtrace/www/de/includes.navdownload.sgml#3 integrate .. //depot/projects/dtrace/www/de/includes.sgml#6 integrate .. //depot/projects/dtrace/www/de/includes.xsl#6 integrate .. //depot/projects/dtrace/www/de/index.xsl#5 integrate .. //depot/projects/dtrace/www/de/news/news.xml#7 integrate .. //depot/projects/dtrace/www/de/news/press.xml#5 integrate .. //depot/projects/dtrace/www/de/releases/index.sgml#3 integrate .. //depot/projects/dtrace/www/de/security/security.sgml#3 integrate .. //depot/projects/dtrace/www/en/docproj/todo.sgml#5 integrate .. //depot/projects/dtrace/www/en/projects/ideas/index.sgml#6 integrate .. //depot/projects/dtrace/www/en/releases/4.11R/errata.html#2 integrate .. //depot/projects/dtrace/www/en/releases/5.5R/errata.html#3 integrate .. //depot/projects/dtrace/www/en/releases/6.1R/errata.html#3 integrate .. //depot/projects/dtrace/www/share/sgml/advisories.xml#3 integrate Differences ... ==== //depot/projects/dtrace/src/MAINTAINERS#5 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.133 2006/05/28 18:42:59 jmg Exp $ +$FreeBSD: src/MAINTAINERS,v 1.134 2006/06/01 05:06:54 mjacob Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -44,7 +44,8 @@ witness jhb Pre-commit review requested. twe aradford@amcc.com Pre-commit review requested twa aradford@amcc.com Pre-commit review requested -aac scottl Pre-commit review requested +busdma scottl Pre-commit review requested. +aac scottl Pre-commit review requested. udf scottl Pre-commit review requested. ips scottl Pre-commit review requested. iir scottl Pre-commit review requested. ==== //depot/projects/dtrace/src/etc/defaults/rc.conf#10 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.286 2006/05/30 16:20:48 matteo Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.287 2006/06/01 11:01:53 thompsa Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -159,6 +159,9 @@ #ifconfig_fxp0_name="net0" # Change interface name from fxp0 to net0. #ipv4_addrs_fxp0="192.168.0.1/24 192.168.1.1-5/28" # example IPv4 address entry. # +#autobridge_interfaces="bridge0" # List of bridges to check +#autobridge_bridge0="tap* vlan0" # Interface glob to automatically add to the bridge +# # If you have any sppp(4) interfaces above, you might also want to set # the following parameters. Refer to spppcontrol(8) for their meaning. sppp_interfaces="" # List of sppp interfaces. ==== //depot/projects/dtrace/src/etc/devd.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.32 2006/03/16 17:42:27 emax Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.33 2006/06/01 00:41:07 thompsa Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -28,17 +28,19 @@ # override these general rules. # -# For ethernet like devices start configuring the interface. Due to -# a historical accident, this script is called pccard_ether. +# Configure the interface on attach. Due to a historical accident, this +# script is called pccard_ether. # -attach 0 { - media-type "ethernet"; - action "/etc/pccard_ether $device-name start"; +notify 0 { + match "system" "IFNET"; + match "type" "ATTACH"; + action "/etc/pccard_ether $subsystem start"; }; -detach 0 { - media-type "ethernet"; - action "/etc/pccard_ether $device-name stop"; +notify 0 { + match "system" "IFNET"; + match "type" "DETACH"; + action "/etc/pccard_ether $subsystem stop"; }; # ==== //depot/projects/dtrace/src/etc/hosts.allow#2 (text+ko) ==== @@ -1,6 +1,6 @@ # # hosts.allow access control file for "tcp wrapped" applications. -# $FreeBSD: src/etc/hosts.allow,v 1.21 2006/03/17 18:54:21 ru Exp $ +# $FreeBSD: src/etc/hosts.allow,v 1.22 2006/06/01 14:14:58 csjp Exp $ # # NOTE: The hosts.deny file is deprecated. # Place both 'allow' and 'deny' rules in the hosts.allow file. @@ -66,6 +66,7 @@ rpcbind : ALL : deny # NIS master server. Only local nets should have access +# (Since this is an RPC service, rpcbind needs to be considered) ypserv : localhost : allow ypserv : .unsafe.my.net.example.com : deny ypserv : .my.net.example.com : allow ==== //depot/projects/dtrace/src/etc/rc.d/Makefile#4 (text+ko) ==== @@ -1,12 +1,12 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.72 2006/05/18 15:29:27 flz Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.73 2006/06/01 11:01:54 thompsa Exp $ .include <bsd.own.mk> FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ apm apmd archdep atm1 atm2 atm3 auditd \ - bgfsck bluetooth bootparams bsnmpd \ + bgfsck bluetooth bootparams bridge bsnmpd \ ccd cleanvar cleartmp cron \ devd devfs dhclient \ dmesg dumpon \ ==== //depot/projects/dtrace/src/etc/rc.d/devd#2 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devd,v 1.8 2005/10/28 16:55:38 yar Exp $ +# $FreeBSD: src/etc/rc.d/devd,v 1.9 2006/06/01 00:41:07 thompsa Exp $ # # PROVIDE: devd -# REQUIRE: NETWORKING -# BEFORE: mountcritremote +# REQUIRE: netif +# BEFORE: NETWORKING mountcritremote # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/dtrace/src/etc/rc.d/netif#2 (text+ko) ==== @@ -22,7 +22,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. # -# $FreeBSD: src/etc/rc.d/netif,v 1.19 2006/02/13 20:08:31 imp Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.20 2006/06/01 11:01:54 thompsa Exp $ # # PROVIDE: netif @@ -71,6 +71,9 @@ # Resync ipfilter /etc/rc.d/ipfilter resync fi + if [ -f /etc/rc.d/bridge -a -n "$_cmdifn" ] ; then + /etc/rc.d/bridge start $_cmdifn + fi } network_stop() ==== //depot/projects/dtrace/src/lib/libc/gen/getgrent.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.33 2006/04/28 12:03:35 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.34 2006/06/01 15:45:06 maxim Exp $"); #include "namespace.h" #include <sys/param.h> @@ -721,6 +721,7 @@ gid_t gid; char *buffer; size_t bufsize, linesize; + off_t pos; int rv, stayopen, *errnop; name = NULL; @@ -757,6 +758,7 @@ stayopen = st->stayopen; } rv = NS_NOTFOUND; + pos = ftello(st->fp); while ((line = fgetln(st->fp, &linesize)) != NULL) { if (line[linesize-1] == '\n') linesize--; @@ -768,10 +770,12 @@ * pointer for the member list terminator. */ if (bufsize <= linesize + _ALIGNBYTES + sizeof(char *)) { + fseeko(st->fp, pos, SEEK_SET); *errnop = ERANGE; rv = NS_RETURN; break; } + pos = ftello(st->fp); memcpy(buffer, line, linesize); buffer[linesize] = '\0'; rv = __gr_parse_entry(buffer, linesize, grp, @@ -1183,6 +1187,7 @@ char *buffer, *p; void *discard; size_t bufsize, linesize; + off_t pos; int rv, stayopen, *errnop; #define set_lookup_type(x, y) do { \ @@ -1286,6 +1291,7 @@ break; } rv = NS_NOTFOUND; + pos = ftello(st->fp); while ((line = fgetln(st->fp, &linesize)) != NULL) { if (line[linesize-1] == '\n') linesize--; @@ -1316,10 +1322,12 @@ * pointer for the member list terminator. */ if (bufsize <= linesize + _ALIGNBYTES + sizeof(char *)) { + fseeko(st->fp, pos, SEEK_SET); *errnop = ERANGE; rv = NS_RETURN; break; } + pos = ftello(st->fp); memcpy(buffer, line, linesize); buffer[linesize] = '\0'; rv = __gr_parse_entry(buffer, linesize, grp, ==== //depot/projects/dtrace/src/lib/libc/sys/truncate.2#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)truncate.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/truncate.2,v 1.17 2005/01/20 09:17:05 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/truncate.2,v 1.18 2006/06/01 14:20:43 maxim Exp $ .\" -.Dd June 4, 1993 +.Dd June 1, 2006 .Dt TRUNCATE 2 .Os .Sh NAME @@ -69,6 +69,10 @@ the file must be open for writing. .Sh RETURN VALUES .Rv -std +If the file to be modified is not a directory or +a regular file, the +.Fn truncate +call has no effect and returns the value 0. .Sh ERRORS The .Fn truncate ==== //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#11 (text+ko) ==== @@ -3,7 +3,7 @@ <corpauthor>The &os; Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.936 2006/05/27 14:26:49 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.938 2006/05/31 23:49:51 bmah Exp $</pubdate> <copyright> <year>2000</year> @@ -118,67 +118,79 @@ could allow a local attacker to overwrite files in the context of a user running the &man.texindex.1; utility, has been fixed. For more details see security advisory <ulink - url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:01.texindex.asc">FreeBSD-SA-06:01.texindex</ulink>. &merged;</para> + url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:01.texindex.asc">FreeBSD-SA-06:01.texindex</ulink>. &merged;</para> <para>A temporary file vulnerability in the &man.ee.1; text editor, which could allow a local attacker to overwrite files in the context of a user running &man.ee.1;, has been fixed. For more details see security advisory <ulink - url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:02.ee.asc">FreeBSD-SA-06:02.ee</ulink>. &merged;</para> + url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:02.ee.asc">FreeBSD-SA-06:02.ee</ulink>. &merged;</para> <para>Several vulnerabilities in the &man.cpio.1; utility have been corrected. For more details see security advisory <ulink - url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:03.cpio.asc">FreeBSD-SA-06:03.cpio</ulink>. &merged;</para> + url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:03.cpio.asc">FreeBSD-SA-06:03.cpio</ulink>. &merged;</para> <para>An error in &man.ipfw.4; IP fragment handling, which could cause a crash, has been fixed. For more details see security advisory <ulink - url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:04.ipfw.asc">FreeBSD-SA-06:04.ipfw</ulink>. &merged;</para> + url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:04.ipfw.asc">FreeBSD-SA-06:04.ipfw</ulink>. &merged;</para> <para>A potential buffer overflow in the IEEE 802.11 scanning code has been corrected. For more details see security advisory <ulink - url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:05.80211.asc">FreeBSD-SA-06:05.80211</ulink>. &merged;</para> + url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:05.80211.asc">FreeBSD-SA-06:05.80211</ulink>. &merged;</para> <para>Two instances in which portions of kernel memory could be disclosed to users have been fixed. For more details see security advisory <ulink - url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:06.kmem.asc">FreeBSD-SA-06:06.kmem</ulink>. &merged;</para> + url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:06.kmem.asc">FreeBSD-SA-06:06.kmem</ulink>. &merged;</para> <para>A logic bug in the IP fragment handling in &man.pf.4;, which could cause a crash under certain circumstances, has been fixed. For more details see security advisory <ulink - url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:07.pf.asc">FreeBSD-SA-06:07.pf</ulink>. &merged;</para> + url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:07.pf.asc">FreeBSD-SA-06:07.pf</ulink>. &merged;</para> <para>A logic bug in the NFS server code, which could cause a crash when the server received a message with a zero-length payload, has been fixed. For more details see security advisory <ulink - url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:10.nfs.asc">FreeBSD-SA-06:10.nfs</ulink>. &merged;</para> + url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:10.nfs.asc">FreeBSD-SA-06:10.nfs</ulink>. &merged;</para> <para>A programming error in the &man.fast.ipsec.4; implementation results in the sequence number associated with a Security Association not being updated, allowing packets to unconditionally pass sequence number verification checks, has been fixed. For more details see security advisory <ulink - url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:11.ipsec.asc">FreeBSD-SA-06:11.ipsec</ulink>. &merged;</para> + url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:11.ipsec.asc">FreeBSD-SA-06:11.ipsec</ulink>. &merged;</para> <para>A logic bug that could cause &man.opiepasswd.1; to allow an unprivileged user to configure OPIE authentication for the root user under certain circumstances, has been fixed. For more details see security advisory <ulink - url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:12.opie.asc">FreeBSD-SA-06:12.opie</ulink>. &merged;</para> + url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:12.opie.asc">FreeBSD-SA-06:12.opie</ulink>. &merged;</para> <para>An asynchronous signal handling vulnerability in &man.sendmail.8;, which could allow a remote attacker to execute arbitrary code with the privileges of the user running sendmail, typically root, has been fixed. For more details see security advisory <ulink - url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:13.sendmail.asc">FreeBSD-SA-06:13.sendmail</ulink>. &merged;</para> + url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:13.sendmail.asc">FreeBSD-SA-06:13.sendmail</ulink>. &merged;</para> <para arch="i386,amd64">An information disclosure issue found in the &os; kernel running on 7th- and 8th-generation AMD processors has been fixed. For more details see security advisory <ulink - url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:14.fpu.asc">FreeBSD-SA-06:14.fpu</ulink>. &merged;</para> + url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:14.fpu.asc">FreeBSD-SA-06:14.fpu</ulink>. &merged;</para> + + <para>A bug in &man.ypserv.8;, which effectively disabled the + <filename>/var/yp/securenets</filename> access control mechanism, + has been corrected. More details are available in security + advisory + <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:15.ypserv.asc">FreeBSD-SA-06:15.ypserv</ulink>. &merged;</para> + + <para>A bug in the smbfs file system, which could allow an + attacker to escape out of &man.chroot.2 environments on an smbfs + mounted filesystem, has been fixed. For more details, see + security advisory + <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:16.smbfs.asc">FreeBSD-SA-06:16.smbfs</ulink>. &merged;</para> </sect2> ==== //depot/projects/dtrace/src/sbin/ipfw/ipfw2.c#4 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.89 2006/05/24 13:09:55 oleg Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.90 2006/06/02 05:17:17 mlaier Exp $ */ #include <sys/param.h> @@ -1965,6 +1965,7 @@ struct protoent *pe; struct in_addr a; uint16_t rulenum; + char buf[INET6_ADDRSTRLEN]; if (!do_expired) { if (!d->expire && !(d->dyn_type == O_LIMIT_PARENT)) @@ -1993,11 +1994,20 @@ else printf(" proto %u", d->id.proto); - a.s_addr = htonl(d->id.src_ip); - printf(" %s %d", inet_ntoa(a), d->id.src_port); + if (d->id.addr_type == 4) { + a.s_addr = htonl(d->id.src_ip); + printf(" %s %d", inet_ntoa(a), d->id.src_port); - a.s_addr = htonl(d->id.dst_ip); - printf(" <-> %s %d", inet_ntoa(a), d->id.dst_port); + a.s_addr = htonl(d->id.dst_ip); + printf(" <-> %s %d", inet_ntoa(a), d->id.dst_port); + } else if (d->id.addr_type == 6) { + printf(" %s %d", inet_ntop(AF_INET6, &d->id.src_ip6, buf, + sizeof(buf)), d->id.src_port); + printf(" <-> %s %d", inet_ntop(AF_INET6, &d->id.dst_ip6, buf, + sizeof(buf)), d->id.dst_port); + } else + printf(" UNKNOWN <-> UNKNOWN\n"); + printf("\n"); } ==== //depot/projects/dtrace/src/sbin/mount_msdosfs/mount_msdosfs.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/mount_msdosfs/mount_msdosfs.c,v 1.41 2005/12/01 00:18:48 avatar Exp $"; + "$FreeBSD: src/sbin/mount_msdosfs/mount_msdosfs.c,v 1.42 2006/06/01 02:25:00 rodrigc Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -57,14 +57,6 @@ #include "mntopts.h" -static struct mntopt mopts[] = { - MOPT_STDOPTS, - MOPT_FORCE, - MOPT_SYNC, - MOPT_UPDATE, - MOPT_END -}; - static gid_t a_gid(char *); static uid_t a_uid(char *); static mode_t a_mask(char *); @@ -78,7 +70,6 @@ int iovlen = 0; struct stat sb; int c, mntflags, set_gid, set_uid, set_mask, set_dirmask; - int optflags = 0; char *dev, *dir, mntpath[MAXPATHLEN], *csp; char fstype[] = "msdosfs"; char *cs_dos = NULL; @@ -136,7 +127,6 @@ case 'o': { char *p = NULL; char *val = strdup(""); - getmntopts(optarg, mopts, &mntflags, &optflags); p = strchr(optarg, '='); if (p != NULL) { free(val); ==== //depot/projects/dtrace/src/share/man/man5/rc.conf.5#7 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.298 2006/05/30 16:20:48 matteo Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.299 2006/06/01 11:01:54 thompsa Exp $ .\" .Dd May 29, 2006 .Dt RC.CONF 5 @@ -3573,6 +3573,23 @@ Both the .Xr md 4 device and the mount point will be changed. +.It Va autobridge_interfaces +.Pq Vt str +Set to the list of bridge interfaces that will have newly arriving interfaces +checked against to be automatically added. +If not set to +.Dq Li NO +then for each whitespace separated +.Ar element +in the value, a +.Va autobridge_ Ns Aq Ar element +variable is assumed to exist which has a whitespace separated list of interface +names to match, these names can use wildcards. +For example: +.Bd -literal +autobridge_interfaces="bridge0" +autobridge_bridge0="tap* dc0 vlan[345]" +.Ed .El .Sh FILES .Bl -tag -width ".Pa /etc/defaults/rc.conf" -compact @@ -3590,6 +3607,7 @@ .Xr sh 1 , .Xr vi 1 , .Xr vidcontrol 1 , +.Xr bridge 4 , .Xr ip 4 , .Xr ipf 4 , .Xr ipfw 4 , ==== //depot/projects/dtrace/src/sys/amd64/amd64/busdma_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.76 2006/05/31 00:37:56 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.77 2006/06/01 04:49:29 silby Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -469,7 +469,7 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags, bus_dmamap_t *mapp) { - int mflags, malloc_used, swasnull = 0; + int mflags; if (flags & BUS_DMA_NOWAIT) mflags = M_NOWAIT; @@ -490,7 +490,6 @@ __func__, dmat, dmat->flags, ENOMEM); return (ENOMEM); } - swasnull = 1; } /* @@ -499,13 +498,12 @@ * alignment guarantees of malloc need to be nailed down, and the * code below should be rewritten to take that into account. * - * In the meantime, we'll return an error if malloc gets it wrong. + * In the meantime, we'll warn the user if malloc gets it wrong. */ if ((dmat->maxsize <= PAGE_SIZE) && (dmat->alignment < dmat->maxsize) && dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem)) { *vaddr = malloc(dmat->maxsize, M_DEVBUF, mflags); - malloc_used = 1; } else { /* * XXX Use Contigmalloc until it is merged into this facility @@ -516,29 +514,13 @@ *vaddr = contigmalloc(dmat->maxsize, M_DEVBUF, mflags, 0ul, dmat->lowaddr, dmat->alignment? dmat->alignment : 1ul, dmat->boundary); - malloc_used = 0; } if (*vaddr == NULL) { - if (swasnull) { - free(dmat->segments, M_DEVBUF); - dmat->segments = NULL; - } CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", __func__, dmat, dmat->flags, ENOMEM); return (ENOMEM); - } - if ((uintptr_t)*vaddr & (dmat->alignment - 1)) { + } else if ((uintptr_t)*vaddr & (dmat->alignment - 1)) { printf("bus_dmamem_alloc failed to align memory properly."); - if (malloc_used) { - free(*vaddr, M_DEVBUF); - } else { - contigfree(*vaddr, dmat->maxsize, M_DEVBUF); - } - if (swasnull) { - free(dmat->segments, M_DEVBUF); - dmat->segments = NULL; - } - return (EINVAL); } CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", __func__, dmat, dmat->flags, ENOMEM); ==== //depot/projects/dtrace/src/sys/arm/arm/pmap.c#5 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.51 2006/05/31 15:52:11 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.52 2006/06/01 01:31:07 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -198,6 +198,8 @@ static void pmap_free_pv_entry (pv_entry_t); static pv_entry_t pmap_get_pv_entry(void); +static void pmap_enter_locked(pmap_t, vm_offset_t, vm_page_t, + vm_prot_t, boolean_t); static void pmap_vac_me_harder(struct vm_page *, pmap_t, vm_offset_t); static void pmap_vac_me_kpmap(struct vm_page *, pmap_t, @@ -3337,6 +3339,19 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, boolean_t wired) { + + vm_page_lock_queues(); + pmap_enter_locked(pmap, va, m, prot, wired); + vm_page_unlock_queues(); +} + +/* + * The page queues and pmap must be locked. + */ +static void +pmap_enter_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, + boolean_t wired) +{ struct l2_bucket *l2b = NULL; struct vm_page *opg; struct pv_entry *pve = NULL; @@ -3345,7 +3360,7 @@ u_int oflags; vm_paddr_t pa; - vm_page_lock_queues(); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); if (va == vector_page) { pa = systempage.pv_pa; m = NULL; @@ -3561,7 +3576,6 @@ if (m) pmap_vac_me_harder(m, pmap, va); } - vm_page_unlock_queues(); } /* @@ -3578,15 +3592,9 @@ vm_page_t mpte) { - vm_page_busy(m); - vm_page_unlock_queues(); - VM_OBJECT_UNLOCK(m->object); - mtx_lock(&Giant); - pmap_enter(pmap, va, m, prot & (VM_PROT_READ | VM_PROT_EXECUTE), FALSE); - mtx_unlock(&Giant); - VM_OBJECT_LOCK(m->object); - vm_page_lock_queues(); - vm_page_wakeup(m); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + pmap_enter_locked(pmap, va, m, prot & (VM_PROT_READ | VM_PROT_EXECUTE), + FALSE); return (NULL); } ==== //depot/projects/dtrace/src/sys/arm/include/cpufunc.h#2 (text+ko) ==== @@ -38,7 +38,7 @@ * * Prototypes for cpu, mmu and tlb related functions. * - * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.7 2005/06/03 19:49:53 cognet Exp $ + * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.8 2006/06/01 16:17:44 cognet Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -460,7 +460,7 @@ (mask) & (I32_bit | F32_bit))) #define enable_interrupts(mask) \ - (__set_cpsr_c((mask | F32_bit) & (I32_bit | F32_bit), 0)) + (__set_cpsr_c((mask) & (I32_bit | F32_bit), 0)) #define restore_interrupts(old_cpsr) \ (__set_cpsr_c((I32_bit | F32_bit), (old_cpsr) & (I32_bit | F32_bit))) ==== //depot/projects/dtrace/src/sys/dev/pccbb/pccbb.c#5 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.145 2006/05/24 17:26:16 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.146 2006/06/02 06:33:35 imp Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -465,7 +465,11 @@ { struct cbb_softc *sc = device_get_softc(brdev); - if (child != sc->cbdev && child != sc->exca[0].pccarddev) + if (child == sc->cbdev) + sc->cbdev = NULL; + else if (child == sc->exca[0].pccarddev) + sc->exca[0].pccarddev = NULL; + else device_printf(brdev, "Unknown child detached: %s\n", device_get_nameunit(child)); } ==== //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vfsops.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.150 2006/05/26 00:32:20 rodrigc Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.151 2006/06/01 02:25:00 rodrigc Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */ /*- @@ -79,7 +79,7 @@ /* List of mount options we support */ static const char *msdosfs_opts[] = { "from", - "export", + "export", "force", "sync", "uid", "gid", "mask", "dirmask", "shortname", "shortnames", "longname", "longnames", "nowin95", "win95", "kiconv", "cs_win", "cs_dos", "cs_local", ==== //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_vnops.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/smbfs/smbfs_vnops.c,v 1.61 2005/04/13 10:59:08 jeff Exp $ + * $FreeBSD: src/sys/fs/smbfs/smbfs_vnops.c,v 1.62 2006/05/31 22:31:08 cperciva Exp $ */ #include <sys/param.h> #include <sys/systm.h> @@ -1018,11 +1018,18 @@ static int smbfs_pathcheck(struct smbmount *smp, const char *name, int nmlen, int nameiop) { - static const char *badchars = "*/\\:<>;?"; + static const char *badchars = "*/:<>;?"; static const char *badchars83 = " +|,[]="; const char *cp; int i, error; + /* + * Backslash characters, being a path delimiter, are prohibited + * within a path component even for LOOKUP operations. + */ + if (index(name, '\\') != NULL) + return ENOENT; + if (nameiop == LOOKUP) return 0; error = ENOENT; ==== //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#2 (text+ko) ==== @@ -36,6 +36,7 @@ #include "xfs.h" +#include "xfs_macros.h" #include "xfs_fs.h" #include "xfs_inum.h" #include "xfs_log.h" @@ -156,7 +157,7 @@ size_t count, /* size of data to zero */ loff_t end_size) /* max file size to set */ { -#if XXXKAN +#ifdef XXXKAN unsigned bytes; struct page *page; struct address_space *mapping; @@ -307,7 +308,7 @@ if (!(ioflags & IO_ISLOCKED)) xfs_ilock(ip, XFS_IOLOCK_SHARED); -#if XXXKAN +#ifdef XXXKAN if (DM_EVENT_ENABLED(BHV_TO_VNODE(bdp)->v_vfsp, ip, DM_EVENT_READ) && !(ioflags & IO_INVIS)) { int error; @@ -581,7 +582,7 @@ int ioflags, cred_t *credp) { -#if XXXKAN +#ifdef XXXKAN xfs_inode_t *xip; xfs_mount_t *mp; ssize_t ret; ==== //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c#2 (text+ko) ==== @@ -70,7 +70,7 @@ xfs_off_t last, int fiopt) { -#if XXXKAN +#ifdef XXXKAN vnode_t *vp = BHV_TO_VNODE(bdp); struct inode *ip = LINVFS_GET_IP(vp); @@ -91,7 +91,7 @@ xfs_off_t last, int fiopt) { -#if XXXKAN +#ifdef XXXKAN vnode_t *vp = BHV_TO_VNODE(bdp); struct inode *ip = LINVFS_GET_IP(vp); @@ -117,7 +117,7 @@ uint64_t flags, int fiopt) { -#if XXXKAN +#ifdef XXXKAN vnode_t *vp = BHV_TO_VNODE(bdp); struct inode *ip = LINVFS_GET_IP(vp); ==== //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#2 (text+ko) ==== @@ -435,7 +435,7 @@ mrlock_init(&ip->i_lock, MRLOCK_ALLOW_EQUAL_PRI|MRLOCK_BARRIER, "xfsino", (long)vp->v_number); mrlock_init(&ip->i_iolock, MRLOCK_BARRIER, "xfsio", vp->v_number); -#if XXXKAN +#ifdef XXXKAN init_waitqueue_head(&ip->i_ipin_wait); #endif atomic_set(&ip->i_pincount, 0); @@ -653,7 +653,7 @@ } } -#if XXXKAN +#ifdef XXXKAN /* * Not sure if while i_reclaim crap is needed on * FreeBSD, will revisit this later. ==== //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#2 (text+ko) ==== @@ -32,6 +32,7 @@ #include "xfs.h" +#include "xfs_macros.h" #include "xfs_fs.h" #include "xfs_inum.h" #include "xfs_log.h" @@ -68,7 +69,7 @@ #include "xfs_fsops.h" -#if XXXKAN +#ifdef XXXKAN /* * ioctl commands that are used by Linux filesystems */ ==== //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 (text+ko) ==== @@ -32,6 +32,7 @@ #include "xfs.h" +#include "xfs_macros.h" #include "xfs_inum.h" #include "xfs_log.h" #include "xfs_clnt.h" ==== //depot/projects/dtrace/src/sys/gnu/fs/xfs/xfs_attr.c#2 (text+ko) ==== @@ -2560,7 +2560,7 @@ struct xfs_vnode *vp, cred_t *cred) { -#if XXXKAN +#ifdef XXXKAN struct inode *inode = LINVFS_GET_IP(vp); if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) @@ -2580,7 +2580,7 @@ struct xfs_vnode *vp, cred_t *cred) { -#if XXXKAN +#ifdef XXXKAN struct inode *inode = LINVFS_GET_IP(vp); if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) @@ -2613,7 +2613,7 @@ if (!namesp) return -EOPNOTSUPP; error = namesp->attr_set(vp, name, data, size, xflags); -#if XXXKAN +#ifdef XXXKAN if (!error) error = vn_revalidate(vp); #endif ==== //depot/projects/dtrace/src/sys/gnu/fs/xfs/xfs_bit.c#2 (text+ko) ==== @@ -35,6 +35,7 @@ */ #include "xfs.h" +#include "xfs_macros.h" #include "xfs_bit.h" #include "xfs_log.h" #include "xfs_trans.h" ==== //depot/projects/dtrace/src/sys/gnu/fs/xfs/xfs_dfrag.c#2 (text+ko) ==== @@ -350,7 +350,7 @@ break; } -#if XXXKAN /* Not necessary, vnodes are vrefed already by fgetvp */ +#ifdef XXXKAN /* Not necessary, vnodes are vrefed already by fgetvp */ /* * Increment vnode ref counts since xfs_trans_commit & * xfs_trans_cancel will both unlock the inodes and ==== //depot/projects/dtrace/src/sys/gnu/fs/xfs/xfs_dir2_trace.c#2 (text+ko) ==== @@ -36,6 +36,7 @@ */ #include "xfs.h" +#include "xfs_macros.h" #include "xfs_types.h" #include "xfs_inum.h" #include "xfs_dir.h" ==== //depot/projects/dtrace/src/sys/gnu/fs/xfs/xfs_inode.c#2 (text+ko) ==== @@ -2762,7 +2762,7 @@ ASSERT(atomic_read(&ip->i_pincount) > 0); if (atomic_dec_and_test(&ip->i_pincount)) { -#if XXXKAN +#ifdef XXXKAN >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200606021119.k52BJQP8073046>