Date: Fri, 2 Jan 2009 19:44:32 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 155586 for review Message-ID: <200901021944.n02JiWPZ087973@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=155586 Change 155586 by hselasky@hselasky_laptop001 on 2009/01/02 19:44:04 IFC @ 155584 Affected files ... .. //depot/projects/usb/src/sys/amd64/conf/USB2#1 branch .. //depot/projects/usb/src/sys/arm/conf/AVILA#10 integrate .. //depot/projects/usb/src/sys/arm/conf/CAMBRIA#2 integrate .. //depot/projects/usb/src/sys/arm/conf/EP80219#9 integrate .. //depot/projects/usb/src/sys/arm/conf/HL200#6 integrate .. //depot/projects/usb/src/sys/arm/conf/IQ31244#9 integrate .. //depot/projects/usb/src/sys/arm/conf/NSLU#5 integrate .. //depot/projects/usb/src/sys/boot/i386/boot0/Makefile#3 integrate .. //depot/projects/usb/src/sys/boot/i386/boot0/boot0.S#4 integrate .. //depot/projects/usb/src/sys/bsm/audit.h#8 integrate .. //depot/projects/usb/src/sys/bsm/audit_errno.h#1 branch .. //depot/projects/usb/src/sys/bsm/audit_internal.h#9 integrate .. //depot/projects/usb/src/sys/bsm/audit_kevents.h#9 integrate .. //depot/projects/usb/src/sys/bsm/audit_record.h#9 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#13 integrate .. //depot/projects/usb/src/sys/compat/linprocfs/linprocfs.c#13 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_misc.c#16 integrate .. //depot/projects/usb/src/sys/compat/ndis/kern_ndis.c#7 integrate .. //depot/projects/usb/src/sys/compat/ndis/kern_windrv.c#3 integrate .. //depot/projects/usb/src/sys/compat/ndis/ndis_var.h#4 integrate .. //depot/projects/usb/src/sys/compat/ndis/ntoskrnl_var.h#6 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_ndis.c#10 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_ntoskrnl.c#9 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_usbd.c#2 integrate .. //depot/projects/usb/src/sys/compat/ndis/usbd_var.h#2 integrate .. //depot/projects/usb/src/sys/conf/files#45 integrate .. //depot/projects/usb/src/sys/conf/files.amd64#13 integrate .. //depot/projects/usb/src/sys/conf/files.i386#16 integrate .. //depot/projects/usb/src/sys/conf/files.ia64#9 integrate .. //depot/projects/usb/src/sys/conf/files.powerpc#13 integrate .. //depot/projects/usb/src/sys/conf/files.sparc64#11 integrate .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_asus.c#10 integrate .. //depot/projects/usb/src/sys/dev/cardbus/cardbus.c#8 integrate .. //depot/projects/usb/src/sys/dev/cfe/cfe_console.c#2 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#13 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_pccard.c#3 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_pci.c#3 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#9 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndisvar.h#7 integrate .. //depot/projects/usb/src/sys/dev/puc/pucdata.c#8 integrate .. //depot/projects/usb/src/sys/dev/sbni/if_sbni.c#5 branch .. //depot/projects/usb/src/sys/dev/sbni/if_sbni_isa.c#4 branch .. //depot/projects/usb/src/sys/dev/sbni/if_sbni_pci.c#4 branch .. //depot/projects/usb/src/sys/dev/sbni/if_sbnireg.h#3 branch .. //depot/projects/usb/src/sys/dev/sbni/if_sbnivar.h#3 branch .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#16 integrate .. //depot/projects/usb/src/sys/dev/syscons/scterm-dumb.c#2 delete .. //depot/projects/usb/src/sys/dev/syscons/scterm-sc.c#3 delete .. //depot/projects/usb/src/sys/dev/syscons/scterm-teken.c#1 branch .. //depot/projects/usb/src/sys/dev/syscons/scterm.c#2 integrate .. //depot/projects/usb/src/sys/dev/syscons/sctermvar.h#2 delete .. //depot/projects/usb/src/sys/dev/syscons/syscons.c#10 integrate .. //depot/projects/usb/src/sys/dev/syscons/syscons.h#6 integrate .. //depot/projects/usb/src/sys/dev/syscons/teken/Makefile#1 branch .. //depot/projects/usb/src/sys/dev/syscons/teken/gensequences#1 branch .. //depot/projects/usb/src/sys/dev/syscons/teken/sequences#1 branch .. //depot/projects/usb/src/sys/dev/syscons/teken/teken.c#1 branch .. //depot/projects/usb/src/sys/dev/syscons/teken/teken.h#1 branch .. //depot/projects/usb/src/sys/dev/syscons/teken/teken_demo.c#1 branch .. //depot/projects/usb/src/sys/dev/syscons/teken/teken_stress.c#1 branch .. //depot/projects/usb/src/sys/dev/syscons/teken/teken_subr.h#1 branch .. //depot/projects/usb/src/sys/dev/syscons/teken/teken_subr_compat.h#1 branch .. //depot/projects/usb/src/sys/dev/syscons/teken/teken_wcwidth.h#1 branch .. //depot/projects/usb/src/sys/dev/uart/uart_tty.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#34 integrate .. //depot/projects/usb/src/sys/dev/usb/uscanner.c#33 integrate .. //depot/projects/usb/src/sys/dev/xen/blkfront/blkfront.c#4 integrate .. //depot/projects/usb/src/sys/dev/xen/console/console.c#3 integrate .. //depot/projects/usb/src/sys/dev/xen/console/xencons_ring.c#2 integrate .. //depot/projects/usb/src/sys/dev/xen/evtchn/evtchn_dev.c#2 integrate .. //depot/projects/usb/src/sys/dev/xen/netfront/netfront.c#5 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs_map.c#7 integrate .. //depot/projects/usb/src/sys/fs/pseudofs/pseudofs_vncache.c#6 integrate .. //depot/projects/usb/src/sys/fs/pseudofs/pseudofs_vnops.c#10 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_plex.c#4 integrate .. //depot/projects/usb/src/sys/i386/conf/USB2#1 branch .. //depot/projects/usb/src/sys/i386/conf/XEN#5 integrate .. //depot/projects/usb/src/sys/i386/i386/genassym.c#8 integrate .. //depot/projects/usb/src/sys/i386/i386/machdep.c#11 integrate .. //depot/projects/usb/src/sys/i386/i386/vm_machdep.c#10 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_sysi86.c#3 integrate .. //depot/projects/usb/src/sys/i386/include/xen/evtchn.h#3 delete .. //depot/projects/usb/src/sys/i386/include/xen/hypervisor.h#2 delete .. //depot/projects/usb/src/sys/i386/include/xen/xen_intr.h#3 delete .. //depot/projects/usb/src/sys/i386/include/xen/xenfunc.h#3 integrate .. //depot/projects/usb/src/sys/i386/isa/npx.c#6 integrate .. //depot/projects/usb/src/sys/i386/xen/clock.c#3 integrate .. //depot/projects/usb/src/sys/i386/xen/mp_machdep.c#5 integrate .. //depot/projects/usb/src/sys/i386/xen/mptable.c#2 integrate .. //depot/projects/usb/src/sys/i386/xen/pmap.c#3 integrate .. //depot/projects/usb/src/sys/i386/xen/xen_machdep.c#6 integrate .. //depot/projects/usb/src/sys/kern/kern_descrip.c#16 integrate .. //depot/projects/usb/src/sys/kern/kern_jail.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_mbuf.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_proc.c#15 integrate .. //depot/projects/usb/src/sys/kern/kern_sysctl.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_xxx.c#9 integrate .. //depot/projects/usb/src/sys/kern/subr_param.c#7 integrate .. //depot/projects/usb/src/sys/kern/uipc_usrreq.c#12 integrate .. //depot/projects/usb/src/sys/kern/vfs_cache.c#13 integrate .. //depot/projects/usb/src/sys/kern/vfs_export.c#8 integrate .. //depot/projects/usb/src/sys/kern/vfs_syscalls.c#14 integrate .. //depot/projects/usb/src/sys/mips/mips/elf64_machdep.c#1 branch .. //depot/projects/usb/src/sys/modules/ndis/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/sbni/Makefile#3 branch .. //depot/projects/usb/src/sys/modules/usb2/Makefile#7 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_hostap.c#7 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_node.c#13 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_output.c#14 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_wds.c#5 integrate .. //depot/projects/usb/src/sys/netinet/in.c#14 integrate .. //depot/projects/usb/src/sys/netipsec/ipsec.c#14 integrate .. //depot/projects/usb/src/sys/netipsec/ipsec.h#11 integrate .. //depot/projects/usb/src/sys/pc98/cbus/scterm-sck.c#3 integrate .. //depot/projects/usb/src/sys/pc98/cbus/sctermvar.h#1 branch .. //depot/projects/usb/src/sys/security/audit/audit_bsm.c#12 integrate .. //depot/projects/usb/src/sys/security/audit/audit_bsm_errno.c#1 branch .. //depot/projects/usb/src/sys/security/audit/audit_bsm_token.c#10 integrate .. //depot/projects/usb/src/sys/security/audit/audit_pipe.c#10 integrate .. //depot/projects/usb/src/sys/sparc64/include/tlb.h#4 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/machdep.c#12 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/pmap.c#10 integrate .. //depot/projects/usb/src/sys/sys/copyright.h#5 integrate .. //depot/projects/usb/src/sys/sys/elf64.h#3 integrate .. //depot/projects/usb/src/sys/sys/elf_common.h#8 integrate .. //depot/projects/usb/src/sys/sys/elf_generic.h#2 integrate .. //depot/projects/usb/src/sys/sys/file.h#7 integrate .. //depot/projects/usb/src/sys/sys/imgact_elf.h#3 integrate .. //depot/projects/usb/src/sys/sys/link_elf.h#4 integrate .. //depot/projects/usb/src/sys/vm/vm_map.c#11 integrate .. //depot/projects/usb/src/sys/vm/vm_map.h#6 integrate .. //depot/projects/usb/src/sys/xen/evtchn.h#1 branch .. //depot/projects/usb/src/sys/xen/evtchn/evtchn.c#4 integrate .. //depot/projects/usb/src/sys/xen/evtchn/evtchn_dev.c#2 integrate .. //depot/projects/usb/src/sys/xen/features.c#2 integrate .. //depot/projects/usb/src/sys/xen/gnttab.c#5 integrate .. //depot/projects/usb/src/sys/xen/gnttab.h#5 integrate .. //depot/projects/usb/src/sys/xen/hypervisor.h#1 branch .. //depot/projects/usb/src/sys/xen/xen_intr.h#1 branch .. //depot/projects/usb/src/sys/xen/xenbus/xenbus_client.c#3 integrate .. //depot/projects/usb/src/sys/xen/xenbus/xenbus_comms.c#3 integrate .. //depot/projects/usb/src/sys/xen/xenbus/xenbus_comms.h#3 integrate .. //depot/projects/usb/src/sys/xen/xenbus/xenbus_dev.c#3 integrate .. //depot/projects/usb/src/sys/xen/xenbus/xenbus_probe.c#3 integrate .. //depot/projects/usb/src/sys/xen/xenbus/xenbus_probe_backend.c#3 integrate .. //depot/projects/usb/src/sys/xen/xenbus/xenbus_xs.c#4 integrate .. //depot/projects/usb/src/sys/xen/xenbus/xenbusvar.h#2 integrate .. //depot/projects/usb/src/usr.sbin/usbdevs/usbdevs.c#4 branch Differences ... ==== //depot/projects/usb/src/sys/arm/conf/AVILA#10 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/AVILA,v 1.20 2008/12/20 03:26:09 sam Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.21 2008/12/27 17:22:17 bz Exp $ ident AVILA @@ -31,7 +31,6 @@ makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=xscale -makeoptions MODULES_OVERRIDE="" #options HZ=1000 options HZ=100 options DEVICE_POLLING ==== //depot/projects/usb/src/sys/arm/conf/CAMBRIA#2 (text+ko) ==== @@ -16,9 +16,8 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.1 2008/12/20 03:26:09 sam Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.2 2008/12/27 19:02:01 sam Exp $ -machine arm ident CAMBRIA include "../xscale/ixp425/std.ixp435" ==== //depot/projects/usb/src/sys/arm/conf/EP80219#9 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/EP80219,v 1.10 2008/12/17 17:43:22 marcel Exp $ +# $FreeBSD: src/sys/arm/conf/EP80219,v 1.11 2008/12/27 19:03:57 bz Exp $ ident EP80219 @@ -28,6 +28,7 @@ include "../xscale/i80321/std.ep80219" #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. +makeoptions MODULES_OVERRIDE="" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=xscale ==== //depot/projects/usb/src/sys/arm/conf/HL200#6 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/HL200,v 1.7 2008/11/25 19:05:46 imp Exp $ +# $FreeBSD: src/sys/arm/conf/HL200,v 1.8 2008/12/27 19:03:57 bz Exp $ ident HL200 @@ -23,6 +23,7 @@ #To statically compile in device wiring instead of /boot/device.hints hints "KB920X.hints" +makeoptions MODULES_OVERRIDE="" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols options DDB ==== //depot/projects/usb/src/sys/arm/conf/IQ31244#9 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.23 2008/10/23 01:51:55 marcel Exp $ +# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.24 2008/12/27 19:03:57 bz Exp $ ident IQ31244 @@ -29,6 +29,7 @@ include "../xscale/i80321/std.iq31244" #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. +makeoptions MODULES_OVERRIDE="" #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=xscale ==== //depot/projects/usb/src/sys/arm/conf/NSLU#5 (text+ko) ==== @@ -15,18 +15,22 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/NSLU,v 1.4 2008/11/30 17:53:19 sam Exp $ +# $FreeBSD: src/sys/arm/conf/NSLU,v 1.5 2008/12/28 11:04:24 bz Exp $ ident NSLU -options PHYSADDR=0x10000000 -options KERNPHYSADDR=0x10200000 -options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm -options FLASHADDR=0x50000000 -options LOADERRAMADDR=0x00000000 -options STARTUP_PAGETABLE_ADDR=0x10000000 +# XXX What is defined in std.avila does not exactly match the following: +#options PHYSADDR=0x10000000 +#options KERNPHYSADDR=0x10200000 +#options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm +#options FLASHADDR=0x50000000 +#options LOADERRAMADDR=0x00000000 +#options STARTUP_PAGETABLE_ADDR=0x10000000 +include "../xscale/ixp425/std.ixp425" +# NB: memory mapping is defined in std.avila (see also comment above) include "../xscale/ixp425/std.avila" +options XSCALE_CACHE_READ_WRITE_ALLOCATE #To statically compile in device wiring instead of /boot/device.hints hints "NSLU.hints" #Default places to look for devices. makeoptions MODULES_OVERRIDE="" @@ -99,7 +103,6 @@ device pty device loop -options XSCALE_CACHE_READ_WRITE_ALLOCATE device md device random # Entropy device ==== //depot/projects/usb/src/sys/boot/i386/boot0/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.34 2008/12/03 14:53:59 luigi Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.35 2008/12/30 09:40:50 luigi Exp $ PROG?= boot0 STRIP= @@ -30,7 +30,7 @@ # with the one in the boot sector. # Default boot flags: -BOOT_BOOT0_FLAGS?= 0xcf +BOOT_BOOT0_FLAGS?= 0x8f # The number of timer ticks to wait for a keypress before assuming the default # selection. Since there are 18.2 ticks per second, the default value of ==== //depot/projects/usb/src/sys/boot/i386/boot0/boot0.S#4 (text+ko) ==== @@ -14,7 +14,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.21 2008/12/08 20:53:27 sobomax Exp $ + * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.22 2008/12/30 09:40:50 luigi Exp $ */ /* build options: */ @@ -22,6 +22,7 @@ #endif #ifdef PXE /* enable PXE/INT18 booting with F6 */ +#define SAVE_MORE_MEMORY #endif #ifdef CHECK_DRIVE /* make sure we boot from a HD. */ @@ -274,10 +275,11 @@ * Scan the table of bootable ids, which starts at %di and has * length TLEN. On a match, %di points to the element following the * match; the corresponding offset to the description is $(TLEN-1) - * bytes ahead. If we don't find a match, we hit the 'unknown' entry. + * bytes ahead. We use a count of TLEN+1 so if we don't find a match + * within the first TLEN entries, we hit the 'unknown' entry. */ movw $bootable_ids,%di # Lookup tables - movb $(TLEN),%cl # Number of entries + movb $(TLEN+1),%cl # Number of entries repne # Locate scasb # type /* @@ -324,7 +326,7 @@ callw putx # item /* * Menu is complete, display a prompt followed by current selection. - * 'decw %si' makes the register point to the space after 'Default: ' + * 'decw %si' makes the register point to the space after 'Boot: ' * so we do not see an extra CRLF on the screen. */ print_prompt: movw $prompt,%si # Display @@ -371,6 +373,7 @@ * Timed out or default selection */ use_default: movb _OPT(%bp),%al # Load default + orb $NOUPDATE,_FLAGS(%bp) # Disable updates jmp check_selection # Join common code /* @@ -585,13 +588,12 @@ * Various menu strings. 'item' goes after 'prompt' to save space. * Also use shorter versions to make room for the PXE/INT18 code. */ +prompt: #ifdef PXE -prompt: .ascii "\nBoot:" + .ascii "\nF6 PXE\r" +#endif + .ascii "\nBoot:" item: .ascii " "; .byte ' '|0x80 -#else -prompt: .ascii "\nDefault:" -item: .ascii " "; .byte ' '|0x80 -#endif crlf: .ascii "\r"; .byte '\n'|0x80 /* Partition type tables */ @@ -602,13 +604,13 @@ * Corresponding descriptions are at desc_ofs: * Entries don't need to be sorted. */ - .byte 0x1, 0x6, 0x7, 0xb, 0xc -#ifndef SAVE_MEMORY - .byte 0xe + .byte 0x83, 0xa5, 0xa6, 0xa9, 0x06, 0x07, 0x0b +#ifndef SAVE_MORE_MEMORY + .byte 0x05 # extended partition #endif - .byte 0x83, 0xa5, 0xa6, 0xa9, 0x4 -#ifndef SAVE_MORE_MEMORY - .byte 0x5, 0xf +#ifndef SAVE_MEMORY /* other DOS partitions */ + .byte 0x01 # FAT12 + .byte 0x04 # FAT16 < 32M #endif desc_ofs: @@ -617,24 +619,21 @@ * actual partition name. The last entry must point to os_misc, * which is used for non-matching names. */ - .byte os_dos-. # 1, FAT12 DOS - .byte os_dos-. # 6, FAT16 <32M, DOS/WIN - .byte os_win-. # 7, FAT16 >=32M Windows - .byte os_win-. # 11, FAT32 - .byte os_win-. # 12, FAT32-LBA -#ifndef SAVE_MEMORY - .byte os_win-. # 14, FAT16-LBA -#endif .byte os_linux-. # 131, Linux .byte os_freebsd-. # 165, FreeBSD .byte os_bsd-. # 166, OpenBSD .byte os_bsd-. # 169, NetBSD - .byte os_dos-. # 4, FAT16 < 32M + .byte os_dos-. # 6, FAT16 >= 32M + .byte os_win-. # 7, NTFS + .byte os_win-. # 11, FAT32 + #ifndef SAVE_MORE_MEMORY .byte os_ext-. # 5, DOS Ext - .byte os_ext-. # 15, DOS Ext-LBA +#endif +#ifndef SAVE_MEMORY + .byte os_dos-. # 1, FAT12 DOS + .byte os_dos-. # 4, FAT16 <32M #endif - .byte os_misc-. # Unknown /* @@ -643,10 +642,10 @@ */ os_misc: .byte '?'|0x80 os_dos: -#ifndef SAVE_MEMORY /* DOS string only if room */ +#ifndef SAVE_MORE_MEMORY /* 'DOS' remapped to 'WIN' if no room */ .ascii "DO"; .byte 'S'|0x80 #endif -os_win: .ascii "WI"; .byte 'N'|0x80 +os_win: .ascii "Wi"; .byte 'n'|0x80 os_linux: .ascii "Linu"; .byte 'x'|0x80 os_freebsd: .ascii "Free" os_bsd: .ascii "BS"; .byte 'D'|0x80 ==== //depot/projects/usb/src/sys/bsm/audit.h#8 (text) ==== @@ -27,15 +27,20 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#1 - * $FreeBSD: src/sys/bsm/audit.h,v 1.12 2008/12/02 23:26:43 rwatson Exp $ + * $FreeBSD: src/sys/bsm/audit.h,v 1.13 2008/12/31 11:12:24 rwatson Exp $ */ #ifndef _BSM_AUDIT_H #define _BSM_AUDIT_H +#ifdef __APPLE__ +/* Temporary until rdar://problem/6133383 is resolved. */ +#include <sys/types.h> #include <sys/param.h> +#include <sys/socket.h> #include <sys/cdefs.h> #include <sys/queue.h> +#endif /* __APPLE__ */ #define AUDIT_RECORD_MAGIC 0x828a0f1b #define MAX_AUDIT_RECORDS 20 @@ -60,8 +65,9 @@ #define AUDIT_TRIGGER_READ_FILE 3 /* Re-read config file. */ #define AUDIT_TRIGGER_CLOSE_AND_DIE 4 /* Terminate audit. */ #define AUDIT_TRIGGER_NO_SPACE 5 /* Below min free space. */ -#define AUDIT_TRIGGER_ROTATE_USER 6 /* User requests roate. */ -#define AUDIT_TRIGGER_MAX 6 +#define AUDIT_TRIGGER_ROTATE_USER 6 /* User requests rotate. */ +#define AUDIT_TRIGGER_INITIALIZE 7 /* Initialize audit. */ +#define AUDIT_TRIGGER_MAX 7 /* * The special device filename (FreeBSD). @@ -72,7 +78,9 @@ /* * Pre-defined audit IDs */ -#define AU_DEFAUDITID -1 +#define AU_DEFAUDITID (uid_t)(-1) +#define AU_DEFAUDITSID 0 +#define AU_ASSIGN_ASID -1 /* * IPC types. @@ -116,6 +124,7 @@ #define A_GETKAUDIT 29 #define A_SETKAUDIT 30 #define A_SENDTRIGGER 31 +#define A_GETSINFO_ADDR 32 /* * Audit policy controls. @@ -196,6 +205,7 @@ au_mask_t ai_mask; /* Audit masks. */ au_tid_addr_t ai_termid; /* Terminal ID. */ au_asid_t ai_asid; /* Audit session ID. */ + u_int64_t ai_flags; /* Audit session flags. */ }; typedef struct auditinfo_addr auditinfo_addr_t; @@ -205,6 +215,7 @@ au_mask_t ap_mask; /* Audit masks. */ au_tid_t ap_termid; /* Terminal ID. */ au_asid_t ap_asid; /* Audit session ID. */ + u_int64_t ap_flags; /* Audit session flags. */ }; typedef struct auditpinfo auditpinfo_t; @@ -217,6 +228,16 @@ }; typedef struct auditpinfo_addr auditpinfo_addr_t; +struct au_session { + auditinfo_addr_t *as_aia_p; /* Ptr to full audit info. */ +#define as_asid as_aia_p->ai_asid +#define as_auid as_aia_p->ai_auid +#define as_termid as_aia_p->ai_termid + + au_mask_t as_mask; /* Process Audit Masks. */ +}; +typedef struct au_session au_session_t; + /* * Contents of token_t are opaque outside of libbsm. */ ==== //depot/projects/usb/src/sys/bsm/audit_internal.h#9 (text) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005 Apple Inc. + * Copyright (c) 2005-2008 Apple Inc. * Copyright (c) 2005 SPARTA, Inc. * All rights reserved. * @@ -31,7 +31,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_internal.h#2 - * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.11 2008/12/02 23:26:43 rwatson Exp $ + * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.12 2008/12/31 11:12:24 rwatson Exp $ */ #ifndef _AUDIT_INTERNAL_H ==== //depot/projects/usb/src/sys/bsm/audit_kevents.h#9 (text) ==== @@ -27,7 +27,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#3 - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.16 2008/12/02 23:26:43 rwatson Exp $ + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.17 2008/12/31 11:12:24 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -59,7 +59,6 @@ #define AUE_UMOUNT 12 #define AUE_JUNK 13 /* Solaris-specific. */ #define AUE_ACCESS 14 -#define AUE_CHECKUSERACCESS AUE_ACCESS /* Darwin-specific. */ #define AUE_KILL 15 #define AUE_STAT 16 #define AUE_LSTAT 17 @@ -561,7 +560,7 @@ #define AUE_ACCESS_EXTENDED 43162 /* Darwin. */ #define AUE_CHMOD_EXTENDED 43163 /* Darwin. */ #define AUE_FCHMOD_EXTENDED 43164 /* Darwin. */ -#define AUE_FSTAT_EXTENDED 43165 /* Dariwn. */ +#define AUE_FSTAT_EXTENDED 43165 /* Darwin. */ #define AUE_LSTAT_EXTENDED 43166 /* Darwin. */ #define AUE_MKDIR_EXTENDED 43167 /* Darwin. */ #define AUE_MKFIFO_EXTENDED 43168 /* Darwin. */ @@ -586,6 +585,8 @@ #define AUE_CAP_GETRIGHTS 43187 /* TrustedBSD. */ #define AUE_CAP_ENTER 43188 /* TrustedBSD. */ #define AUE_CAP_GETMODE 43189 /* TrustedBSD. */ +#define AUE_POSIX_SPAWN 43190 /* Darwin. */ +#define AUE_FSGETPATH 43191 /* Darwin. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the @@ -657,13 +658,42 @@ /* * Possible desired future values based on review of BSD/Darwin system calls. */ +#define AUE_ACCESSEXTENDED AUE_NULL +#define AUE_ATGETMSG AUE_NULL +#define AUE_ATPUTMSG AUE_NULL +#define AUE_ATSOCKET AUE_NULL +#define AUE_ATPGETREQ AUE_NULL +#define AUE_ATPGETRSP AUE_NULL +#define AUE_ATPSNDREQ AUE_NULL +#define AUE_ATPSNDRSP AUE_NULL +#define AUE_BSDTHREADCREATE AUE_NULL +#define AUE_BSDTHREADTERMINATE AUE_NULL +#define AUE_BSDTHREADREGISTER AUE_NULL +#define AUE_CHMODEXTENDED AUE_NULL +#define AUE_CHUD AUE_NULL +#define AUE_CSOPS AUE_NULL #define AUE_DUP AUE_NULL +#define AUE_FCHMODEXTENDED AUE_NULL +#define AUE_FDATASYNC AUE_NULL +#define AUE_FFSCTL AUE_NULL +#define AUE_FGETATTRLIST AUE_NULL +#define AUE_FGETXATTR AUE_NULL +#define AUE_FLISTXATTR AUE_NULL +#define AUE_FREMOVEXATTR AUE_NULL #define AUE_FSCTL AUE_NULL +#define AUE_FSETATTRLIST AUE_NULL +#define AUE_FSETXATTR AUE_NULL +#define AUE_FSTATEXTENDED AUE_NULL +#define AUE_FSTATFS64 AUE_NULL #define AUE_FSTATV AUE_NULL +#define AUE_FSTAT64 AUE_NULL +#define AUE_FSTAT64EXTENDED AUE_NULL #define AUE_GCCONTROL AUE_NULL +#define AUE_GETDIRENTRIES64 AUE_NULL #define AUE_GETDTABLESIZE AUE_NULL #define AUE_GETEGID AUE_NULL #define AUE_GETEUID AUE_NULL +#define AUE_GETFSSTAT64 AUE_NULL #define AUE_GETGID AUE_NULL #define AUE_GETGROUPS AUE_NULL #define AUE_GETITIMER AUE_NULL @@ -676,24 +706,53 @@ #define AUE_GETPRIORITY AUE_NULL #define AUE_GETRLIMIT AUE_NULL #define AUE_GETRUSAGE AUE_NULL +#define AUE_GETSGROUPS AUE_NULL #define AUE_GETSID AUE_NULL #define AUE_GETSOCKNAME AUE_NULL #define AUE_GETTIMEOFDAY AUE_NULL +#define AUE_GETTID AUE_NULL #define AUE_GETUID AUE_NULL #define AUE_GETSOCKOPT AUE_NULL -#define AUE_GTSOCKOPT AUE_GETSOCKOPT /* XXX: Typo in Darwin. */ +#define AUE_GETWGROUPS AUE_NULL +#define AUE_GETXATTR AUE_NULL +#define AUE_IDENTITYSVC AUE_NULL +#define AUE_INITGROUPS AUE_NULL +#define AUE_IOPOLICYSYS AUE_NULL #define AUE_ISSETUGID AUE_NULL +#define AUE_LIOLISTIO AUE_NULL +#define AUE_LISTXATTR AUE_NULL +#define AUE_LSTATEXTENDED AUE_NULL #define AUE_LSTATV AUE_NULL +#define AUE_LSTAT64 AUE_NULL +#define AUE_LSTAT64EXTENDED AUE_NULL #define AUE_MADVISE AUE_NULL #define AUE_MINCORE AUE_NULL #define AUE_MKCOMPLEX AUE_NULL +#define AUE_MKDIREXTENDED AUE_NULL +#define AUE_MKFIFOEXTENDED AUE_NULL #define AUE_MODWATCH AUE_NULL #define AUE_MSGCL AUE_NULL #define AUE_MSYNC AUE_NULL +#define AUE_OPENEXTENDED AUE_NULL #define AUE_PREAD AUE_NULL #define AUE_PWRITE AUE_NULL #define AUE_PREADV AUE_NULL +#define AUE_PROCINFO AUE_NULL +#define AUE_PTHREADCANCELED AUE_NULL +#define AUE_PTHREADCHDIR AUE_NULL +#define AUE_PTHREADCONDBROADCAST AUE_NULL +#define AUE_PTHREADCONDDESTORY AUE_NULL +#define AUE_PTHREADCONDINIT AUE_NULL +#define AUE_PTHREADCONDSIGNAL AUE_NULL +#define AUE_PTHREADCONDWAIT AUE_NULL +#define AUE_PTHREADFCHDIR AUE_NULL +#define AUE_PTHREADMARK AUE_NULL +#define AUE_PTHREADMUTEXDESTROY AUE_NULL +#define AUE_PTHREADMUTEXINIT AUE_NULL +#define AUE_PTHREADMUTEXTRYLOCK AUE_NULL +#define AUE_PTHREADMUTEXUNLOCK AUE_NULL #define AUE_PWRITEV AUE_NULL +#define AUE_REMOVEXATTR AUE_NULL #define AUE_SBRK AUE_NULL #define AUE_SELECT AUE_NULL #define AUE_SEMDESTROY AUE_NULL @@ -702,7 +761,15 @@ #define AUE_SEMPOST AUE_NULL #define AUE_SEMTRYWAIT AUE_NULL #define AUE_SEMWAIT AUE_NULL +#define AUE_SEMWAITSIGNAL AUE_NULL #define AUE_SETITIMER AUE_NULL +#define AUE_SETSGROUPS AUE_NULL +#define AUE_SETTID AUE_NULL +#define AUE_SETTIDWITHPID AUE_NULL +#define AUE_SETWGROUPS AUE_NULL +#define AUE_SETXATTR AUE_NULL +#define AUE_SHAREDREGIONCHECK AUE_NULL +#define AUE_SHAREDREGIONMAP AUE_NULL #define AUE_SIGACTION AUE_NULL #define AUE_SIGALTSTACK AUE_NULL #define AUE_SIGPENDING AUE_NULL @@ -711,11 +778,21 @@ #define AUE_SIGSUSPEND AUE_NULL #define AUE_SIGWAIT AUE_NULL #define AUE_SSTK AUE_NULL +#define AUE_STACKSNAPSHOT AUE_NULL +#define AUE_STATEXTENDED AUE_NULL +#define AUE_STATFS64 AUE_NULL #define AUE_STATV AUE_NULL +#define AUE_STAT64 AUE_NULL +#define AUE_STAT64EXTENDED AUE_NULL #define AUE_SYNC AUE_NULL #define AUE_SYSCALL AUE_NULL #define AUE_TABLE AUE_NULL +#define AUE_UMASKEXTENDED AUE_NULL +#define AUE_VMPRESSUREMONITOR AUE_NULL #define AUE_WAITEVENT AUE_NULL +#define AUE_WAITID AUE_NULL #define AUE_WATCHEVENT AUE_NULL +#define AUE_WORKQOPEN AUE_NULL +#define AUE_WORKQOPS AUE_NULL #endif /* !_BSM_AUDIT_KEVENTS_H_ */ ==== //depot/projects/usb/src/sys/bsm/audit_record.h#9 (text) ==== @@ -27,7 +27,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#3 - * $FreeBSD: src/sys/bsm/audit_record.h,v 1.13 2008/12/02 23:26:43 rwatson Exp $ + * $FreeBSD: src/sys/bsm/audit_record.h,v 1.14 2008/12/31 11:12:24 rwatson Exp $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -165,14 +165,11 @@ #define AUDIT_HEADER_VERSION_SOLARIS 2 #define AUDIT_HEADER_VERSION_TSOL25 3 #define AUDIT_HEADER_VERSION_TSOL 4 -#define AUDIT_HEADER_VERSION_OPENBSM 10 +#define AUDIT_HEADER_VERSION_OPENBSM10 10 +#define AUDIT_HEADER_VERSION_OPENBSM11 11 +#define AUDIT_HEADER_VERSION_OPENBSM AUDIT_HEADER_VERSION_OPENBSM11 -/* - * BSM define is AUT_TRAILER_MAGIC; Apple BSM define is TRAILER_PAD_MAGIC; we - * split the difference, will remove the Apple define for the next release. - */ #define AUT_TRAILER_MAGIC 0xb105 -#define TRAILER_PAD_MAGIC AUT_TRAILER_MAGIC /* BSM library calls */ @@ -183,6 +180,7 @@ struct ip; struct ipc_perm; struct kevent; +struct sockaddr; struct sockaddr_in; struct sockaddr_in6; struct sockaddr_un; @@ -209,6 +207,7 @@ token_t *au_to_header_ex(int rec_size, au_event_t e_type, au_emod_t e_mod); token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod); token_t *au_to_header64(int rec_size, au_event_t e_type, au_emod_t e_mod); +token_t *au_to_header32_ex(int rec_size, au_event_t e_type, au_emod_t e_mod); #endif token_t *au_to_me(void); @@ -252,15 +251,8 @@ token_t *au_to_return32(char status, uint32_t ret); token_t *au_to_return64(char status, uint64_t ret); token_t *au_to_seq(long audit_count); - -#if defined(_KERNEL) || defined(KERNEL) -token_t *au_to_socket(struct socket *so); -token_t *au_to_socket_ex_32(uint16_t lp, uint16_t rp, struct sockaddr *la, - struct sockaddr *ta); -token_t *au_to_socket_ex_128(uint16_t lp, uint16_t rp, struct sockaddr *la, - struct sockaddr *ta); -#endif - +token_t *au_to_socket_ex(u_short so_domain, u_short so_type, + struct sockaddr *sa_local, struct sockaddr *sa_remote); token_t *au_to_sock_inet(struct sockaddr_in *so); token_t *au_to_sock_inet32(struct sockaddr_in *so); token_t *au_to_sock_inet128(struct sockaddr_in6 *so); @@ -289,6 +281,12 @@ token_t *au_to_trailer(int rec_size); token_t *au_to_zonename(const char *zonename); +/* + * BSM library routines for manipulating errno values. + */ +int au_bsm_to_errno(u_char bsm_error, int *errorp); +u_char au_errno_to_bsm(int error); + __END_DECLS #endif /* ! _BSM_AUDIT_RECORD_H_ */ ==== //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.85 2008/12/03 18:45:38 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.86 2008/12/29 12:58:45 ed Exp $"); #include "opt_compat.h" @@ -2019,7 +2019,6 @@ error = copyin(uap->name, name, uap->namelen * sizeof(int)); if (error) return (error); - mtx_lock(&Giant); if (uap->oldlenp) oldlen = fuword32(uap->oldlenp); else @@ -2028,12 +2027,10 @@ uap->old, &oldlen, 1, uap->new, uap->newlen, &j, SCTL_MASK32); if (error && error != ENOMEM) - goto done2; + return (error); if (uap->oldlenp) suword32(uap->oldlenp, j); -done2: - mtx_unlock(&Giant); - return (error); + return (0); } int ==== //depot/projects/usb/src/sys/compat/linprocfs/linprocfs.c#13 (text+ko) ==== @@ -42,7 +42,7 @@ #include "opt_compat.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.132 2008/12/12 12:12:36 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.133 2008/12/29 12:45:11 kib Exp $"); #include <sys/param.h> #include <sys/queue.h> @@ -980,7 +980,7 @@ error = 0; break; } - if (last_timestamp + 1 != map->timestamp) { + if (last_timestamp != map->timestamp) { /* * Look again for the entry because the map was * modified while it was unlocked. Specifically, ==== //depot/projects/usb/src/sys/compat/linux/linux_misc.c#16 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.230 2008/11/09 10:45:13 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.231 2008/12/29 12:58:45 ed Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -1682,7 +1682,6 @@ linux_sethostname(struct thread *td, struct linux_sethostname_args *args) { int name[2]; - int error; #ifdef DEBUG if (ldebug(sethostname)) @@ -1691,18 +1690,14 @@ name[0] = CTL_KERN; name[1] = KERN_HOSTNAME; - mtx_lock(&Giant); - error = userland_sysctl(td, name, 2, 0, 0, 0, args->hostname, - args->len, 0, 0); - mtx_unlock(&Giant); - return (error); + return (userland_sysctl(td, name, 2, 0, 0, 0, args->hostname, + args->len, 0, 0)); } int linux_setdomainname(struct thread *td, struct linux_setdomainname_args *args) { int name[2]; - int error; #ifdef DEBUG if (ldebug(setdomainname)) @@ -1711,11 +1706,8 @@ name[0] = CTL_KERN; name[1] = KERN_NISDOMAINNAME; - mtx_lock(&Giant); - error = userland_sysctl(td, name, 2, 0, 0, 0, args->name, - args->len, 0, 0); - mtx_unlock(&Giant); - return (error); + return (userland_sysctl(td, name, 2, 0, 0, 0, args->name, + args->len, 0, 0)); } int ==== //depot/projects/usb/src/sys/compat/ndis/kern_ndis.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.98 2008/07/23 10:49:27 weongyo Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.100 2008/12/27 09:42:17 weongyo Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -65,6 +65,9 @@ #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_ioctl.h> +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> + #include <compat/ndis/pe_var.h> #include <compat/ndis/cfg_var.h> #include <compat/ndis/resource_var.h> @@ -144,7 +147,6 @@ } TAILQ_INIT(&ndis_devhead); - break; case MOD_SHUTDOWN: if (TAILQ_FIRST(&ndis_devhead) == NULL) { @@ -1199,6 +1201,33 @@ } int +ndis_pnpevent_nic(arg, type) + void *arg; + int type; +{ + device_t dev; + struct ndis_softc *sc; + ndis_handle adapter; + ndis_pnpevent_handler pnpeventfunc; + + dev = arg; + sc = device_get_softc(arg); + NDIS_LOCK(sc); + adapter = sc->ndis_block->nmb_miniportadapterctx; + pnpeventfunc = sc->ndis_chars->nmc_pnpevent_handler; + NDIS_UNLOCK(sc); + if (adapter == NULL || pnpeventfunc == NULL) + return(EIO); + + if (sc->ndis_chars->nmc_rsvd0 == NULL) + MSCALL4(pnpeventfunc, adapter, type, NULL, 0); + else + MSCALL4(pnpeventfunc, sc->ndis_chars->nmc_rsvd0, type, NULL, 0); + + return (0); +} + +int ndis_init_nic(arg) void *arg; { ==== //depot/projects/usb/src/sys/compat/ndis/kern_windrv.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_windrv.c,v 1.14 2007/05/20 22:03:57 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_windrv.c,v 1.16 2008/12/28 13:50:58 ganbold Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -56,6 +56,9 @@ #include <machine/segments.h> #endif +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> + #include <compat/ndis/pe_var.h> #include <compat/ndis/cfg_var.h> >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901021944.n02JiWPZ087973>