Date: Tue, 12 Jun 2007 10:16:33 GMT From: Andrew Thompson <thompsa@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 121489 for review Message-ID: <200706121016.l5CAGXjN056841@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=121489 Change 121489 by thompsa@thompsa_heff on 2007/06/12 10:15:49 IFC Affected files ... .. //depot/projects/wifi/UPDATING#32 integrate .. //depot/projects/wifi/contrib/tcpdump/ieee802_11.h#3 integrate .. //depot/projects/wifi/contrib/tcpdump/ieee802_11_radio.h#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-802_11.c#5 integrate .. //depot/projects/wifi/etc/group#4 integrate .. //depot/projects/wifi/etc/pam.d/ftpd#2 integrate .. //depot/projects/wifi/etc/pam.d/gdm#2 integrate .. //depot/projects/wifi/etc/pam.d/imap#2 integrate .. //depot/projects/wifi/etc/pam.d/kde#2 integrate .. //depot/projects/wifi/etc/pam.d/login#2 integrate .. //depot/projects/wifi/etc/pam.d/other#2 integrate .. //depot/projects/wifi/etc/pam.d/pop3#2 integrate .. //depot/projects/wifi/etc/pam.d/rsh#2 integrate .. //depot/projects/wifi/etc/pam.d/sshd#2 integrate .. //depot/projects/wifi/etc/pam.d/telnetd#2 integrate .. //depot/projects/wifi/etc/pam.d/xdm#3 integrate .. //depot/projects/wifi/include/arpa/inet.h#4 integrate .. //depot/projects/wifi/include/histedit.h#3 integrate .. //depot/projects/wifi/include/paths.h#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_ustar.c#11 integrate .. //depot/projects/wifi/lib/libarchive/test/test_tar_filenames.c#3 integrate .. //depot/projects/wifi/lib/libc/inet/Symbol.map#3 integrate .. //depot/projects/wifi/lib/libc/inet/inet_ntoa.c#4 integrate .. //depot/projects/wifi/lib/libc/net/Makefile.inc#8 integrate .. //depot/projects/wifi/lib/libc/net/inet.3#7 integrate .. //depot/projects/wifi/lib/libc/net/sctp_sys_calls.c#5 integrate .. //depot/projects/wifi/lib/libc/powerpc/gen/syncicache.c#2 integrate .. //depot/projects/wifi/lib/libc/regex/regcomp.c#3 integrate .. //depot/projects/wifi/lib/libc/regex/regerror.c#3 integrate .. //depot/projects/wifi/lib/libc/regex/regexec.c#3 integrate .. //depot/projects/wifi/lib/libc/regex/regfree.c#3 integrate .. //depot/projects/wifi/lib/libedit/editline.3#9 integrate .. //depot/projects/wifi/lib/libedit/el.c#4 integrate .. //depot/projects/wifi/lib/libedit/el.h#3 integrate .. //depot/projects/wifi/lib/libedit/term.c#5 integrate .. //depot/projects/wifi/lib/libedit/term.h#4 integrate .. //depot/projects/wifi/lib/libpam/modules/pam_nologin/pam_nologin.8#2 integrate .. //depot/projects/wifi/lib/libpam/modules/pam_nologin/pam_nologin.c#3 integrate .. //depot/projects/wifi/lib/msun/src/s_frexpf.c#2 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.8#25 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.c#22 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.h#15 integrate .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#69 integrate .. //depot/projects/wifi/sbin/ifconfig/ifmedia.c#14 integrate .. //depot/projects/wifi/sbin/ipf/libipf/Makefile#5 integrate .. //depot/projects/wifi/sbin/recoverdisk/Makefile#1 branch .. //depot/projects/wifi/sbin/recoverdisk/recoverdisk.1#1 branch .. //depot/projects/wifi/sbin/recoverdisk/recoverdisk.c#1 branch .. //depot/projects/wifi/sbin/sysctl/sysctl.c#10 integrate .. //depot/projects/wifi/share/man/man4/altq.4#18 integrate .. //depot/projects/wifi/share/man/man4/miibus.4#7 integrate .. //depot/projects/wifi/share/man/man4/nfe.4#4 integrate .. //depot/projects/wifi/share/man/man5/rc.conf.5#31 integrate .. //depot/projects/wifi/share/man/man7/hier.7#11 integrate .. //depot/projects/wifi/sys/amd64/amd64/busdma_machdep.c#14 integrate .. //depot/projects/wifi/sys/amd64/amd64/trap.c#16 integrate .. //depot/projects/wifi/sys/amd64/conf/DEFAULTS#5 integrate .. //depot/projects/wifi/sys/amd64/conf/GENERIC#22 integrate .. //depot/projects/wifi/sys/amd64/ia32/ia32_syscall.c#7 integrate .. //depot/projects/wifi/sys/arm/arm/busdma_machdep.c#20 integrate .. //depot/projects/wifi/sys/arm/arm/pmap.c#22 integrate .. //depot/projects/wifi/sys/arm/at91/if_ate.c#6 integrate .. //depot/projects/wifi/sys/arm/include/pmap.h#14 integrate .. //depot/projects/wifi/sys/arm/include/pte.h#3 integrate .. //depot/projects/wifi/sys/cam/README.quirks#2 integrate .. //depot/projects/wifi/sys/compat/linux/linux_file.c#10 integrate .. //depot/projects/wifi/sys/compat/linux/linux_misc.c#20 integrate .. //depot/projects/wifi/sys/compat/linux/linux_uid16.c#6 integrate .. //depot/projects/wifi/sys/compat/ndis/kern_ndis.c#21 integrate .. //depot/projects/wifi/sys/compat/opensolaris/kern/opensolaris_policy.c#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_fcntl.c#6 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_misc.c#15 integrate .. //depot/projects/wifi/sys/conf/NOTES#41 integrate .. //depot/projects/wifi/sys/conf/files#53 integrate .. //depot/projects/wifi/sys/conf/files.amd64#24 integrate .. //depot/projects/wifi/sys/conf/files.i386#28 integrate .. //depot/projects/wifi/sys/conf/files.pc98#19 integrate .. //depot/projects/wifi/sys/conf/files.sparc64#16 integrate .. //depot/projects/wifi/sys/conf/files.sun4v#2 integrate .. //depot/projects/wifi/sys/conf/options.arm#10 integrate .. //depot/projects/wifi/sys/dev/ath/ath_rate/amrr/amrr.c#19 integrate .. //depot/projects/wifi/sys/dev/ath/ath_rate/onoe/onoe.c#20 integrate .. //depot/projects/wifi/sys/dev/ath/ath_rate/sample/sample.c#12 integrate .. //depot/projects/wifi/sys/dev/ath/if_ath.c#144 integrate .. //depot/projects/wifi/sys/dev/ath/if_athioctl.h#20 integrate .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#58 integrate .. //depot/projects/wifi/sys/dev/awi/awi.c#17 integrate .. //depot/projects/wifi/sys/dev/awi/awivar.h#6 integrate .. //depot/projects/wifi/sys/dev/dcons/dcons_os.c#11 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndis.c#30 integrate .. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#14 integrate .. //depot/projects/wifi/sys/dev/isp/isp_freebsd.c#16 integrate .. //depot/projects/wifi/sys/dev/isp/isp_ioctl.h#8 integrate .. //depot/projects/wifi/sys/dev/isp/isp_pci.c#14 integrate .. //depot/projects/wifi/sys/dev/iwi/if_iwireg.h#12 integrate .. //depot/projects/wifi/sys/dev/iwi/if_iwivar.h#23 integrate .. //depot/projects/wifi/sys/dev/mii/icsphy.c#1 branch .. //depot/projects/wifi/sys/dev/mii/icsphyreg.h#1 branch .. //depot/projects/wifi/sys/dev/mii/miidevs#10 integrate .. //depot/projects/wifi/sys/dev/msk/if_msk.c#7 integrate .. //depot/projects/wifi/sys/dev/msk/if_mskreg.h#4 integrate .. //depot/projects/wifi/sys/dev/mxge/if_mxge.c#12 integrate .. //depot/projects/wifi/sys/dev/mxge/mxge_lro.c#2 integrate .. //depot/projects/wifi/sys/dev/nfe/if_nfe.c#4 integrate .. //depot/projects/wifi/sys/dev/nfe/if_nfereg.h#3 integrate .. //depot/projects/wifi/sys/dev/nfe/if_nfevar.h#3 integrate .. //depot/projects/wifi/sys/dev/nve/if_nve.c#15 integrate .. //depot/projects/wifi/sys/dev/ral/if_ral_pci.c#7 integrate .. //depot/projects/wifi/sys/dev/ral/rt2560.c#21 integrate .. //depot/projects/wifi/sys/dev/ral/rt2560reg.h#3 integrate .. //depot/projects/wifi/sys/dev/ral/rt2560var.h#8 integrate .. //depot/projects/wifi/sys/dev/ral/rt2661.c#13 integrate .. //depot/projects/wifi/sys/dev/ral/rt2661reg.h#3 integrate .. //depot/projects/wifi/sys/dev/ral/rt2661var.h#6 integrate .. //depot/projects/wifi/sys/dev/sound/isa/ad1816.c#10 integrate .. //depot/projects/wifi/sys/dev/sound/isa/ess.c#9 integrate .. //depot/projects/wifi/sys/dev/sound/isa/mss.c#14 integrate .. //depot/projects/wifi/sys/dev/sound/isa/sb16.c#8 integrate .. //depot/projects/wifi/sys/dev/sound/isa/sb8.c#7 integrate .. //depot/projects/wifi/sys/dev/sound/pci/als4000.c#10 integrate .. //depot/projects/wifi/sys/dev/sound/pci/atiixp.c#8 integrate .. //depot/projects/wifi/sys/dev/sound/pci/aureal.c#6 integrate .. //depot/projects/wifi/sys/dev/sound/pci/cmi.c#13 integrate .. //depot/projects/wifi/sys/dev/sound/pci/cs4281.c#6 integrate .. //depot/projects/wifi/sys/dev/sound/pci/csapcm.c#8 integrate .. //depot/projects/wifi/sys/dev/sound/pci/ds1.c#8 integrate .. //depot/projects/wifi/sys/dev/sound/pci/emu10k1.c#11 integrate .. //depot/projects/wifi/sys/dev/sound/pci/emu10kx-pcm.c#6 integrate .. //depot/projects/wifi/sys/dev/sound/pci/es137x.c#15 integrate .. //depot/projects/wifi/sys/dev/sound/pci/fm801.c#8 integrate .. //depot/projects/wifi/sys/dev/sound/pci/hda/hdac.c#10 integrate .. //depot/projects/wifi/sys/dev/sound/pci/ich.c#15 integrate .. //depot/projects/wifi/sys/dev/sound/pci/maestro3.c#8 integrate .. //depot/projects/wifi/sys/dev/sound/pci/neomagic.c#4 integrate .. //depot/projects/wifi/sys/dev/sound/pci/solo.c#10 integrate .. //depot/projects/wifi/sys/dev/sound/pci/t4dwave.c#7 integrate .. //depot/projects/wifi/sys/dev/sound/pci/via8233.c#15 integrate .. //depot/projects/wifi/sys/dev/sound/pci/via82c686.c#9 integrate .. //depot/projects/wifi/sys/dev/sound/pci/vibes.c#7 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/channel.c#14 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/channel.h#6 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/dsp.c#16 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/vchan.c#13 integrate .. //depot/projects/wifi/sys/dev/sound/usb/uaudio.c#16 integrate .. //depot/projects/wifi/sys/dev/sound/usb/uaudio_pcm.c#13 integrate .. //depot/projects/wifi/sys/dev/txp/if_txp.c#15 integrate .. //depot/projects/wifi/sys/dev/usb/if_aue.c#13 integrate .. //depot/projects/wifi/sys/dev/usb/if_axe.c#18 integrate .. //depot/projects/wifi/sys/dev/usb/if_axereg.h#10 integrate .. //depot/projects/wifi/sys/dev/usb/if_cdce.c#8 integrate .. //depot/projects/wifi/sys/dev/usb/if_cdcereg.h#5 integrate .. //depot/projects/wifi/sys/dev/usb/if_cue.c#12 integrate .. //depot/projects/wifi/sys/dev/usb/if_cuereg.h#6 integrate .. //depot/projects/wifi/sys/dev/usb/if_kue.c#12 integrate .. //depot/projects/wifi/sys/dev/usb/if_kuereg.h#6 integrate .. //depot/projects/wifi/sys/dev/usb/if_rue.c#12 integrate .. //depot/projects/wifi/sys/dev/usb/if_rum.c#3 integrate .. //depot/projects/wifi/sys/dev/usb/if_rumreg.h#2 integrate .. //depot/projects/wifi/sys/dev/usb/if_rumvar.h#2 integrate .. //depot/projects/wifi/sys/dev/usb/if_ural.c#28 integrate .. //depot/projects/wifi/sys/dev/usb/if_uralreg.h#4 integrate .. //depot/projects/wifi/sys/dev/usb/if_uralvar.h#10 integrate .. //depot/projects/wifi/sys/dev/usb/uark.c#3 integrate .. //depot/projects/wifi/sys/dev/usb/ubsa.c#7 integrate .. //depot/projects/wifi/sys/dev/usb/ufm.c#5 integrate .. //depot/projects/wifi/sys/dev/usb/ufoma.c#5 integrate .. //depot/projects/wifi/sys/dev/usb/usb_port.h#8 integrate .. //depot/projects/wifi/sys/dev/usb/usbdivar.h#6 integrate .. //depot/projects/wifi/sys/dev/wi/if_wi.c#34 integrate .. //depot/projects/wifi/sys/dev/wi/if_wivar.h#11 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#35 integrate .. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_vnops.c#14 integrate .. //depot/projects/wifi/sys/fs/procfs/procfs_ioctl.c#7 integrate .. //depot/projects/wifi/sys/fs/udf/udf_vnops.c#22 integrate .. //depot/projects/wifi/sys/gnu/fs/ext2fs/ext2_vnops.c#6 integrate .. //depot/projects/wifi/sys/gnu/fs/reiserfs/reiserfs_namei.c#3 integrate .. //depot/projects/wifi/sys/gnu/fs/reiserfs/reiserfs_stree.c#2 integrate .. //depot/projects/wifi/sys/i386/conf/DEFAULTS#5 integrate .. //depot/projects/wifi/sys/i386/conf/GENERIC#20 integrate .. //depot/projects/wifi/sys/i386/conf/PAE#11 integrate .. //depot/projects/wifi/sys/i386/i386/busdma_machdep.c#14 integrate .. //depot/projects/wifi/sys/i386/i386/trap.c#16 integrate .. //depot/projects/wifi/sys/ia64/ia64/machdep.c#19 integrate .. //depot/projects/wifi/sys/ia64/include/cpufunc.h#3 integrate .. //depot/projects/wifi/sys/ia64/include/vmparam.h#8 integrate .. //depot/projects/wifi/sys/kern/kern_exec.c#24 integrate .. //depot/projects/wifi/sys/kern/kern_fork.c#20 integrate .. //depot/projects/wifi/sys/kern/kern_ktrace.c#12 integrate .. //depot/projects/wifi/sys/kern/kern_priv.c#2 integrate .. //depot/projects/wifi/sys/kern/kern_prot.c#15 integrate .. //depot/projects/wifi/sys/kern/kern_resource.c#16 integrate .. //depot/projects/wifi/sys/kern/kern_sig.c#23 integrate .. //depot/projects/wifi/sys/kern/kern_sysctl.c#12 integrate .. //depot/projects/wifi/sys/kern/kern_thread.c#21 integrate .. //depot/projects/wifi/sys/kern/sched_4bsd.c#16 integrate .. //depot/projects/wifi/sys/kern/sched_ule.c#26 integrate .. //depot/projects/wifi/sys/kern/subr_acl_posix1e.c#3 integrate .. //depot/projects/wifi/sys/kern/subr_witness.c#30 integrate .. //depot/projects/wifi/sys/kern/sysv_ipc.c#5 integrate .. //depot/projects/wifi/sys/kern/sysv_msg.c#12 integrate .. //depot/projects/wifi/sys/kern/tty.c#15 integrate .. //depot/projects/wifi/sys/kern/uipc_mqueue.c#8 integrate .. //depot/projects/wifi/sys/kern/vfs_mount.c#32 integrate .. //depot/projects/wifi/sys/kern/vfs_subr.c#42 integrate .. //depot/projects/wifi/sys/kern/vfs_syscalls.c#24 integrate .. //depot/projects/wifi/sys/modules/Makefile#39 integrate .. //depot/projects/wifi/sys/modules/mii/Makefile#5 integrate .. //depot/projects/wifi/sys/modules/wlan/Makefile#9 integrate .. //depot/projects/wifi/sys/net/ieee8023ad_lacp.c#5 integrate .. //depot/projects/wifi/sys/net/ieee8023ad_lacp.h#4 integrate .. //depot/projects/wifi/sys/net/if.h#12 integrate .. //depot/projects/wifi/sys/net/if_ethersubr.c#22 integrate .. //depot/projects/wifi/sys/net/if_lagg.c#5 integrate .. //depot/projects/wifi/sys/net/if_lagg.h#5 integrate .. //depot/projects/wifi/sys/net/if_media.h#11 integrate .. //depot/projects/wifi/sys/net/if_spppsubr.c#13 integrate .. //depot/projects/wifi/sys/net/route.c#11 integrate .. //depot/projects/wifi/sys/net80211/_ieee80211.h#22 integrate .. //depot/projects/wifi/sys/net80211/ieee80211.c#54 integrate .. //depot/projects/wifi/sys/net80211/ieee80211.h#23 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_acl.c#9 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_amrr.c#4 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#24 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.h#17 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_ccmp.c#14 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_none.c#11 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_tkip.c#17 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_wep.c#14 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#27 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#30 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#106 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#81 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#42 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#95 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#47 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#76 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#58 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#38 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_radiotap.h#13 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#59 integrate .. //depot/projects/wifi/sys/netgraph/ng_vlan.c#4 integrate .. //depot/projects/wifi/sys/netinet/in_pcb.c#16 integrate .. //depot/projects/wifi/sys/netinet/raw_ip.c#16 integrate .. //depot/projects/wifi/sys/netinet/sctp_pcb.c#13 integrate .. //depot/projects/wifi/sys/netinet/sctp_usrreq.c#11 integrate .. //depot/projects/wifi/sys/netinet/tcp_input.c#28 integrate .. //depot/projects/wifi/sys/netinet/tcp_subr.c#32 integrate .. //depot/projects/wifi/sys/netinet/udp_usrreq.c#20 integrate .. //depot/projects/wifi/sys/netinet6/in6_pcb.c#10 integrate .. //depot/projects/wifi/sys/netinet6/in6_src.c#11 integrate .. //depot/projects/wifi/sys/netinet6/raw_ip6.c#13 integrate .. //depot/projects/wifi/sys/netinet6/sctp6_usrreq.c#12 integrate .. //depot/projects/wifi/sys/netinet6/udp6_usrreq.c#9 integrate .. //depot/projects/wifi/sys/netipsec/ipsec_osdep.h#6 integrate .. //depot/projects/wifi/sys/nfsserver/nfs_serv.c#13 integrate .. //depot/projects/wifi/sys/pc98/conf/DEFAULTS#5 integrate .. //depot/projects/wifi/sys/pc98/conf/GENERIC#20 integrate .. //depot/projects/wifi/sys/security/audit/audit.c#9 integrate .. //depot/projects/wifi/sys/security/audit/audit_arg.c#7 integrate .. //depot/projects/wifi/sys/security/audit/audit_bsm.c#5 integrate .. //depot/projects/wifi/sys/security/mac_portacl/mac_portacl.c#8 integrate .. //depot/projects/wifi/sys/security/mac_seeotheruids/mac_seeotheruids.c#7 integrate .. //depot/projects/wifi/sys/sparc64/conf/DEFAULTS#5 integrate .. //depot/projects/wifi/sys/sparc64/conf/GENERIC#19 integrate .. //depot/projects/wifi/sys/sun4v/conf/DEFAULTS#2 integrate .. //depot/projects/wifi/sys/sys/mbuf.h#24 integrate .. //depot/projects/wifi/sys/sys/param.h#30 integrate .. //depot/projects/wifi/sys/sys/priv.h#5 integrate .. //depot/projects/wifi/sys/sys/proc.h#32 integrate .. //depot/projects/wifi/sys/sys/systm.h#24 integrate .. //depot/projects/wifi/sys/sys/vmmeter.h#5 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_alloc.c#14 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_vnops.c#19 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_quota.c#12 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_vnops.c#26 integrate .. //depot/projects/wifi/sys/vm/vm_contig.c#15 integrate .. //depot/projects/wifi/sys/vm/vm_object.c#23 integrate .. //depot/projects/wifi/sys/vm/vm_page.c#21 integrate .. //depot/projects/wifi/sys/vm/vm_pageout.c#15 integrate .. //depot/projects/wifi/sys/vm/vm_pageq.c#10 integrate .. //depot/projects/wifi/tools/tools/net80211/wlandebug/wlandebug.c#4 integrate .. //depot/projects/wifi/tools/tools/net80211/wlanstats/wlanstats.c#4 integrate .. //depot/projects/wifi/usr.bin/netstat/Makefile#10 integrate .. //depot/projects/wifi/usr.bin/netstat/netstat.1#7 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/anonFTP.c#5 integrate .. //depot/projects/wifi/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#8 integrate Differences ... ==== //depot/projects/wifi/UPDATING#32 (text+ko) ==== @@ -21,6 +21,37 @@ developers choose to disable these features on build machines to maximize performance. +20070610: + The net80211 layer has changed significantly and all wireless + drivers that depend on it need to be recompiled. Further these + changes require that any program that interacts with the wireless + support in the kernel be recompiled; this includes: ifconfig, + wpa_supplicant, hostapd, and wlanstats. Users must also, for + the moment, kldload the wlan_scan_sta and/or wlan_scan_ap modules + if they use modules for wireless support. These modules implement + scanning support for station and ap modes, respectively. Failure + to load the appropriate module before marking a wireless interface + up will result in a message to the console and the device not + operating properly. + +20070610: + The pam_nologin(8) module ceases to provide an authentication + function and starts providing an account management function. + Consequent changes to /etc/pam.d should be brought in using + mergemaster(8). Third-party files in /usr/local/etc/pam.d may + need manual editing as follows. Locate this line (or similar): + + auth required pam_nologin.so no_warn + + and change it according to this example: + + account required pam_nologin.so no_warn + + That is, the first word needs to be changed from "auth" to + "account". The new line can be moved to the account section + within the file for clarity. Not updating pam.conf(5) files + will result in nologin(5) ignored by the respective services. + 20070529: The ether_ioctl() function has been synchronized with ioctl(2) and ifnet.if_ioctl. Due to that, the size of one of its arguments @@ -801,4 +832,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.492 2007/05/29 12:40:45 yar Exp $ +$FreeBSD: src/UPDATING,v 1.494 2007/06/11 04:06:50 sam Exp $ ==== //depot/projects/wifi/contrib/tcpdump/ieee802_11.h#3 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD: src/contrib/tcpdump/ieee802_11.h,v 1.2 2007/06/11 04:04:30 sam Exp $ */ /* @(#) $Header: /tcpdump/master/tcpdump/ieee802_11.h,v 1.9 2003/07/22 17:36:57 guy Exp $ (LBL) */ /* * Copyright (c) 2001 ==== //depot/projects/wifi/contrib/tcpdump/ieee802_11_radio.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/tcpdump/ieee802_11_radio.h,v 1.1.1.1 2005/05/29 18:16:31 sam Exp $ */ +/* $FreeBSD: src/contrib/tcpdump/ieee802_11_radio.h,v 1.2 2007/06/11 04:04:30 sam Exp $ */ /* $NetBSD: ieee80211_radiotap.h,v 1.3 2003/11/16 09:02:42 dyoung Exp $ */ /* $Header: /tcpdump/master/tcpdump/ieee802_11_radio.h,v 1.1 2004/09/23 21:33:10 dyoung Exp $ */ ==== //depot/projects/wifi/contrib/tcpdump/print-802_11.c#5 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.2 2007/06/11 04:04:30 sam Exp $ */ /* * Copyright (c) 2001 * Fortress Technologies, Inc. All rights reserved. ==== //depot/projects/wifi/etc/group#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/group,v 1.34 2006/02/05 19:34:09 rwatson Exp $ +# $FreeBSD: src/etc/group,v 1.35 2007/06/11 18:36:39 ceri Exp $ # wheel:*:0:root daemon:*:1: @@ -11,6 +11,7 @@ news:*:8: man:*:9: games:*:13: +ftp:*:14: staff:*:20: sshd:*:22: smmsp:*:25: ==== //depot/projects/wifi/etc/pam.d/ftpd#2 (text+ko) ==== @@ -1,11 +1,10 @@ # -# $FreeBSD: src/etc/pam.d/ftpd,v 1.18 2003/04/30 21:57:54 markm Exp $ +# $FreeBSD: src/etc/pam.d/ftpd,v 1.19 2007/06/10 18:57:20 yar Exp $ # # PAM configuration for the "ftpd" service # # auth -auth required pam_nologin.so no_warn auth sufficient pam_opie.so no_warn no_fake_prompts auth requisite pam_opieaccess.so no_warn allow_local #auth sufficient pam_krb5.so no_warn @@ -13,6 +12,7 @@ auth required pam_unix.so no_warn try_first_pass # account +account required pam_nologin.so #account required pam_krb5.so account required pam_unix.so ==== //depot/projects/wifi/etc/pam.d/gdm#2 (text+ko) ==== @@ -1,16 +1,16 @@ # -# $FreeBSD: src/etc/pam.d/gdm,v 1.7 2003/04/30 21:57:54 markm Exp $ +# $FreeBSD: src/etc/pam.d/gdm,v 1.8 2007/06/10 18:57:20 yar Exp $ # # PAM configuration for the "gdm" service # # auth -auth required pam_nologin.so no_warn #auth sufficient pam_krb5.so no_warn try_first_pass #auth sufficient pam_ssh.so no_warn try_first_pass auth required pam_unix.so no_warn try_first_pass # account +account required pam_nologin.so #account required pam_krb5.so account required pam_unix.so ==== //depot/projects/wifi/etc/pam.d/imap#2 (text+ko) ==== @@ -1,11 +1,13 @@ # -# $FreeBSD: src/etc/pam.d/imap,v 1.5 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/imap,v 1.6 2007/06/10 18:57:20 yar Exp $ # # PAM configuration for the "imap" service # # auth -#auth required pam_nologin.so no_warn #auth sufficient pam_krb5.so no_warn try_first_pass #auth sufficient pam_ssh.so no_warn try_first_pass auth required pam_unix.so no_warn try_first_pass + +# account +#account required pam_nologin.so ==== //depot/projects/wifi/etc/pam.d/kde#2 (text+ko) ==== @@ -1,16 +1,16 @@ # -# $FreeBSD: src/etc/pam.d/kde,v 1.6 2003/04/30 21:57:54 markm Exp $ +# $FreeBSD: src/etc/pam.d/kde,v 1.7 2007/06/10 18:57:20 yar Exp $ # # PAM configuration for the "kde" service # # auth -auth required pam_nologin.so no_warn #auth sufficient pam_krb5.so no_warn try_first_pass #auth sufficient pam_ssh.so no_warn try_first_pass auth required pam_unix.so no_warn try_first_pass # account +account required pam_nologin.so #account required pam_krb5.so account required pam_unix.so ==== //depot/projects/wifi/etc/pam.d/login#2 (text+ko) ==== @@ -1,16 +1,16 @@ # -# $FreeBSD: src/etc/pam.d/login,v 1.16 2003/06/14 12:35:05 des Exp $ +# $FreeBSD: src/etc/pam.d/login,v 1.17 2007/06/10 18:57:20 yar Exp $ # # PAM configuration for the "login" service # # auth -auth required pam_nologin.so no_warn auth sufficient pam_self.so no_warn auth include system # account account requisite pam_securetty.so +account required pam_nologin.so account include system # session ==== //depot/projects/wifi/etc/pam.d/other#2 (text+ko) ==== @@ -1,11 +1,10 @@ # -# $FreeBSD: src/etc/pam.d/other,v 1.10 2003/04/30 21:57:54 markm Exp $ +# $FreeBSD: src/etc/pam.d/other,v 1.11 2007/06/10 18:57:20 yar Exp $ # # PAM configuration for the "other" service # # auth -auth required pam_nologin.so no_warn auth sufficient pam_opie.so no_warn no_fake_prompts auth requisite pam_opieaccess.so no_warn allow_local #auth sufficient pam_krb5.so no_warn try_first_pass @@ -13,6 +12,7 @@ auth required pam_unix.so no_warn try_first_pass # account +account required pam_nologin.so #account required pam_krb5.so account required pam_login_access.so account required pam_unix.so ==== //depot/projects/wifi/etc/pam.d/pop3#2 (text+ko) ==== @@ -1,11 +1,13 @@ # -# $FreeBSD: src/etc/pam.d/pop3,v 1.5 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/pop3,v 1.6 2007/06/10 18:57:20 yar Exp $ # # PAM configuration for the "pop3" service # # auth -#auth required pam_nologin.so no_warn #auth sufficient pam_krb5.so no_warn try_first_pass #auth sufficient pam_ssh.so no_warn try_first_pass auth required pam_unix.so no_warn try_first_pass + +# account +#account required pam_nologin.so ==== //depot/projects/wifi/etc/pam.d/rsh#2 (text+ko) ==== @@ -1,14 +1,14 @@ # -# $FreeBSD: src/etc/pam.d/rsh,v 1.5 2003/02/10 00:50:03 des Exp $ +# $FreeBSD: src/etc/pam.d/rsh,v 1.6 2007/06/10 18:57:20 yar Exp $ # # PAM configuration for the "rsh" service # # auth -auth required pam_nologin.so no_warn auth required pam_rhosts.so no_warn # account +account required pam_nologin.so account required pam_unix.so # session ==== //depot/projects/wifi/etc/pam.d/sshd#2 (text+ko) ==== @@ -1,11 +1,10 @@ # -# $FreeBSD: src/etc/pam.d/sshd,v 1.15 2003/04/30 21:57:54 markm Exp $ +# $FreeBSD: src/etc/pam.d/sshd,v 1.16 2007/06/10 18:57:20 yar Exp $ # # PAM configuration for the "sshd" service # # auth -auth required pam_nologin.so no_warn auth sufficient pam_opie.so no_warn no_fake_prompts auth requisite pam_opieaccess.so no_warn allow_local #auth sufficient pam_krb5.so no_warn try_first_pass @@ -13,6 +12,7 @@ auth required pam_unix.so no_warn try_first_pass # account +account required pam_nologin.so #account required pam_krb5.so account required pam_login_access.so account required pam_unix.so ==== //depot/projects/wifi/etc/pam.d/telnetd#2 (text+ko) ==== @@ -1,11 +1,10 @@ # -# $FreeBSD: src/etc/pam.d/telnetd,v 1.7 2003/04/30 21:57:54 markm Exp $ +# $FreeBSD: src/etc/pam.d/telnetd,v 1.8 2007/06/10 18:57:20 yar Exp $ # # PAM configuration for the "telnetd" service # # auth -auth required pam_nologin.so no_warn auth sufficient pam_opie.so no_warn no_fake_prompts auth requisite pam_opieaccess.so no_warn allow_local #auth sufficient pam_krb5.so no_warn try_first_pass @@ -13,6 +12,7 @@ auth required pam_unix.so no_warn try_first_pass # account +account required pam_nologin.so #account required pam_krb5.so account required pam_login_access.so account required pam_unix.so ==== //depot/projects/wifi/etc/pam.d/xdm#3 (text+ko) ==== @@ -1,16 +1,16 @@ # -# $FreeBSD: src/etc/pam.d/xdm,v 1.10 2005/04/28 07:59:09 des Exp $ +# $FreeBSD: src/etc/pam.d/xdm,v 1.11 2007/06/10 18:57:20 yar Exp $ # # PAM configuration for the "xdm" service # # auth -auth required pam_nologin.so no_warn #auth sufficient pam_krb5.so no_warn try_first_pass #auth sufficient pam_ssh.so no_warn try_first_pass auth required pam_unix.so no_warn try_first_pass # account +account required pam_nologin.so #account required pam_krb5.so account required pam_unix.so ==== //depot/projects/wifi/include/arpa/inet.h#4 (text+ko) ==== @@ -56,7 +56,7 @@ /*% * @(#)inet.h 8.1 (Berkeley) 6/2/93 * $Id: inet.h,v 1.2.18.1 2005/04/27 05:00:50 sra Exp $ - * $FreeBSD: src/include/arpa/inet.h,v 1.27 2007/06/03 17:20:25 ume Exp $ + * $FreeBSD: src/include/arpa/inet.h,v 1.28 2007/06/11 07:21:21 delphij Exp $ */ #ifndef _ARPA_INET_H_ @@ -130,6 +130,7 @@ #define inet_cidr_ntop __inet_cidr_ntop #define inet_cidr_pton __inet_cidr_pton #define inet_ntoa __inet_ntoa +#define inet_ntoa_r __inet_ntoa_r #define inet_pton __inet_pton #define inet_ntop __inet_ntop #define inet_nsap_addr __inet_nsap_addr @@ -147,6 +148,7 @@ in_addr_t inet_addr(const char *); /*const*/ char *inet_ntoa(struct in_addr); +char *inet_ntoa_r(struct in_addr, char *buf); const char *inet_ntop(int, const void * __restrict, char * __restrict, socklen_t); int inet_pton(int, const char * __restrict, void * __restrict); ==== //depot/projects/wifi/include/histedit.h#3 (text+ko) ==== @@ -30,8 +30,8 @@ * SUCH DAMAGE. * * @(#)histedit.h 8.2 (Berkeley) 1/3/94 - * $NetBSD: histedit.h,v 1.28 2005/07/14 15:00:58 christos Exp $ - * $FreeBSD: src/include/histedit.h,v 1.10 2005/08/07 20:51:52 stefanf Exp $ + * $NetBSD: histedit.h,v 1.32 2007/06/10 20:20:28 christos Exp $ + * $FreeBSD: src/include/histedit.h,v 1.12 2007/06/11 06:25:19 stefanf Exp $ */ /* @@ -104,7 +104,7 @@ * Low level editline access functions */ int el_set(EditLine *, int, ...); -int el_get(EditLine *, int, void *); +int el_get(EditLine *, int, ...); #if 0 unsigned char _el_fn_complete(EditLine *, int); #endif @@ -130,8 +130,11 @@ #define EL_CLIENTDATA 14 /* , void *); */ #define EL_UNBUFFERED 15 /* , int); */ #define EL_PREP_TERM 16 /* , int); */ +#define EL_GETTC 17 /* , const char *, ..., NULL); */ +#define EL_GETFP 18 /* , int, FILE **) */ +#define EL_SETFP 19 /* , int, FILE *) */ -#define EL_BUILTIN_GETCFN (NULL) +#define EL_BUILTIN_GETCFN (NULL) /* * Source named file or $PWD/.editrc or $HOME/.editrc @@ -181,7 +184,7 @@ #define H_FUNC 0 /* , UTSL */ #define H_SETSIZE 1 /* , const int); */ -#define H_EVENT 1 /* , const int); */ +#define H_EVENT 1 /* , const int); */ #define H_GETSIZE 2 /* , void); */ #define H_FIRST 3 /* , void); */ #define H_LAST 4 /* , void); */ ==== //depot/projects/wifi/include/paths.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)paths.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/paths.h,v 1.25 2004/01/04 17:17:46 iedowse Exp $ + * $FreeBSD: src/include/paths.h,v 1.26 2007/06/11 02:21:18 simokawa Exp $ */ #ifndef _PATHS_H_ @@ -61,6 +61,7 @@ #define _PATH_DRUM "/dev/drum" #define _PATH_ETC "/etc" #define _PATH_FTPUSERS "/etc/ftpusers" +#define _PATH_FWMEM "/dev/fwmem" #define _PATH_HALT "/sbin/halt" #define _PATH_IFCONFIG "/sbin/ifconfig" #define _PATH_KMEM "/dev/kmem" ==== //depot/projects/wifi/lib/libarchive/archive_write_set_format_ustar.c#11 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ustar.c,v 1.23 2007/05/29 01:00:19 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ustar.c,v 1.24 2007/06/11 05:17:30 kientzle Exp $"); #ifdef HAVE_ERRNO_H @@ -279,6 +279,16 @@ /* Store in two pieces, splitting at a '/'. */ p = strchr(pp + strlen(pp) - USTAR_name_size - 1, '/'); /* + * If the separator we found is the first '/', find + * the next one. (This is a pathological case that + * occurs for paths of exactly 101 bytes that start with + * '/'; it occurs because the separating '/' is not + * stored explicitly and the reconstruction assumes that + * an empty prefix means there is no '/' separator.) + */ + if (p == pp) + p = strchr(p + 1, '/'); + /* * If there is no path separator, or the prefix or * remaining name are too large, return an error. */ ==== //depot/projects/wifi/lib/libarchive/test/test_tar_filenames.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_tar_filenames.c,v 1.3 2007/05/29 01:00:21 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_tar_filenames.c,v 1.4 2007/06/11 05:17:30 kientzle Exp $"); /* * Exercise various lengths of filenames in tar archives, @@ -31,8 +31,8 @@ * filenames into prefix/suffix. */ -static void -test_filename(int dlen, int flen) +static +test_filename(const char *prefix, int dlen, int flen) { char buff[8192]; char filename[400]; @@ -40,12 +40,17 @@ struct archive_entry *ae; struct archive *a; size_t used; - int i; + size_t prefix_length = 0; + int i = 0; - for (i = 0; i < dlen; i++) + if (prefix) { + strcpy(filename, prefix); + i = prefix_length = strlen(prefix); + } + for (; i < prefix_length + dlen; i++) filename[i] = 'a'; filename[i++] = '/'; - for (; i < dlen + flen + 1; i++) + for (; i < prefix_length + dlen + flen + 1; i++) filename[i] = 'b'; filename[i++] = '\0'; @@ -111,7 +116,7 @@ assertA(0 == archive_read_next_header(a, &ae)); failure("Pathname %d/%d: %s", dlen, flen, archive_entry_pathname(ae)); assertEqualString(filename, archive_entry_pathname(ae)); - assert((S_IFREG | 0755) == archive_entry_mode(ae)); + assertEqualInt((S_IFREG | 0755), archive_entry_mode(ae)); /* * Read the two dirs and check the names. @@ -147,13 +152,15 @@ /* Repeat the following for a variety of dir/file lengths. */ for (dlen = 40; dlen < 60; dlen++) { for (flen = 40; flen < 60; flen++) { - test_filename(dlen, flen); + test_filename(NULL, dlen, flen); + test_filename("/", dlen, flen); } } for (dlen = 140; dlen < 160; dlen++) { for (flen = 90; flen < 110; flen++) { - test_filename(dlen, flen); + test_filename(NULL, dlen, flen); + test_filename("/", dlen, flen); } } } ==== //depot/projects/wifi/lib/libc/inet/Symbol.map#3 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/inet/Symbol.map,v 1.2 2007/04/29 14:05:17 deischen Exp $ + * $FreeBSD: src/lib/libc/inet/Symbol.map,v 1.3 2007/06/11 07:21:21 delphij Exp $ */ FBSD_1.0 { @@ -25,6 +25,8 @@ inet_network; __inet_ntoa; inet_ntoa; + __inet_ntoa_r; + inet_ntoa_r; __inet_ntop; inet_ntop; __inet_pton; ==== //depot/projects/wifi/lib/libc/inet/inet_ntoa.c#4 (text) ==== @@ -32,7 +32,7 @@ static const char rcsid[] = "$Id: inet_ntoa.c,v 1.1.352.1 2005/04/27 05:00:54 sra Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/inet/inet_ntoa.c,v 1.4 2007/06/03 17:20:26 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/inet/inet_ntoa.c,v 1.5 2007/06/11 07:21:21 delphij Exp $"); #include "port_before.h" @@ -59,11 +59,19 @@ return (ret); } +char * +inet_ntoa_r(struct in_addr in, char *buf) +{ + (void) inet_ntop(AF_INET, &in, buf, sizeof("255.255.255.255")); + return (buf); +} + /* * Weak aliases for applications that use certain private entry points, * and fail to include <arpa/inet.h>. */ #undef inet_ntoa __weak_reference(__inet_ntoa, inet_ntoa); +__weak_reference(__inet_ntoa_r, inet_ntoa_r); /*! \file */ ==== //depot/projects/wifi/lib/libc/net/Makefile.inc#8 (text+ko) ==== @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 9/5/93 -# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.65 2007/02/28 21:18:38 bms Exp $ +# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.66 2007/06/11 07:21:21 delphij Exp $ # machine-independent net sources .PATH: ${.CURDIR}/net @@ -80,7 +80,7 @@ if_indextoname.3 if_freenameindex.3 MLINKS+=inet.3 addr.3 inet.3 inet_addr.3 inet.3 inet_aton.3 \ inet.3 inet_lnaof.3 inet.3 inet_makeaddr.3 inet.3 inet_netof.3 \ - inet.3 inet_network.3 inet.3 inet_ntoa.3 \ + inet.3 inet_network.3 inet.3 inet_ntoa.3 inet.3 inet_ntoa_r.3\ inet.3 inet_ntop.3 inet.3 inet_pton.3 \ inet.3 network.3 inet.3 ntoa.3 MLINKS+= sctp_send.3 sctp_sendx.3 ==== //depot/projects/wifi/lib/libc/net/inet.3#7 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)inet.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/net/inet.3,v 1.34 2007/03/21 05:46:18 mlaier Exp $ +.\" $FreeBSD: src/lib/libc/net/inet.3,v 1.35 2007/06/11 07:21:21 delphij Exp $ .\" -.Dd March 21, 2007 +.Dd June 11, 2007 .Dt INET 3 .Os .Sh NAME @@ -36,6 +36,7 @@ .Nm inet_addr , .Nm inet_network , .Nm inet_ntoa , +.Nm inet_ntoa_r , .Nm inet_ntop , .Nm inet_pton , .Nm inet_makeaddr , @@ -57,6 +58,11 @@ .Fn inet_network "const char *cp" .Ft char * .Fn inet_ntoa "struct in_addr in" +.Ft char * +.Fo inet_ntoa_r +.Fa "struct in_addr in" +.Fa "char *buf" +.Fc .Ft const char * .Fo inet_ntop .Fa "int af" @@ -147,6 +153,11 @@ .Ql .\& notation. The routine +.Fn inet_ntoa_r +is the reentrant version of +.Fn inet_ntoa . +It requires a buffer large enough to contain an IPv4 address. +The routine .Fn inet_makeaddr takes an Internet network number and a local network address and constructs an Internet address ==== //depot/projects/wifi/lib/libc/net/sctp_sys_calls.c#5 (text+ko) ==== @@ -1,7 +1,7 @@ /* $KAME: sctp_sys_calls.c,v 1.9 2004/08/17 06:08:53 itojun Exp $ */ /* - * Copyright (C) 2002-2006 Cisco Systems Inc, + * Copyright (C) 2002-2007 Cisco Systems Inc, * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,7 +29,7 @@ * SUCH DAMAGE. */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.7 2007/05/16 20:23:39 rrs Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.8 2007/06/11 21:05:29 rrs Exp $"); #include <stdio.h> #include <string.h> #include <errno.h> @@ -164,15 +164,21 @@ } int -sctp_connectx(int sd, const struct sockaddr *addrs, int addrcnt, sctp_assoc_t * id) +sctp_connectx(int sd, const struct sockaddr *addrs, int addrcnt, + sctp_assoc_t * id) { char buf[SCTP_STACK_BUF_SIZE]; int i, ret, cnt, *aa; char *cpto; const struct sockaddr *at; + sctp_assoc_t *p_id; size_t len = sizeof(int); - sctp_assoc_t *p_id; + /* validate the address count and list */ + if ((addrs == NULL) || (addrcnt <= 0)) { + errno = EINVAL; + return (-1); + } at = addrs; cnt = 0; cpto = ((caddr_t)buf + sizeof(int)); @@ -227,11 +233,17 @@ struct sockaddr *sa; int i, sz, fam, argsz; + /* validate the flags */ if ((flags != SCTP_BINDX_ADD_ADDR) && (flags != SCTP_BINDX_REM_ADDR)) { errno = EFAULT; return (-1); } + /* validate the address count and list */ + if ((addrcnt <= 0) || (addrs == NULL)) { + errno = EINVAL; + return (-1); + } argsz = (sizeof(struct sockaddr_storage) + sizeof(struct sctp_getaddresses)); gaddrs = (struct sctp_getaddresses *)calloc(1, argsz); @@ -709,7 +721,6 @@ struct sctp_sndrcvinfo *sinfo, >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200706121016.l5CAGXjN056841>