From owner-p4-projects@FreeBSD.ORG Sun Feb 5 00:42:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 934F016A422; Sun, 5 Feb 2006 00:42:41 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2D6F416A423 for ; Sun, 5 Feb 2006 00:42:41 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 04EEC43D46 for ; Sun, 5 Feb 2006 00:42:40 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k150gdNe073471 for ; Sun, 5 Feb 2006 00:42:39 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k150gdWF073468 for perforce@freebsd.org; Sun, 5 Feb 2006 00:42:39 GMT (envelope-from wsalamon@computer.org) Date: Sun, 5 Feb 2006 00:42:39 GMT Message-Id: <200602050042.k150gdWF073468@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 91134 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2006 00:42:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=91134 Change 91134 by wsalamon@gretsch on 2006/02/05 00:42:13 Have the audit test library load the kernel event->class mapping table at init time. Affected files ... .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/include/audittest.h#5 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/lib/audittest.c#5 edit Differences ... ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/include/audittest.h#5 (text+ko) ==== @@ -52,7 +52,7 @@ /* * Function that will set up the process audit information. */ -void aut_init(char *prefix, unsigned int succ_mask, unsigned int fail_mask, +int aut_init(char *prefix, unsigned int succ_mask, unsigned int fail_mask, unsigned int flags); /* @@ -75,7 +75,11 @@ #define AUT_INIT() do { \ assert(argc == 2); \ - aut_init(__FILE__, AUDIT_CLASSES, AUDIT_CLASSES, strtol(argv[1], NULL, 16)); \ + if (aut_init(__FILE__, AUDIT_CLASSES, AUDIT_CLASSES, \ + strtol(argv[1], NULL, 16)) != 0) { \ + fprintf(stderr, "Unable to initialize.\n"); \ + exit (-1); \ + } \ } while(0) #define AUT_PRINTF(args...) do { \ ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/lib/audittest.c#5 (text+ko) ==== @@ -40,6 +40,49 @@ int aut_verbose; char logfile[MAXPATHLEN + 1]; +/* + * Set the event to class mapping in the kernel. + */ +static int +set_kernel_classmap(void) +{ + au_event_ent_t ev, *evp; + au_evclass_map_t evc_map; + int ctr = 0; + + /* + * Process the audit event file, obtaining a class mapping for each + * event, and send that mapping into the kernel. + */ + ev.ae_name = (char *)malloc(AU_EVENT_NAME_MAX); + ev.ae_desc = (char *)malloc(AU_EVENT_DESC_MAX); + if ((ev.ae_name == NULL) || (ev.ae_desc == NULL)) { + fprintf(stderr, + "Memory allocation error when configuring audit controls.\n"); + return (-1); + } + evp = &ev; + setauevent(); + while ((evp = getauevent_r(evp)) != NULL) { + evc_map.ec_number = evp->ae_number; + evc_map.ec_class = evp->ae_class; + if (auditon(A_SETCLASS, &evc_map, sizeof(au_evclass_map_t)) + != 0) + fprintf(stderr, + "Failed to register class mapping for event %s.\n", + evp->ae_name); + else + ctr++; + } + endauevent(); + free(ev.ae_name); + free(ev.ae_desc); + if (ctr == 0) + fprintf(stderr, "No events to class mappings registered.\n"); + + return (0); +} + /* * Open the audit log file and tell the kernel. */ @@ -92,12 +135,19 @@ * Initialization routine to set the audit log file, process audit masks, * and verbosity levels. */ -void aut_init(char *prefix, unsigned int succ_mask, unsigned int fail_mask, +int +aut_init(char *prefix, unsigned int succ_mask, unsigned int fail_mask, unsigned int flags) { + if (set_kernel_classmap() != 0) { + fprintf(stderr, "Unable to set kernel event->class map.\n"); + return (-1); + } aut_verbose = flags; aut_logfile(prefix); aut_mask(succ_mask, fail_mask); + + return (0); } /* From owner-p4-projects@FreeBSD.ORG Sun Feb 5 00:44:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53ADA16A422; Sun, 5 Feb 2006 00:44:45 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1293216A425 for ; Sun, 5 Feb 2006 00:44:45 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 34CB243D49 for ; Sun, 5 Feb 2006 00:44:44 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k150iihu073713 for ; Sun, 5 Feb 2006 00:44:44 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k150ihLZ073710 for perforce@freebsd.org; Sun, 5 Feb 2006 00:44:43 GMT (envelope-from alc@freebsd.org) Date: Sun, 5 Feb 2006 00:44:43 GMT Message-Id: <200602050044.k150ihLZ073710@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 91136 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2006 00:44:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=91136 Change 91136 by alc@alc_home on 2006/02/05 00:44:25 IFC @91133 Affected files ... .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#3 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/hats/article.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/book.sgml#3 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/chapters.ent#2 integrate .. //depot/projects/superpages/doc/share/sgml/man-refs.ent#5 integrate .. //depot/projects/superpages/src/ObsoleteFiles.inc#5 integrate .. //depot/projects/superpages/src/bin/sh/error.c#2 integrate .. //depot/projects/superpages/src/bin/sh/eval.c#3 integrate .. //depot/projects/superpages/src/bin/sh/expand.c#2 integrate .. //depot/projects/superpages/src/bin/sh/jobs.c#3 integrate .. //depot/projects/superpages/src/bin/sh/main.c#2 integrate .. //depot/projects/superpages/src/bin/sh/miscbltin.c#3 integrate .. //depot/projects/superpages/src/bin/sh/var.c#2 integrate .. //depot/projects/superpages/src/bin/sh/var.h#2 integrate .. //depot/projects/superpages/src/contrib/openbsm/CHANGELOG#2 integrate .. //depot/projects/superpages/src/contrib/openbsm/FREEBSD-upgrade#1 branch .. //depot/projects/superpages/src/contrib/openbsm/VERSION#2 integrate .. //depot/projects/superpages/src/contrib/openbsm/bin/audit/audit.8#2 integrate .. //depot/projects/superpages/src/contrib/openbsm/bin/auditreduce/auditreduce.1#2 integrate .. //depot/projects/superpages/src/contrib/openbsm/bsm/audit_kevents.h#2 integrate .. //depot/projects/superpages/src/contrib/openbsm/etc/audit_class#2 integrate .. //depot/projects/superpages/src/contrib/openbsm/etc/audit_control#2 integrate .. //depot/projects/superpages/src/contrib/openbsm/man/audit.log.5#2 integrate .. //depot/projects/superpages/src/etc/etc.sparc64/ttys#2 integrate .. //depot/projects/superpages/src/include/printf.h#3 integrate .. //depot/projects/superpages/src/lib/libc/stdio/xprintf_time.c#3 integrate .. //depot/projects/superpages/src/lib/libc/stdlib/malloc.c#7 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_mech_switch.c#2 integrate .. //depot/projects/superpages/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#5 integrate .. //depot/projects/superpages/src/release/doc/share/misc/dev.archlist.txt#5 integrate .. //depot/projects/superpages/src/sbin/ifconfig/ifconfig.8#3 integrate .. //depot/projects/superpages/src/sbin/ipfw/ipfw.8#3 integrate .. //depot/projects/superpages/src/share/man/man4/audit.4#2 integrate .. //depot/projects/superpages/src/share/mk/bsd.incs.mk#2 integrate .. //depot/projects/superpages/src/share/mk/bsd.lib.mk#3 integrate .. //depot/projects/superpages/src/share/mk/bsd.prog.mk#3 integrate .. //depot/projects/superpages/src/sys/alpha/linux/syscalls.master#2 integrate .. //depot/projects/superpages/src/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/superpages/src/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/superpages/src/sys/amd64/ia32/ia32_syscall.c#3 integrate .. //depot/projects/superpages/src/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/superpages/src/sys/arm/arm/trap.c#4 integrate .. //depot/projects/superpages/src/sys/arm/arm/undefined.c#3 integrate .. //depot/projects/superpages/src/sys/arm/at91/at91.c#1 branch .. //depot/projects/superpages/src/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/superpages/src/sys/arm/at91/at91_spiio.h#1 branch .. //depot/projects/superpages/src/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/superpages/src/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/superpages/src/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/superpages/src/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/superpages/src/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/superpages/src/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/superpages/src/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/superpages/src/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/superpages/src/sys/arm/at91/at91st.c#1 branch .. //depot/projects/superpages/src/sys/arm/at91/at91var.h#1 branch .. //depot/projects/superpages/src/sys/arm/at91/files.at91rm92#1 branch .. //depot/projects/superpages/src/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/superpages/src/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/superpages/src/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/superpages/src/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/superpages/src/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/superpages/src/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/superpages/src/sys/arm/at91/std.at91rm92#1 branch .. //depot/projects/superpages/src/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/superpages/src/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/superpages/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/superpages/src/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/superpages/src/sys/arm/conf/KB920X#1 branch .. //depot/projects/superpages/src/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/superpages/src/sys/arm/xscale/i80321/i80321_aau.c#3 integrate .. //depot/projects/superpages/src/sys/bsm/audit.h#3 integrate .. //depot/projects/superpages/src/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/superpages/src/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/superpages/src/sys/bsm/audit_record.h#2 integrate .. //depot/projects/superpages/src/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/superpages/src/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/superpages/src/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/superpages/src/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/superpages/src/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/superpages/src/sys/conf/NOTES#8 integrate .. //depot/projects/superpages/src/sys/conf/files#10 integrate .. //depot/projects/superpages/src/sys/conf/files.pc98#3 integrate .. //depot/projects/superpages/src/sys/conf/kmod.mk#6 integrate .. //depot/projects/superpages/src/sys/conf/options#7 integrate .. //depot/projects/superpages/src/sys/dev/advansys/adv_eisa.c#2 integrate .. //depot/projects/superpages/src/sys/dev/advansys/adv_pci.c#3 integrate .. //depot/projects/superpages/src/sys/dev/amr/amr.c#4 integrate .. //depot/projects/superpages/src/sys/dev/amr/amr_pci.c#3 integrate .. //depot/projects/superpages/src/sys/dev/amr/amrvar.h#3 integrate .. //depot/projects/superpages/src/sys/dev/an/if_an.c#4 integrate .. //depot/projects/superpages/src/sys/dev/asr/asr.c#3 integrate .. //depot/projects/superpages/src/sys/dev/asr/i2odep.h#2 integrate .. //depot/projects/superpages/src/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/superpages/src/sys/dev/ce/if_ce.c#3 integrate .. //depot/projects/superpages/src/sys/dev/em/if_em.h#4 integrate .. //depot/projects/superpages/src/sys/dev/ep/if_ep.c#3 integrate .. //depot/projects/superpages/src/sys/dev/ex/if_ex.c#3 integrate .. //depot/projects/superpages/src/sys/dev/firewire/fwcrom.c#2 integrate .. //depot/projects/superpages/src/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/superpages/src/sys/dev/isp/isp.c#3 integrate .. //depot/projects/superpages/src/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/superpages/src/sys/dev/isp/isp_freebsd.h#4 integrate .. //depot/projects/superpages/src/sys/dev/isp/isp_inline.h#3 delete .. //depot/projects/superpages/src/sys/dev/isp/isp_library.c#1 branch .. //depot/projects/superpages/src/sys/dev/isp/isp_library.h#1 branch .. //depot/projects/superpages/src/sys/dev/isp/isp_pci.c#5 integrate .. //depot/projects/superpages/src/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/superpages/src/sys/dev/isp/ispvar.h#3 integrate .. //depot/projects/superpages/src/sys/dev/pccbb/pccbb.c#4 integrate .. //depot/projects/superpages/src/sys/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/superpages/src/sys/dev/sn/if_sn.c#3 integrate .. //depot/projects/superpages/src/sys/dev/uart/uart_bus_ebus.c#3 integrate .. //depot/projects/superpages/src/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/superpages/src/sys/fs/udf/ecma167-udf.h#2 integrate .. //depot/projects/superpages/src/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/superpages/src/sys/fs/udf/udf_vnops.c#3 integrate .. //depot/projects/superpages/src/sys/i386/conf/XBOX#2 integrate .. //depot/projects/superpages/src/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/superpages/src/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/superpages/src/sys/i386/i386/trap.c#5 integrate .. //depot/projects/superpages/src/sys/i386/xbox/xbox.c#2 integrate .. //depot/projects/superpages/src/sys/ia64/conf/SKI#3 integrate .. //depot/projects/superpages/src/sys/kern/init_main.c#3 integrate .. //depot/projects/superpages/src/sys/kern/init_sysent.c#4 integrate .. //depot/projects/superpages/src/sys/kern/kern_acct.c#3 integrate .. //depot/projects/superpages/src/sys/kern/kern_exec.c#6 integrate .. //depot/projects/superpages/src/sys/kern/kern_exit.c#4 integrate .. //depot/projects/superpages/src/sys/kern/kern_fork.c#3 integrate .. //depot/projects/superpages/src/sys/kern/kern_sig.c#4 integrate .. //depot/projects/superpages/src/sys/kern/kern_thread.c#4 integrate .. //depot/projects/superpages/src/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/superpages/src/sys/kern/syscalls.c#4 integrate .. //depot/projects/superpages/src/sys/kern/syscalls.master#4 integrate .. //depot/projects/superpages/src/sys/kern/tty_pty.c#6 integrate .. //depot/projects/superpages/src/sys/kern/vfs_bio.c#8 integrate .. //depot/projects/superpages/src/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/superpages/src/sys/net/if.c#5 integrate .. //depot/projects/superpages/src/sys/net/if.h#3 integrate .. //depot/projects/superpages/src/sys/net/if_bridge.c#8 integrate .. //depot/projects/superpages/src/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/superpages/src/sys/net/if_vlan.c#5 integrate .. //depot/projects/superpages/src/sys/net/pfil.c#2 integrate .. //depot/projects/superpages/src/sys/net/pfil.h#2 integrate .. //depot/projects/superpages/src/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/superpages/src/sys/netinet/ip_dummynet.c#3 integrate .. //depot/projects/superpages/src/sys/netinet/ip_fastfwd.c#3 integrate .. //depot/projects/superpages/src/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/superpages/src/sys/netinet/ip_input.c#4 integrate .. //depot/projects/superpages/src/sys/netinet/ip_output.c#4 integrate .. //depot/projects/superpages/src/sys/netinet6/ip6_forward.c#2 integrate .. //depot/projects/superpages/src/sys/netinet6/ip6_input.c#4 integrate .. //depot/projects/superpages/src/sys/netinet6/ip6_output.c#4 integrate .. //depot/projects/superpages/src/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/superpages/src/sys/pc98/conf/NOTES#5 integrate .. //depot/projects/superpages/src/sys/security/audit/audit.c#1 branch .. //depot/projects/superpages/src/sys/security/audit/audit.h#1 branch .. //depot/projects/superpages/src/sys/security/audit/audit_arg.c#1 branch .. //depot/projects/superpages/src/sys/security/audit/audit_bsm.c#1 branch .. //depot/projects/superpages/src/sys/security/audit/audit_bsm_klib.c#1 branch .. //depot/projects/superpages/src/sys/security/audit/audit_bsm_token.c#1 branch .. //depot/projects/superpages/src/sys/security/audit/audit_private.h#1 branch .. //depot/projects/superpages/src/sys/security/audit/audit_syscalls.c#1 branch .. //depot/projects/superpages/src/sys/security/audit/audit_trigger.c#1 branch .. //depot/projects/superpages/src/sys/sys/proc.h#5 integrate .. //depot/projects/superpages/src/sys/sys/sockio.h#2 integrate .. //depot/projects/superpages/src/sys/sys/syscall.h#4 integrate .. //depot/projects/superpages/src/sys/sys/syscall.mk#4 integrate .. //depot/projects/superpages/src/sys/sys/sysproto.h#4 integrate .. //depot/projects/superpages/src/sys/vm/vm_fault.c#7 integrate .. //depot/projects/superpages/src/sys/vm/vm_pageout.c#11 integrate .. //depot/projects/superpages/src/tools/tools/tinderbox/etc/releng_6.rc#3 integrate .. //depot/projects/superpages/src/usr.bin/login/Makefile#2 integrate .. //depot/projects/superpages/src/usr.bin/login/login.1#2 integrate .. //depot/projects/superpages/src/usr.bin/login/login.c#2 integrate .. //depot/projects/superpages/src/usr.bin/login/login.h#2 integrate .. //depot/projects/superpages/src/usr.bin/login/login_audit.c#1 branch .. //depot/projects/superpages/src/usr.sbin/Makefile#6 integrate .. //depot/projects/superpages/src/usr.sbin/audit/Makefile#1 branch .. //depot/projects/superpages/src/usr.sbin/auditd/Makefile#1 branch .. //depot/projects/superpages/src/usr.sbin/auditreduce/Makefile#1 branch .. //depot/projects/superpages/src/usr.sbin/config/configvers.h#3 integrate .. //depot/projects/superpages/src/usr.sbin/config/mkmakefile.c#4 integrate .. //depot/projects/superpages/src/usr.sbin/inetd/inetd.8#3 integrate .. //depot/projects/superpages/src/usr.sbin/mergemaster/mergemaster.8#2 integrate .. //depot/projects/superpages/src/usr.sbin/mergemaster/mergemaster.sh#3 integrate .. //depot/projects/superpages/src/usr.sbin/praudit/Makefile#1 branch .. //depot/projects/superpages/www/en/developers.sgml#6 integrate .. //depot/projects/superpages/www/en/docproj/todo.sgml#2 integrate .. //depot/projects/superpages/www/en/docs/books.sgml#5 integrate .. //depot/projects/superpages/www/en/donations/wantlist.sgml#10 integrate .. //depot/projects/superpages/www/en/projects/ideas/index.sgml#3 integrate .. //depot/projects/superpages/www/en/releng/index.sgml#5 integrate .. //depot/projects/superpages/www/en/snapshots/index.sgml#4 integrate .. //depot/projects/superpages/www/fr/community/mailinglists.sgml#3 integrate .. //depot/projects/superpages/www/fr/events/Makefile#2 integrate .. //depot/projects/superpages/www/fr/events/events.xsl#3 integrate .. //depot/projects/superpages/www/fr/gnome/includes.sgml#4 integrate .. //depot/projects/superpages/www/fr/gnome/includes.xsl#3 integrate .. //depot/projects/superpages/www/fr/gnome/index.xsl#4 integrate .. //depot/projects/superpages/www/fr/gnome/newsflash.xsl#4 integrate .. //depot/projects/superpages/www/fr/includes.xsl#5 integrate .. //depot/projects/superpages/www/fr/news/oldnewsflash.xsl#2 integrate .. //depot/projects/superpages/www/fr/news/status/status.sgml#4 integrate .. //depot/projects/superpages/www/fr/platforms/ia64/index.xsl#3 integrate .. //depot/projects/superpages/www/fr/platforms/ia64/todo.xsl#3 integrate .. //depot/projects/superpages/www/fr/platforms/ppc.sgml#4 integrate .. //depot/projects/superpages/www/fr/projects/newbies.sgml#4 integrate .. //depot/projects/superpages/www/fr/relnotes.sgml#4 integrate Differences ... ==== //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#3 (text+ko) ==== @@ -1,7 +1,11 @@ - + + &a.niklas; (2004 - 2006) + + + &a.paul; (1993 - 2005) ==== //depot/projects/superpages/doc/en_US.ISO8859-1/articles/hats/article.sgml#2 (text+ko) ==== @@ -15,7 +15,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/hats/article.sgml,v 1.8 2004/08/08 13:43:55 hrs Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/hats/article.sgml,v 1.9 2006/02/04 22:31:33 ceri Exp $ 2002 @@ -79,11 +79,11 @@ Hats are answerable to core. If they are doing good jobs, core will leave them alone. If they are doing a bad job, core has the option to remove them. Hats are expected to work with core if - core has issues with their performance of their duties They serve + core has issues with their performance of their duties. They serve at the pleasure of core. Core sometimes will impose additional, specific requirements - for a given hat that does not apply to all hats. These conditions + for a given hat that do not apply to all hats. These conditions may change over time. Committers and others working with hats are expected to use ==== //depot/projects/superpages/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#2 (text+ko) ==== @@ -23,7 +23,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/p4-primer/article.sgml,v 1.1 2005/11/24 20:03:47 blackend Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/p4-primer/article.sgml,v 1.2 2006/02/04 11:10:40 brueffer Exp $ &tm-attrib.freebsd; @@ -477,8 +477,8 @@ MFP4 after: It is good practice to provide at least 2-3 sentences that - describe what the changes are that you are submitting. You say - should what the change does, why it was done that way or what + describe what the changes are that you are submitting. You should + say what the change does, why it was done that way or what problem is solves, and what APIs it might change or other side effects it might have. This text should replace the <enter description here> line in the template. ==== //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#2 (text+ko) ==== @@ -1,17 +1,9 @@ - - - + %pgpkeys; ]> @@ -70,6 +71,7 @@ 2003 2004 2005 + 2006 The FreeBSD Documentation Project @@ -261,6 +263,7 @@ + ==== //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/chapters.ent#2 (text+ko) ==== @@ -6,7 +6,7 @@ Chapters should be listed in the order in which they are referenced. - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/chapters.ent,v 1.32 2005/08/06 03:22:18 trhodes Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/chapters.ent,v 1.33 2006/02/03 20:25:59 brueffer Exp $ --> @@ -31,6 +31,7 @@ + ==== //depot/projects/superpages/doc/share/sgml/man-refs.ent#5 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.365 2005/12/31 16:46:44 brueffer Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.367 2006/02/04 21:43:38 brueffer Exp $ --> @@ -46,6 +46,7 @@ + @@ -493,6 +494,7 @@ + @@ -1208,6 +1210,12 @@ + + + + + + @@ -2088,6 +2096,7 @@ + @@ -3243,6 +3252,7 @@ + @@ -3700,6 +3710,12 @@ + + + + + + @@ -3975,6 +3991,8 @@ + + @@ -4990,6 +5008,7 @@ + ==== //depot/projects/superpages/src/ObsoleteFiles.inc#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.26 2006/01/18 18:48:42 netchild Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.27 2006/02/04 08:07:00 avatar Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -297,10 +297,11 @@ # 200308XX OLD_FILES+=usr/sbin/amldb OLD_FILES+=usr/share/man/man8/amldb.8.gz +# 200307XX +OLD_FILES+=sbin/mount_nwfs +OLD_FILES+=sbin/mount_portalfs +OLD_FILES+=sbin/mount_smbfs # 200306XX -OLD_FILES+=bin/mount_nwfs -OLD_FILES+=bin/mount_portalfs -OLD_FILES+=bin/mount_smbfs OLD_FILES+=usr/sbin/dev_mkdb OLD_FILES+=usr/share/man/man8/dev_mkdb.8.gz # 200304XX ==== //depot/projects/superpages/src/bin/sh/error.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.25 2004/04/06 20:06:51 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.26 2006/02/04 14:37:50 schweikh Exp $"); /* * Errors and exceptions. @@ -118,7 +118,7 @@ * This doesn't seem to be needed, since main() emits a newline. */ #if 0 - if (tcgetpgrp(0) == getpid()) + if (tcgetpgrp(0) == getpid()) write(STDERR_FILENO, "\n", 1); #endif if (rootshell && iflag) ==== //depot/projects/superpages/src/bin/sh/eval.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.49 2005/12/04 18:44:21 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.50 2006/02/04 14:37:50 schweikh Exp $"); #include #include @@ -671,15 +671,15 @@ for (sp = varlist.list ; sp ; sp = sp->next) if (strncmp(sp->text, PATH, sizeof(PATH) - 1) == 0) { path = sp->text + sizeof(PATH) - 1; - /* + /* * On `PATH=... command`, we need to make * sure that the command isn't using the * non-updated hash table of the outer PATH - * setting and we need to make sure that + * setting and we need to make sure that * the hash table isn't filled with items * from the temporary setting. * - * It would be better to forbit using and + * It would be better to forbit using and * updating the table while this command * runs, by the command finding mechanism * is heavily integrated with hash handling, ==== //depot/projects/superpages/src/bin/sh/expand.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.48 2005/09/06 19:30:00 rse Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.49 2006/02/04 14:37:50 schweikh Exp $"); #include #include @@ -100,7 +100,7 @@ STATIC int varisset(char *, int); STATIC void varvalue(char *, int, int); STATIC void recordregion(int, int, int); -STATIC void removerecordregions(int); +STATIC void removerecordregions(int); STATIC void ifsbreakup(char *, struct arglist *); STATIC void expandmeta(struct strlist *, int); STATIC void expmeta(char *, char *); @@ -309,7 +309,7 @@ } -STATIC void +STATIC void removerecordregions(int endoff) { if (ifslastp == NULL) @@ -332,7 +332,7 @@ } return; } - + ifslastp = &ifsfirst; while (ifslastp->next && ifslastp->next->begoff < endoff) ifslastp=ifslastp->next; @@ -576,7 +576,7 @@ } loc--; if ((varflags & VSQUOTE) && loc > startp && - *(loc - 1) == CTLESC) { + *(loc - 1) == CTLESC) { for (q = startp; q < loc; q++) if (*q == CTLESC) q++; @@ -750,9 +750,9 @@ if (!set) { if (subevalvar(p, var, 0, subtype, startloc, varflags)) { varflags &= ~VSNUL; - /* - * Remove any recorded regions beyond - * start of variable + /* + * Remove any recorded regions beyond + * start of variable */ removerecordregions(startloc); goto again; @@ -972,7 +972,7 @@ do { p = string + ifsp->begoff; nulonly = ifsp->nulonly; - ifs = nulonly ? nullstr : + ifs = nulonly ? nullstr : ( ifsset() ? ifsval() : " \t\n" ); ifsspc = 0; while (p < string + ifsp->endoff) { ==== //depot/projects/superpages/src/bin/sh/jobs.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.70 2005/12/14 17:26:29 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.71 2006/02/04 14:37:50 schweikh Exp $"); #include #include @@ -353,7 +353,7 @@ WEXITSTATUS(ps->status)); } else { #if JOBS - if (WIFSTOPPED(ps->status)) + if (WIFSTOPPED(ps->status)) i = WSTOPSIG(ps->status); else #endif @@ -787,7 +787,7 @@ ! fd0_redirected_p ()) { close(0); if (open(_PATH_DEVNULL, O_RDONLY) != 0) - error("Can't open %s: %s", + error("Can't open %s: %s", _PATH_DEVNULL, strerror(errno)); } } ==== //depot/projects/superpages/src/bin/sh/main.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.26 2004/04/06 20:06:51 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.27 2006/02/04 14:47:19 schweikh Exp $"); #include #include @@ -155,6 +155,8 @@ procargs(argc, argv); if (getpwd() == NULL && iflag) out2str("sh: cannot determine working directory\n"); + if (getpwd() != NULL) + setvar ("PWD", getpwd(), VEXPORT); if (argv[0] && argv[0][0] == '-') { state = 1; read_profile("/etc/profile"); ==== //depot/projects/superpages/src/bin/sh/miscbltin.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/miscbltin.c,v 1.34 2005/10/28 10:45:19 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/miscbltin.c,v 1.35 2006/02/04 14:37:50 schweikh Exp $"); /* * Miscellaneous builtins. @@ -401,7 +401,7 @@ } } if (all) { - for (l = limits; l->name; l++) { + for (l = limits; l->name; l++) { char optbuf[40]; if (getrlimit(l->cmd, &limit) < 0) error("can't get limit: %s", strerror(errno)); ==== //depot/projects/superpages/src/bin/sh/var.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.29 2005/09/09 21:03:34 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.30 2006/02/04 14:38:37 schweikh Exp $"); #include #include @@ -124,7 +124,7 @@ STATIC int localevar(char *); /* - * Initialize the varable symbol tables and import the environment + * Initialize the variable symbol tables and import the environment. */ #ifdef mkinit @@ -208,7 +208,7 @@ } /* - * Set the value of a variable. The flags argument is tored with the + * Set the value of a variable. The flags argument is stored with the * flags of the variable. If val is NULL, the variable is unset. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Feb 5 01:11:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09B3916A423; Sun, 5 Feb 2006 01:11:20 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BF07D16A420 for ; Sun, 5 Feb 2006 01:11:19 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 634AB43D46 for ; Sun, 5 Feb 2006 01:11:19 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k151BJbJ082074 for ; Sun, 5 Feb 2006 01:11:19 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k151BIa0082071 for perforce@freebsd.org; Sun, 5 Feb 2006 01:11:18 GMT (envelope-from imp@freebsd.org) Date: Sun, 5 Feb 2006 01:11:18 GMT Message-Id: <200602050111.k151BIa0082071@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91139 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2006 01:11:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=91139 Change 91139 by imp@imp_harmony on 2006/02/05 01:11:13 IFC @91137 (loopback atmel changes) Affected files ... .. //depot/projects/arm/src/sys/alpha/linux/syscalls.master#4 integrate .. //depot/projects/arm/src/sys/amd64/amd64/trap.c#6 integrate .. //depot/projects/arm/src/sys/amd64/ia32/ia32_syscall.c#3 integrate .. //depot/projects/arm/src/sys/arm/arm/trap.c#6 integrate .. //depot/projects/arm/src/sys/arm/at91/at91st.c#5 branch .. //depot/projects/arm/src/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/arm/src/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/arm/src/sys/arm/xscale/i80321/i80321_aau.c#3 integrate .. //depot/projects/arm/src/sys/bsm/audit.h#3 integrate .. //depot/projects/arm/src/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/arm/src/sys/bsm/audit_kevents.h#4 integrate .. //depot/projects/arm/src/sys/bsm/audit_record.h#2 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/arm/src/sys/conf/NOTES#15 integrate .. //depot/projects/arm/src/sys/conf/files#16 integrate .. //depot/projects/arm/src/sys/conf/files.pc98#5 integrate .. //depot/projects/arm/src/sys/conf/kmod.mk#5 integrate .. //depot/projects/arm/src/sys/conf/options#14 integrate .. //depot/projects/arm/src/sys/dev/advansys/adv_eisa.c#3 integrate .. //depot/projects/arm/src/sys/dev/advansys/adv_pci.c#5 integrate .. //depot/projects/arm/src/sys/dev/amr/amr.c#8 integrate .. //depot/projects/arm/src/sys/dev/amr/amr_pci.c#5 integrate .. //depot/projects/arm/src/sys/dev/amr/amrvar.h#4 integrate .. //depot/projects/arm/src/sys/dev/an/if_an.c#4 integrate .. //depot/projects/arm/src/sys/dev/asr/asr.c#5 integrate .. //depot/projects/arm/src/sys/dev/asr/i2odep.h#2 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bge.c#10 integrate .. //depot/projects/arm/src/sys/dev/ce/if_ce.c#3 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.h#5 integrate .. //depot/projects/arm/src/sys/dev/ep/if_ep.c#3 integrate .. //depot/projects/arm/src/sys/dev/ex/if_ex.c#3 integrate .. //depot/projects/arm/src/sys/dev/firewire/fwcrom.c#2 integrate .. //depot/projects/arm/src/sys/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/arm/src/sys/dev/isp/isp.c#4 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.h#5 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_inline.h#4 delete .. //depot/projects/arm/src/sys/dev/isp/isp_library.c#1 branch .. //depot/projects/arm/src/sys/dev/isp/isp_library.h#1 branch .. //depot/projects/arm/src/sys/dev/isp/isp_pci.c#6 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/arm/src/sys/dev/isp/ispvar.h#6 integrate .. //depot/projects/arm/src/sys/dev/pccbb/pccbb.c#5 integrate .. //depot/projects/arm/src/sys/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/arm/src/sys/dev/sn/if_sn.c#4 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_bus_ebus.c#3 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_sparc64.c#4 integrate .. //depot/projects/arm/src/sys/fs/udf/ecma167-udf.h#3 integrate .. //depot/projects/arm/src/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/arm/src/sys/fs/udf/udf_vnops.c#6 integrate .. //depot/projects/arm/src/sys/i386/conf/XBOX#3 integrate .. //depot/projects/arm/src/sys/i386/i386/identcpu.c#8 integrate .. //depot/projects/arm/src/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/arm/src/sys/i386/i386/trap.c#5 integrate .. //depot/projects/arm/src/sys/i386/xbox/xbox.c#2 integrate .. //depot/projects/arm/src/sys/ia64/conf/SKI#3 integrate .. //depot/projects/arm/src/sys/kern/init_main.c#3 integrate .. //depot/projects/arm/src/sys/kern/init_sysent.c#7 integrate .. //depot/projects/arm/src/sys/kern/kern_acct.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_exec.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_exit.c#7 integrate .. //depot/projects/arm/src/sys/kern/kern_fork.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_sig.c#7 integrate .. //depot/projects/arm/src/sys/kern/kern_thread.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_umtx.c#4 integrate .. //depot/projects/arm/src/sys/kern/syscalls.c#7 integrate .. //depot/projects/arm/src/sys/kern/syscalls.master#8 integrate .. //depot/projects/arm/src/sys/kern/tty_pty.c#7 integrate .. //depot/projects/arm/src/sys/kern/vfs_bio.c#7 integrate .. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#8 integrate .. //depot/projects/arm/src/sys/net/if.c#7 integrate .. //depot/projects/arm/src/sys/net/if.h#5 integrate .. //depot/projects/arm/src/sys/net/if_bridge.c#9 integrate .. //depot/projects/arm/src/sys/net/if_ethersubr.c#10 integrate .. //depot/projects/arm/src/sys/net/if_vlan.c#6 integrate .. //depot/projects/arm/src/sys/net/pfil.c#3 integrate .. //depot/projects/arm/src/sys/net/pfil.h#2 integrate .. //depot/projects/arm/src/sys/netinet/in_pcb.c#5 integrate .. //depot/projects/arm/src/sys/netinet/ip_dummynet.c#5 integrate .. //depot/projects/arm/src/sys/netinet/ip_fastfwd.c#5 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw2.c#8 integrate .. //depot/projects/arm/src/sys/netinet/ip_input.c#9 integrate .. //depot/projects/arm/src/sys/netinet/ip_output.c#8 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_forward.c#3 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_input.c#5 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_output.c#5 integrate .. //depot/projects/arm/src/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/arm/src/sys/pc98/conf/NOTES#7 integrate .. //depot/projects/arm/src/sys/security/audit/audit.c#1 branch .. //depot/projects/arm/src/sys/security/audit/audit.h#1 branch .. //depot/projects/arm/src/sys/security/audit/audit_arg.c#1 branch .. //depot/projects/arm/src/sys/security/audit/audit_bsm.c#1 branch .. //depot/projects/arm/src/sys/security/audit/audit_bsm_klib.c#1 branch .. //depot/projects/arm/src/sys/security/audit/audit_bsm_token.c#1 branch .. //depot/projects/arm/src/sys/security/audit/audit_private.h#1 branch .. //depot/projects/arm/src/sys/security/audit/audit_syscalls.c#1 branch .. //depot/projects/arm/src/sys/security/audit/audit_trigger.c#1 branch .. //depot/projects/arm/src/sys/sys/proc.h#6 integrate .. //depot/projects/arm/src/sys/sys/sockio.h#3 integrate .. //depot/projects/arm/src/sys/sys/syscall.h#7 integrate .. //depot/projects/arm/src/sys/sys/syscall.mk#7 integrate .. //depot/projects/arm/src/sys/sys/sysproto.h#7 integrate .. //depot/projects/arm/src/sys/vm/vm_fault.c#7 integrate .. //depot/projects/arm/src/sys/vm/vm_pageout.c#5 integrate .. //depot/projects/arm/src/usr.sbin/config/configvers.h#4 integrate .. //depot/projects/arm/src/usr.sbin/config/mkmakefile.c#4 integrate Differences ... ==== //depot/projects/arm/src/sys/alpha/linux/syscalls.master#4 (text+ko) ==== @@ -1,10 +1,10 @@ - $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.64 2005/07/13 20:32:41 jhb Exp $ + $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.65 2006/02/04 14:03:22 rwatson Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ; Processed to created linux_sysent.c, linux_syscalls.c and linux_syscall.h. -; Columns: number type nargs name alt{name,tag,rtyp}/comments +; Columns: number audit type nargs name alt{name,tag,rtyp}/comments ; number system call number, must be in order ; audit the audit event associated with the system call ; A value of AUE_NULL means no auditing, but it also means that @@ -46,212 +46,213 @@ ; #ifdef's, etc. may be included, and are copied to the output files. 0 AUE_NULL UNIMPL -1 AUE_NULL MNOPROTO { void sys_exit(int rval); } exit \ +1 AUE_EXIT MNOPROTO { void sys_exit(int rval); } exit \ sys_exit_args void -2 AUE_NULL MSTD { int linux_fork(void); } -3 AUE_NULL MNOPROTO { int read(int fd, char *buf, \ +2 AUE_FORK MSTD { int linux_fork(void); } +3 AUE_READ MNOPROTO { int read(int fd, char *buf, \ u_int nbyte); } -4 AUE_NULL MNOPROTO { int write(int fd, char *buf, \ +4 AUE_WRITE MNOPROTO { int write(int fd, char *buf, \ u_int nbyte); } 5 AUE_NULL UNIMPL -6 AUE_NULL MNOPROTO { int close(int fd); } -7 AUE_NULL MSTD { int osf1_wait4(int pid, int *status, \ +6 AUE_CLOSE MNOPROTO { int close(int fd); } +7 AUE_WAIT4 MSTD { int osf1_wait4(int pid, int *status, \ int options, \ struct osf1_rusage *rusage); } 8 AUE_NULL UNIMPL -9 AUE_NULL MSTD { int linux_link(char *path, char *to); } -10 AUE_NULL MSTD { int linux_unlink(char *path); } +9 AUE_LINK MSTD { int linux_link(char *path, char *to); } +10 AUE_UNLINK MSTD { int linux_unlink(char *path); } 11 AUE_NULL UNIMPL -12 AUE_NULL MSTD { int linux_chdir(char *path); } -13 AUE_NULL MNOPROTO { int fchdir(int fd); } -14 AUE_NULL MSTD { int linux_mknod(char *path, l_int mode, \ +12 AUE_CHDIR MSTD { int linux_chdir(char *path); } +13 AUE_FCHDIR MNOPROTO { int fchdir(int fd); } +14 AUE_MKNOD MSTD { int linux_mknod(char *path, l_int mode, \ l_dev_t dev); } -15 AUE_NULL MSTD { int linux_chmod(char *path, \ +15 AUE_CHMOD MSTD { int linux_chmod(char *path, \ l_mode_t mode); } -16 AUE_NULL MSTD { int linux_chown(char *path, l_uid_t uid, \ +16 AUE_CHOWN MSTD { int linux_chown(char *path, l_uid_t uid, \ l_gid_t gid); } 17 AUE_NULL STD { int linux_brk(l_ulong dsend); } 18 AUE_NULL UNIMPL -19 AUE_NULL MSTD { int linux_lseek(l_uint fdes, l_off_t off, \ +19 AUE_LSEEK MSTD { int linux_lseek(l_uint fdes, l_off_t off, \ l_int whence); } -20 AUE_NULL MNOPROTO { int getpid(void); } -21 AUE_NULL UNIMPL osf1_mount -22 AUE_NULL STD { int linux_umount(char *path, l_int flags); } -23 AUE_NULL MNOPROTO { int setuid(uid_t uid); } -24 AUE_NULL MNOPROTO { int getuid(void); } +20 AUE_GETPID MNOPROTO { int getpid(void); } +21 AUE_MOUNT UNIMPL osf1_mount +22 AUE_UNMOUNT STD { int linux_umount(char *path, l_int flags); } +23 AUE_SETUID MNOPROTO { int setuid(uid_t uid); } +24 AUE_GETUID MNOPROTO { int getuid(void); } 25 AUE_NULL UNIMPL -26 AUE_NULL MSTD { int linux_ptrace(void); } +26 AUE_PTRACE MSTD { int linux_ptrace(void); } 27 AUE_NULL UNIMPL 28 AUE_NULL UNIMPL 29 AUE_NULL UNIMPL 30 AUE_NULL UNIMPL 31 AUE_NULL UNIMPL 32 AUE_NULL UNIMPL -33 AUE_NULL MSTD { int linux_access(char *path, l_int flags); } +33 AUE_ACCESS MSTD { int linux_access(char *path, l_int flags); } 34 AUE_NULL UNIMPL 35 AUE_NULL UNIMPL -36 AUE_NULL MNOPROTO { int sync(void); } -37 AUE_NULL MSTD { int linux_kill(l_int pid, l_int signum); } +36 AUE_SYNC MNOPROTO { int sync(void); } +37 AUE_KILL MSTD { int linux_kill(l_int pid, l_int signum); } 38 AUE_NULL UNIMPL -39 AUE_NULL MNOPROTO { int setpgid(int pid, int pgid); } +39 AUE_SETPGRP MNOPROTO { int setpgid(int pid, int pgid); } 40 AUE_NULL UNIMPL -41 AUE_NULL MNOPROTO { int dup(u_int fd); } -42 AUE_NULL MNOPROTO { int pipe(void); } +41 AUE_DUP MNOPROTO { int dup(u_int fd); } +42 AUE_PIPE MNOPROTO { int pipe(void); } 43 AUE_NULL UNIMPL osf_set_program_attributes 44 AUE_NULL UNIMPL -45 AUE_NULL MSTD { int linux_open(char *path, l_int flags, \ +45 AUE_OPEN_RWTC MSTD { int linux_open(char *path, l_int flags, \ l_int mode); } 46 AUE_NULL UNIMPL -47 AUE_NULL MNOPROTO { int getgid(void); } -48 AUE_NULL MSTD { int osf1_sigprocmask(int how, \ +47 AUE_GETGID MNOPROTO { int getgid(void); } +48 AUE_SIGPROCMASK MSTD { int osf1_sigprocmask(int how, \ u_long mask); } 49 AUE_NULL UNIMPL 50 AUE_NULL UNIMPL -51 AUE_NULL MNOPROTO { int acct(char *path); } -52 AUE_NULL MSTD { int linux_sigpending(void); } +51 AUE_ACCT MNOPROTO { int acct(char *path); } +52 AUE_SIGPENDING MSTD { int linux_sigpending(void); } 53 AUE_NULL UNIMPL -54 AUE_NULL STD { int linux_ioctl(l_uint fd, l_uint cmd, \ +54 AUE_IOCTL STD { int linux_ioctl(l_uint fd, l_uint cmd, \ l_ulong arg); } 55 AUE_NULL UNIMPL 56 AUE_NULL UNIMPL -57 AUE_NULL MSTD { int linux_symlink(char *path, char *to); } -58 AUE_NULL MSTD { int linux_readlink(char *name, char *buf, \ +57 AUE_SYMLINK MSTD { int linux_symlink(char *path, char *to); } +58 AUE_READLINK MSTD { int linux_readlink(char *name, char *buf, \ l_int count); } -59 AUE_NULL MSTD { int linux_execve(char *path, char **argp, \ +59 AUE_EXECVE MSTD { int linux_execve(char *path, char **argp, \ char **envp); } -60 AUE_NULL MNOPROTO { int umask(int newmask); } -61 AUE_NULL MNOPROTO { int chroot(char *path); } +60 AUE_UMASK MNOPROTO { int umask(int newmask); } +61 AUE_CHROOT MNOPROTO { int chroot(char *path); } 62 AUE_NULL UNIMPL -63 AUE_NULL MNOPROTO { int getpgrp(void); } -64 AUE_NULL MSTD { int linux_getpagesize(void); } +63 AUE_GETPGRP MNOPROTO { int getpgrp(void); } +64 AUE_O_GETPAGESIZE MSTD { int linux_getpagesize(void); } 65 AUE_NULL UNIMPL -66 AUE_NULL MSTD { int linux_vfork(void); } -67 AUE_NULL MSTD { int linux_newstat(char *path, \ +66 AUE_VFORK MSTD { int linux_vfork(void); } +67 AUE_STAT MSTD { int linux_newstat(char *path, \ struct l_newstat *buf); } -68 AUE_NULL MSTD { int linux_newlstat(char *path, \ +68 AUE_LSTAT MSTD { int linux_newlstat(char *path, \ struct l_newstat *buf); } 69 AUE_NULL UNIMPL 70 AUE_NULL UNIMPL -71 AUE_NULL MSTD { int linux_mmap(l_ulong addr, l_ulong len, \ +71 AUE_MMAP MSTD { int linux_mmap(l_ulong addr, l_ulong len, \ l_ulong prot, l_ulong flags, l_ulong fd, \ l_ulong pos); } 72 AUE_NULL UNIMPL -73 AUE_NULL MSTD { int linux_munmap(l_ulong addr, \ +73 AUE_MUNMAP MSTD { int linux_munmap(l_ulong addr, \ l_size_t len); } -74 AUE_NULL MSTD { int linux_mprotect(l_ulong addr, \ +74 AUE_MPROTECT MSTD { int linux_mprotect(l_ulong addr, \ l_size_t len, l_ulong prot); } -75 AUE_NULL MNOPROTO { int madvise(void *addr, \ +75 AUE_MADVISE MNOPROTO { int madvise(void *addr, \ size_t len, int behav); } -76 AUE_NULL MSTD { int linux_vhangup(void); } +76 AUE_O_VHANGUP MSTD { int linux_vhangup(void); } 77 AUE_NULL UNIMPL 78 AUE_NULL UNIMPL -79 AUE_NULL MSTD { int linux_setgroups(l_int gidsetsize, \ +79 AUE_SETGROUPS MSTD { int linux_setgroups(l_int gidsetsize, \ l_gid_t *grouplist); } -80 AUE_NULL MSTD { int linux_getgroups(l_int gidsetsize, \ +80 AUE_GETGROUPS MSTD { int linux_getgroups(l_int gidsetsize, \ l_gid_t *grouplist); } 81 AUE_NULL UNIMPL -82 AUE_NULL MNODEF setpgid setpgid setpgid_args int -83 AUE_NULL MSTD { int osf1_setitimer(u_int which, \ +82 AUE_SETPGRP MNODEF setpgid setpgid setpgid_args int +83 AUE_SETITIMER MSTD { int osf1_setitimer(u_int which, \ struct itimerval *itv, \ struct itimerval *oitv); } 84 AUE_NULL UNIMPL 85 AUE_NULL UNIMPL -86 AUE_NULL UNIMPL osf_getitimer -87 AUE_NULL MSTD { int linux_gethostname(void); } -88 AUE_NULL MNOPROTO { int osethostname(char *hostname, \ +86 AUE_GETITIMER UNIMPL osf_getitimer +87 AUE_SYSCTL MSTD { int linux_gethostname(void); } +88 AUE_SYSCTL MNOPROTO { int osethostname(char *hostname, \ u_int len); } osethostname \ sethostname_args int -89 AUE_NULL MSTD { int linux_getdtablesize(void); } -90 AUE_NULL MNOPROTO { int dup2(u_int from, u_int to); } -91 AUE_NULL MSTD { int linux_newfstat(l_uint fd, \ +89 AUE_GETDTABLESIZE MSTD { int linux_getdtablesize(void); } +90 AUE_DUP2 MNOPROTO { int dup2(u_int from, u_int to); } +91 AUE_FSTAT MSTD { int linux_newfstat(l_uint fd, \ struct l_newstat *buf); } -92 AUE_NULL MSTD { int linux_fcntl(l_uint fd, l_uint cmd, \ +92 AUE_FCNTL MSTD { int linux_fcntl(l_uint fd, l_uint cmd, \ l_ulong arg); } -93 AUE_NULL MSTD { int osf1_select(u_int nd, fd_set *in, \ +93 AUE_SELECT MSTD { int osf1_select(u_int nd, fd_set *in, \ fd_set *ou, fd_set *ex, \ struct timeval *tv); } -94 AUE_NULL MNOPROTO { int poll(struct pollfd*, unsigned int \ +94 AUE_POLL MNOPROTO { int poll(struct pollfd*, unsigned int \ nfds, long timeout); } -95 AUE_NULL MNOPROTO { int fsync(int fd); } -96 AUE_NULL MNOPROTO { int setpriority(int which, \ +95 AUE_FSYNC MNOPROTO { int fsync(int fd); } +96 AUE_SETPRIORITY MNOPROTO { int setpriority(int which, \ int who, int prio); } -97 AUE_NULL MSTD { int osf1_socket(int domain, int type, \ +97 AUE_SOCKET MSTD { int osf1_socket(int domain, int type, \ int protocol); } -98 AUE_NULL MSTD { int linux_connect(l_int s, \ +98 AUE_CONNECT MSTD { int linux_connect(l_int s, \ struct l_sockaddr *name, l_int namelen); } -99 AUE_NULL MNOPROTO { int oaccept(int s, caddr_t name, \ +99 AUE_ACCEPT MNOPROTO { int oaccept(int s, caddr_t name, \ int *anamelen); } accept accept_args int -100 AUE_NULL MSTD { int linux_getpriority(int which, int who); } -101 AUE_NULL MNOPROTO { int osend(int s, caddr_t buf, int len, \ +100 AUE_GETPRIORITY MSTD { int linux_getpriority(int which, int who); } +101 AUE_SEND MNOPROTO { int osend(int s, caddr_t buf, int len, \ int flags); } -102 AUE_NULL MNOPROTO { int orecv(int s, caddr_t buf, int len, \ +102 AUE_RECV MNOPROTO { int orecv(int s, caddr_t buf, int len, \ int flags); } 103 AUE_NULL MSTD { int osf1_sigreturn( \ struct osigcontext *sigcntxp); } -104 AUE_NULL MNOPROTO { int bind(int s, caddr_t name, \ +104 AUE_BIND MNOPROTO { int bind(int s, caddr_t name, \ int namelen); } -105 AUE_NULL MNOPROTO { int setsockopt(int s, int level, int name, \ +105 AUE_SETSOCKOPT MNOPROTO { int setsockopt(int s, int level, int name, \ caddr_t val, int valsize); } -106 AUE_NULL MNOPROTO { int listen(int s, int backlog); } +106 AUE_LISTEN MNOPROTO { int listen(int s, int backlog); } 107 AUE_NULL UNIMPL 108 AUE_NULL UNIMPL 109 AUE_NULL UNIMPL 110 AUE_NULL UNIMPL 111 AUE_NULL MSTD { int osf1_sigsuspend(unsigned long ss); } 112 AUE_NULL UNIMPL osf_sigstack -113 AUE_NULL MSTD { int linux_recvmsg(void); } -114 AUE_NULL MSTD { int linux_sendmsg(void); } +113 AUE_RECVMSG MSTD { int linux_recvmsg(void); } +114 AUE_SENDMSG MSTD { int linux_sendmsg(void); } 115 AUE_NULL UNIMPL -116 AUE_NULL MSTD { int osf1_gettimeofday(struct timeval *tp, \ +116 AUE_NULL MSTD { int osf1_gettimeofday( \ + struct timeval *tp, \ struct timezone *tzp); } -117 AUE_NULL MSTD { int osf1_getrusage(long who, \ +117 AUE_GETRUSAGE MSTD { int osf1_getrusage(long who, \ void *rusage); } -118 AUE_NULL MNOPROTO { int getsockopt(int s, int level, int name, \ +118 AUE_GETSOCKOPT MNOPROTO { int getsockopt(int s, int level, int name, \ caddr_t val, int *avalsize); } 119 AUE_NULL UNIMPL -120 AUE_NULL MNOPROTO { int readv(int fd, struct iovec *iovp, \ +120 AUE_READV MNOPROTO { int readv(int fd, struct iovec *iovp, \ u_int iovcnt); } -121 AUE_NULL MNOPROTO { int writev(int fd, struct iovec *iovp, \ +121 AUE_WRITEV MNOPROTO { int writev(int fd, struct iovec *iovp, \ u_int iovcnt); } -122 AUE_NULL UNIMPL osf_settimeofday -123 AUE_NULL MNOPROTO { int fchown(int fd, int uid, int gid); } -124 AUE_NULL MNOPROTO { int fchmod(int fd, int mode); } -125 AUE_NULL MNOPROTO { int orecvfrom(int s, caddr_t buf, \ +122 AUE_SETTIMEOFDAY UNIMPL osf_settimeofday +123 AUE_FCHOWN NOPROTO { int fchown(int fd, int uid, int gid); } +124 AUE_FCHMOD NOPROTO { int fchmod(int fd, int mode); } +125 AUE_RECVFROM NOPROTO { int orecvfrom(int s, caddr_t buf, \ size_t len, int flags, caddr_t from, \ int *fromlenaddr); } recvfrom \ recvfrom_args int -126 AUE_NULL MNOPROTO { int setreuid(int ruid, int euid); } -127 AUE_NULL MNOPROTO { int setregid(int rgid, int egid); } -128 AUE_NULL MSTD { int linux_rename(char *from, char *to); } -129 AUE_NULL MSTD { int linux_truncate(char *path, \ +126 AUE_SETREUID MNOPROTO { int setreuid(int ruid, int euid); } +127 AUE_SETREGID MNOPROTO { int setregid(int rgid, int egid); } +128 AUE_RENAME MSTD { int linux_rename(char *from, char *to); } +129 AUE_TRUNCATE MSTD { int linux_truncate(char *path, \ l_ulong length); } -130 AUE_NULL MNOPROTO { int oftruncate(int fd, long length); } -131 AUE_NULL MNOPROTO { int flock(int fd, int how); } -132 AUE_NULL MNOPROTO { int setgid(gid_t gid); } -133 AUE_NULL MSTD { int osf1_sendto(int s, caddr_t buf, \ +130 AUE_FTRUNCATE MNOPROTO { int oftruncate(int fd, long length); } +131 AUE_FLOCK MNOPROTO { int flock(int fd, int how); } +132 AUE_SETGID MNOPROTO { int setgid(gid_t gid); } +133 AUE_SENDTO MSTD { int osf1_sendto(int s, caddr_t buf, \ size_t len, int flags, \ struct sockaddr *to, int tolen); } -134 AUE_NULL MNOPROTO { int shutdown(int s, int how); } -135 AUE_NULL MSTD { int linux_socketpair(void); } -136 AUE_NULL MSTD { int linux_mkdir(char *path, l_int mode); } -137 AUE_NULL MSTD { int linux_rmdir(char *path); } -138 AUE_NULL MNOPROTO { int utimes(char *path, \ +134 AUE_SHUTDOWN MNOPROTO { int shutdown(int s, int how); } +135 AUE_SOCKETPAIR MSTD { int linux_socketpair(void); } +136 AUE_MKDIR MSTD { int linux_mkdir(char *path, l_int mode); } +137 AUE_RMDIR MSTD { int linux_rmdir(char *path); } +138 AUE_UTIMES MNOPROTO { int utimes(char *path, \ struct timeval *tptr); } 139 AUE_NULL UNIMPL 140 AUE_NULL UNIMPL -141 AUE_NULL MNOPROTO { int ogetpeername(int fdes, caddr_t asa, \ +141 AUE_GETPEERNAME MNOPROTO { int ogetpeername(int fdes, caddr_t asa, \ int *alen); } 142 AUE_NULL UNIMPL 143 AUE_NULL UNIMPL -144 AUE_NULL MSTD { int linux_getrlimit(l_uint resource, \ +144 AUE_GETRLIMIT MSTD { int linux_getrlimit(l_uint resource, \ struct l_rlimit *rlim); } -145 AUE_NULL MSTD { int linux_setrlimit(l_uint resource, \ +145 AUE_SETRLIMIT MSTD { int linux_setrlimit(l_uint resource, \ struct l_rlimit *rlim); } 146 AUE_NULL UNIMPL -147 AUE_NULL MNOPROTO { int setsid(void); } -148 AUE_NULL MSTD { int linux_quotactl(void); } +147 AUE_SETSID MNOPROTO { int setsid(void); } +148 AUE_QUOTACTL MSTD { int linux_quotactl(void); } 149 AUE_NULL UNIMPL -150 AUE_NULL MNOPROTO { int ogetsockname(int fdec, caddr_t asa, \ +150 AUE_GETSOCKNAME MNOPROTO { int ogetsockname(int fdec, caddr_t asa, \ int *alen);} getsockname \ getsockname_args int 151 AUE_NULL UNIMPL @@ -264,15 +265,15 @@ struct osf1_sigaction *osa); } 157 AUE_NULL UNIMPL 158 AUE_NULL UNIMPL -159 AUE_NULL UNIMPL osf_getdirentries -160 AUE_NULL UNIMPL osf_statfs -161 AUE_NULL UNIMPL osf_fstatfs +159 AUE_GETDIRENTRIES UNIMPL osf_getdirentries +160 AUE_STATFS UNIMPL osf_statfs +161 AUE_FSTATFS UNIMPL osf_fstatfs 162 AUE_NULL UNIMPL 163 AUE_NULL UNIMPL 164 AUE_NULL UNIMPL -165 AUE_NULL UNIMPL osf_getdomainname -166 AUE_NULL MNOPROTO { int setdomainname(char *name, \ - int len); } +165 AUE_SYSCTL UNIMPL osf_getdomainname +166 AUE_SYSCTL MNOPROTO { int setdomainname( \ + char *name, int len); } 167 AUE_NULL UNIMPL 168 AUE_NULL UNIMPL 169 AUE_NULL UNIMPL @@ -305,39 +306,39 @@ 196 AUE_NULL UNIMPL 197 AUE_NULL UNIMPL 198 AUE_NULL UNIMPL -199 AUE_NULL UNIMPL osf_swapon -200 AUE_NULL MSTD { int linux_msgctl(l_int msqid, l_int cmd, \ +199 AUE_SWAPON UNIMPL osf_swapon +200 AUE_MSGCTL MSTD { int linux_msgctl(l_int msqid, l_int cmd, \ struct l_msqid_ds *buf); } -201 AUE_NULL MSTD { int linux_msgget(l_key_t key, \ +201 AUE_MSGGET MSTD { int linux_msgget(l_key_t key, \ l_int msgflg); } -202 AUE_NULL MSTD { int linux_msgrcv(l_int msqid, \ +202 AUE_MSGRCV MSTD { int linux_msgrcv(l_int msqid, \ struct l_msgbuf *msgp, l_size_t msgsz, \ l_long msgtyp, l_int msgflg); } -203 AUE_NULL MSTD { int linux_msgsnd(l_int msqid, \ +203 AUE_MSGSND MSTD { int linux_msgsnd(l_int msqid, \ struct l_msgbuf *msgp, l_size_t msgsz, \ l_int msgflg); } -204 AUE_NULL STD { int linux_semctl(l_int semid, \ +204 AUE_SEMCTL STD { int linux_semctl(l_int semid, \ l_int semnum, l_int cmd, \ union l_semun arg); } -205 AUE_NULL MSTD { int linux_semget(l_key_t key, l_int nsems, \ +205 AUE_SEMGET MSTD { int linux_semget(l_key_t key, l_int nsems, \ l_int semflg); } -206 AUE_NULL MSTD { int linux_semop(l_int semid, \ +206 AUE_SEMOP MSTD { int linux_semop(l_int semid, \ struct l_sembuf *tsops, l_uint nsops); } 207 AUE_NULL UNIMPL osf_utsname -208 AUE_NULL MSTD { int linux_lchown(char *path, l_uid_t uid, \ +208 AUE_LCHOWN MSTD { int linux_lchown(char *path, l_uid_t uid, \ l_gid_t gid); } -209 AUE_NULL MSTD { int linux_shmat(l_int shmid, \ +209 AUE_SHMAT MSTD { int linux_shmat(l_int shmid, \ char *shmaddr, l_int shmflg); } -210 AUE_NULL MSTD { int linux_shmctl(l_int shmid, l_int cmd, \ +210 AUE_SHMCTL MSTD { int linux_shmctl(l_int shmid, l_int cmd, \ struct l_shmid_ds *buf); } -211 AUE_NULL MSTD { int linux_shmdt(char *shmaddr); } -212 AUE_NULL MSTD { int linux_shmget(l_key_t key, \ +211 AUE_SHMDT MSTD { int linux_shmdt(char *shmaddr); } +212 AUE_SHMGET MSTD { int linux_shmget(l_key_t key, \ l_size_t size, l_int shmflg); } 213 AUE_NULL UNIMPL 214 AUE_NULL UNIMPL 215 AUE_NULL UNIMPL 216 AUE_NULL UNIMPL -217 AUE_NULL MSTD { int linux_msync(l_ulong addr, \ +217 AUE_MSYNC MSTD { int linux_msync(l_ulong addr, \ l_size_t len, l_int fl); } 218 AUE_NULL UNIMPL 219 AUE_NULL UNIMPL @@ -354,8 +355,8 @@ 230 AUE_NULL UNIMPL 231 AUE_NULL UNIMPL 232 AUE_NULL UNIMPL -233 AUE_NULL MNOPROTO { int getpgid(int pid); } -234 AUE_NULL MSTD { int linux_getsid(l_pid_t pid); } +233 AUE_GETPPID MNOPROTO { int getpgid(int pid); } +234 AUE_GETSID MSTD { int linux_getsid(l_pid_t pid); } 235 AUE_NULL MSTD { int linux_sigaltstack(void); } 236 AUE_NULL UNIMPL 237 AUE_NULL UNIMPL @@ -427,14 +428,14 @@ 297 AUE_NULL UNIMPL 298 AUE_NULL UNIMPL 299 AUE_NULL UNIMPL -300 AUE_NULL MSTD { int linux_bdflush(void); } +300 AUE_BDFLUSH MSTD { int linux_bdflush(void); } 301 AUE_NULL MSTD { int linux_sethae(void); } -302 AUE_NULL STD { int linux_mount(char *specialfile, \ +302 AUE_MOUNT STD { int linux_mount(char *specialfile, \ char *dir, char *filesystemtype, \ l_ulong rwflag, void *data); } -303 AUE_NULL MSTD { int linux_old_adjtimex(void); } -304 AUE_NULL MSTD { int linux_swapoff(void); } -305 AUE_NULL STD { int linux_getdents(l_uint fd, void *dent, \ +303 AUE_ADJTIME MSTD { int linux_old_adjtimex(void); } +304 AUE_SWAPOFF MSTD { int linux_swapoff(void); } +305 AUE_O_GETDENTS STD { int linux_getdents(l_uint fd, void *dent, \ l_uint count); } 306 AUE_NULL MSTD { int linux_create_module(void); } 307 AUE_NULL MSTD { int linux_init_module(void); } @@ -442,46 +443,46 @@ 309 AUE_NULL MSTD { int linux_get_kernel_syms(void); } 310 AUE_NULL MSTD { int linux_syslog(l_int type, char *buf, \ l_int len); } -311 AUE_NULL MSTD { int linux_reboot(l_int magic1, \ +311 AUE_REBOOT MSTD { int linux_reboot(l_int magic1, \ l_int magic2, l_uint cmd, void *arg); } -312 AUE_NULL MSTD { int linux_clone(l_int flags, void *stack); } -313 AUE_NULL STD { int linux_uselib(char *library); } -314 AUE_NULL MNOPROTO { int mlock(const void *addr, \ +312 AUE_RFORK MSTD { int linux_clone(l_int flags, void *stack); } +313 AUE_USELIB STD { int linux_uselib(char *library); } +314 AUE_MLOCK MNOPROTO { int mlock(const void *addr, \ size_t len); } -315 AUE_NULL MNOPROTO { int munlock(const void *addr, \ +315 AUE_MUNLOCK MNOPROTO { int munlock(const void *addr, \ size_t len); } -316 AUE_NULL MNOPROTO { int mlockall(int how); } -317 AUE_NULL MNOPROTO { int munlockall(void); } +316 AUE_MLOCKALL MNOPROTO { int mlockall(int how); } +317 AUE_MUNLOCKALL MNOPROTO { int munlockall(void); } 318 AUE_NULL MSTD { int linux_sysinfo(void); } -319 AUE_NULL MSTD { int linux_sysctl( \ +319 AUE_SYSCTL MSTD { int linux_sysctl( \ struct l___sysctl_args *args); } 320 AUE_NULL UNIMPL sys_idle -321 AUE_NULL STD { int linux_oldumount(char *path); } -322 AUE_NULL MNOPROTO { int swapon(char *name); } +321 AUE_UMOUNT STD { int linux_oldumount(char *path); } +322 AUE_SWAPON MNOPROTO { int swapon(char *name); } 323 AUE_NULL MSTD { int linux_times(struct l_times_argv *buf); } -324 AUE_NULL MSTD { int linux_personality(l_ulong per); } -325 AUE_NULL MSTD { int linux_setfsuid(l_uid_t uid); } -326 AUE_NULL MSTD { int linux_setfsgid(l_gid_t gid); } +324 AUE_PERSONALITY MSTD { int linux_personality(l_ulong per); } +325 AUE_SETFSUID MSTD { int linux_setfsuid(l_uid_t uid); } +326 AUE_GETFSUID MSTD { int linux_setfsgid(l_gid_t gid); } 327 AUE_NULL MSTD { int linux_ustat(l_dev_t dev, \ struct l_ustat *ubuf); } -328 AUE_NULL MSTD { int linux_statfs(char *path, \ +328 AUE_STATFS MSTD { int linux_statfs(char *path, \ struct l_statfs_buf *buf); } -329 AUE_NULL MSTD { int linux_fstatfs(l_uint fd, \ +329 AUE_FSTATFS MSTD { int linux_fstatfs(l_uint fd, \ struct l_statfs_buf *buf); } -330 AUE_NULL MNOPROTO { int sched_setparam(pid_t pid, \ +330 AUE_SCHED_SETPARAM MNOPROTO { int sched_setparam(pid_t pid, \ const struct sched_param *param); } -331 AUE_NULL MNOPROTO { int sched_getparam(pid_t pid, \ +331 AUE_SCHED_GETPARAM MNOPROTO { int sched_getparam(pid_t pid, \ struct sched_param *param); } -332 AUE_NULL MSTD { int linux_sched_setscheduler(l_pid_t pid, \ +332 AUE_SCHED_SETSCHEDULER MSTD { int linux_sched_setscheduler(l_pid_t pid, \ l_int policy, \ struct l_sched_param *param); } -333 AUE_NULL MSTD { int linux_sched_getscheduler(l_pid_t pid); } +333 AUE_SCHED_GETSCHEDULER MSTD { int linux_sched_getscheduler(l_pid_t pid); } 334 AUE_NULL MNOPROTO { int sched_yield(void); } -335 AUE_NULL MSTD { int linux_sched_get_priority_max( \ +335 AUE_SCHED_GET_PRIORITY_MAX MSTD { int linux_sched_get_priority_max( \ l_int policy); } -336 AUE_NULL MSTD { int linux_sched_get_priority_min( \ +336 AUE_SCHED_GET_PRIORITY_MIN MSTD { int linux_sched_get_priority_min( \ l_int policy); } -337 AUE_NULL MNOPROTO { int sched_rr_get_interval (pid_t pid, \ +337 AUE_SCHED_RR_GET_INTERVAL MNOPROTO { int sched_rr_get_interval (pid_t pid, \ struct timespec *interval); } 338 AUE_NULL UNIMPL sys_afs_syscall 339 AUE_NULL MSTD { int linux_newuname( \ @@ -493,17 +494,17 @@ l_ulong old_len, l_ulong new_len, \ l_ulong flags, l_ulong new_addr); } 342 AUE_NULL MSTD { int linux_nfsservctl(void); } -343 AUE_NULL MNOPROTO { int setresuid(uid_t ruid, \ +343 AUE_SETRESUID MNOPROTO { int setresuid(uid_t ruid, \ uid_t euid, uid_t suid); } -344 AUE_NULL MNOPROTO { int getresuid(uid_t *ruid, \ +344 AUE_GETRESUID MNOPROTO { int getresuid(uid_t *ruid, \ uid_t *euid, uid_t *suid); } 345 AUE_NULL MSTD { int linux_pciconfig_read(void); } 346 AUE_NULL MSTD { int linux_pciconfig_write(void); } 347 AUE_NULL MSTD { int linux_query_module(void); } -348 AUE_NULL MSTD { int linux_prctl(void); } -349 AUE_NULL MSTD { int linux_pread(l_uint fd, char *buf, \ +348 AUE_PRCTL MSTD { int linux_prctl(void); } +349 AUE_PREAD MSTD { int linux_pread(l_uint fd, char *buf, \ l_size_t nbyte, l_loff_t offset); } -350 AUE_NULL MSTD { int linux_pwrite(l_uint fd, char *buf, \ +350 AUE_PWRITE MSTD { int linux_pwrite(l_uint fd, char *buf, \ l_size_t nbyte, l_loff_t offset); } 351 AUE_NULL MSTD { int linux_rt_sigreturn(void); } 352 AUE_NULL MSTD { int linux_rt_sigaction(l_int sig, \ @@ -517,42 +518,42 @@ 356 AUE_NULL MSTD { int linux_rt_sigqueueinfo(void); } 357 AUE_NULL MSTD { int linux_rt_sigsuspend(l_sigset_t \ *newset, l_size_t sigsetsize); } -358 AUE_NULL MSTD { int linux_select(l_int nfds, \ +358 AUE_SELECT MSTD { int linux_select(l_int nfds, \ l_fd_set *readfds, l_fd_set *writefds, \ l_fd_set *exceptfds, \ struct l_timeval *timeout); } 359 AUE_NULL MNOPROTO { int gettimeofday( \ struct timeval *tp, \ struct timezone *tzp); } -360 AUE_NULL MNOPROTO { int settimeofday( \ +360 AUE_SETTIMEOFDAY MNOPROTO { int settimeofday( \ struct timeval *tp, \ struct timezone *tzp); } -361 AUE_NULL MSTD { int linux_getitimer(l_int which, \ +361 AUE_GETITIMER MSTD { int linux_getitimer(l_int which, \ struct l_itimerval *itv); } -362 AUE_NULL MSTD { int linux_setitimer(l_int which, \ +362 AUE_SETITIMER MSTD { int linux_setitimer(l_int which, \ struct l_itimerval *itv, \ struct l_itimerval *oitv); } -363 AUE_NULL MSTD { int linux_utimes(char *fname, \ +363 AUE_UTIMES MSTD { int linux_utimes(char *fname, \ struct l_timeval *times); } -364 AUE_NULL MNOPROTO { int getrusage(int who, \ +364 AUE_GETRUSAGE MNOPROTO { int getrusage(int who, \ struct rusage *rusage); } -365 AUE_NULL MSTD { int linux_wait4(l_pid_t pid, \ +365 AUE_WAIT4 MSTD { int linux_wait4(l_pid_t pid, \ l_uint *status, l_int options, \ struct l_rusage *rusage); } -366 AUE_NULL MSTD { int linux_adjtimex(void); } -367 AUE_NULL MSTD { int linux_getcwd(char *buf, \ +366 AUE_ADJTIME MSTD { int linux_adjtimex(void); } +367 AUE_GETCWD MSTD { int linux_getcwd(char *buf, \ l_ulong bufsize); } -368 AUE_NULL MSTD { int linux_capget(void); } -369 AUE_NULL MSTD { int linux_capset(void); } -370 AUE_NULL MSTD { int linux_sendfile(void); } -371 AUE_NULL MNOPROTO { int setresgid(gid_t rgid, \ +368 AUE_CAPGET MSTD { int linux_capget(void); } +369 AUE_CAPSET MSTD { int linux_capset(void); } +370 AUE_SENDFILE MSTD { int linux_sendfile(void); } +371 AUE_SETRESGID MNOPROTO { int setresgid(gid_t rgid, \ gid_t egid, gid_t sgid); } -372 AUE_NULL MNOPROTO { int getresgid(gid_t *rgid, \ +372 AUE_GETRESGID MNOPROTO { int getresgid(gid_t *rgid, \ gid_t *egid, gid_t *sgid); } 373 AUE_NULL UNIMPL sys_dipc -374 AUE_NULL MSTD { int linux_pivot_root(char *new_root, \ +374 AUE_PIVOT_ROOT MSTD { int linux_pivot_root(char *new_root, \ char *put_old); } -375 AUE_NULL MSTD { int linux_mincore(l_ulong start, \ +375 AUE_MINCORE MSTD { int linux_mincore(l_ulong start, \ l_size_t len, u_char *vec); } 376 AUE_NULL MSTD { int linux_pciconfig_iobase(void); } -377 AUE_NULL STD { int linux_getdents64(l_uint fd, void *dirent, l_uint count); } +377 AUE_O_GETDENTS STD { int linux_getdents64(l_uint fd, void *dirent, l_uint count); } ==== //depot/projects/arm/src/sys/amd64/amd64/trap.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.300 2006/01/27 22:22:10 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.301 2006/02/04 20:37:20 wsalamon Exp $"); /* * AMD64 Trap and System call handling @@ -75,6 +75,7 @@ #ifdef HWPMC_HOOKS #include #endif +#include #include #include @@ -823,10 +824,15 @@ if ((callp->sy_narg & SYF_MPSAFE) == 0) { mtx_lock(&Giant); + AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, argp); + AUDIT_SYSCALL_EXIT(error, td); mtx_unlock(&Giant); - } else + } else { + AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, argp); + AUDIT_SYSCALL_EXIT(error, td); + } } switch (error) { ==== //depot/projects/arm/src/sys/amd64/ia32/ia32_syscall.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.9 2005/10/14 12:43:43 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.10 2006/02/04 20:37:20 wsalamon Exp $"); /* * 386 Trap and System call handling @@ -66,6 +66,7 @@ #ifdef KTRACE #include #endif +#include #include #include @@ -184,7 +185,9 @@ STOPEVENT(p, S_SCE, narg); + AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, args64); + AUDIT_SYSCALL_EXIT(error, td); } switch (error) { ==== //depot/projects/arm/src/sys/arm/arm/trap.c#6 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.19 2006/01/06 18:02:12 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.20 2006/02/04 17:01:19 cognet Exp $"); #include @@ -119,6 +119,8 @@ #include #include +#include + #ifdef KDB #include #endif @@ -927,7 +929,9 @@ td->td_retval[1] = 0; STOPEVENT(p, S_SCE, (callp->sy_narg & SYF_ARGMASK)); PTRACESTOP_SC(p, td, S_PT_SCE); + AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, args); + AUDIT_SYSCALL_EXIT(error, td); } switch (error) { case 0: ==== //depot/projects/arm/src/sys/arm/xscale/i80321/i80321_aau.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_aau.c,v 1.2 2005/12/09 23:55:41 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_aau.c,v 1.3 2006/02/04 18:01:15 cognet Exp $"); #include #include @@ -183,6 +183,7 @@ desc = sc->aauring[0].desc; if (flags & IS_PHYSICAL) { desc->local_addr = (vm_paddr_t)dst; + desc->next_desc = 0; desc->count = len; desc->descr_ctrl = 2 << 1 | 1 << 31; /* Fill, enable dest write */ bus_dmamap_sync(sc->dmatag, sc->aauring[0].map, ==== //depot/projects/arm/src/sys/bsm/audit.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/arm/src/sys/bsm/audit.h#2 $ + * $P4: //depot/projects/arm/src/sys/bsm/audit.h#3 $ * $FreeBSD: src/sys/bsm/audit.h,v 1.2 2006/02/01 19:54:22 rwatson Exp $ */ ==== //depot/projects/arm/src/sys/bsm/audit_internal.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/arm/src/sys/bsm/audit_internal.h#1 $ + * $P4: //depot/projects/arm/src/sys/bsm/audit_internal.h#2 $ * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.1 2006/02/01 19:54:22 rwatson Exp $ */ ==== //depot/projects/arm/src/sys/bsm/audit_kevents.h#4 (text+ko) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/arm/src/sys/bsm/audit_kevents.h#3 $ - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.3 2006/02/01 19:54:22 rwatson Exp $ + * $P4: //depot/projects/arm/src/sys/bsm/audit_kevents.h#4 $ + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.4 2006/02/04 13:22:44 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -46,7 +46,6 @@ * been inserted for the Darwin variants. If necessary, other tags will be * added in the future. */ - #define AUE_NULL 0 #define AUE_EXIT 1 #define AUE_FORK 2 @@ -359,7 +358,32 @@ #define AUE_KQUEUE 377 /* FreeBSD-specific. */ #define AUE_KEVENT 378 /* FreeBSD-specific. */ #define AUE_FSYNC 379 -#define AUE_NMOUNT 380 /* FreeBSD-specific. */ +#define AUE_NMOUNT 380 /* FreeBSD-specific. */ +#define AUE_BDFLUSH 381 /* Linux-specific. */ +#define AUE_SETFSUID 382 /* Linux-specific. */ +#define AUE_GETFSUID 383 /* Linux-specific. */ +#define AUE_PERSONALITY 384 /* Linux-specific. */ +#define AUE_SCHED_GETSCHEDULER 385 /* POSIX.1b. */ +#define AUE_SCHED_SETSCHEDULER 386 /* POSIX.1b. */ +#define AUE_PRCTL 387 /* Linux-specific. */ +#define AUE_GETCWD 388 /* FreeBSD/Linux-specific. */ +#define AUE_CAPGET 389 /* Linux-specific. */ +#define AUE_CAPSET 390 /* Linux-specific. */ +#define AUE_PIVOT_ROOT 391 /* Linux-specific. */ +#define AUE_RTPRIO 392 /* FreeBSD-specific. */ +#define AUE_SCHED_GETPARAM 393 /* POSIX.1b. */ +#define AUE_SCHED_SETPARAM 394 /* POSIX.1b. */ +#define AUE_SCHED_GET_PRIORITY_MAX 395 /* POSIX.1b. */ +#define AUE_SCHED_GET_PRIORITY_MIN 396 /* POSIX.1b. */ +#define AUE_SCHED_RR_GET_INTERVAL 397 /* POSIX.1b. */ +#define AUE_ACL_GET_FILE 398 /* FreeBSD. */ +#define AUE_ACL_SET_FILE 399 /* FreeBSD. */ +#define AUE_ACL_GET_FD 400 /* FreeBSD. */ +#define AUE_ACL_SET_FD 401 /* FreeBSD. */ +#define AUE_ACL_DELETE_FILE 402 /* FreeBSD. */ +#define AUE_ACL_DELETE_FD 403 /* FreeBSD. */ +#define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ +#define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the @@ -405,6 +429,7 @@ #define AUE_O_RECVFROM AUE_RECVFROM /* Darwin */ #define AUE_O_SETREUID AUE_SETREUID /* Darwin */ #define AUE_O_SETREGID AUE_SETREGID /* Darwin */ +#define AUE_O_GETDIRENTRIES AUE_GETDIRENTRIES /* Darwin */ #define AUE_O_TRUNCATE AUE_TRUNCATE /* Darwin */ #define AUE_O_FTRUNCATE AUE_FTRUNCATE /* Darwin */ #define AUE_O_GETPEERNAME AUE_NULL /* Darwin */ @@ -468,6 +493,8 @@ #define AUE_MUNLOCKALL AUE_NULL #define AUE_PREAD AUE_NULL #define AUE_PWRITE AUE_NULL +#define AUE_PREADV AUE_NULL +#define AUE_PWRITEV AUE_NULL #define AUE_SBRK AUE_NULL #define AUE_SELECT AUE_NULL #define AUE_SEMDESTROY AUE_NULL ==== //depot/projects/arm/src/sys/bsm/audit_record.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/arm/src/sys/bsm/audit_record.h#1 $ + * $P4: //depot/projects/arm/src/sys/bsm/audit_record.h#2 $ * $FreeBSD: src/sys/bsm/audit_record.h,v 1.1 2006/02/01 19:54:22 rwatson Exp $ */ ==== //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.51 2006/01/20 21:10:37 ambrisko Exp $ - * created from FreeBSD + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.52 2006/02/04 13:29:09 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.63 2006/02/04 13:28:55 rwatson Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.49 2006/01/20 16:22:37 ambrisko Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.61 2005/12/23 20:06:14 ru Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.50 2006/02/04 13:29:09 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.63 2006/02/04 13:28:55 rwatson Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.40 2006/01/20 16:22:37 ambrisko Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.61 2005/12/23 20:06:14 ru Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.41 2006/02/04 13:29:09 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.63 2006/02/04 13:28:55 rwatson Exp */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.50 2006/01/20 16:22:37 ambrisko Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.61 2005/12/23 20:06:14 ru Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.51 2006/02/04 13:29:09 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.63 2006/02/04 13:28:55 rwatson Exp */ #include "opt_compat.h" @@ -33,154 +33,154 @@ /* The casts are bogus but will do for now. */ struct sysent freebsd32_sysent[] = { { SYF_MPSAFE | 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = syscall */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_NULL }, /* 1 = exit */ - { SYF_MPSAFE | 0, (sy_call_t *)fork, AUE_NULL }, /* 2 = fork */ - { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ - { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ - { SYF_MPSAFE | AS(open_args), (sy_call_t *)open, AUE_NULL }, /* 5 = open */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Feb 5 11:09:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 839F316A423; Sun, 5 Feb 2006 11:09:55 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 11FA816A420 for ; Sun, 5 Feb 2006 11:09:55 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C817043D46 for ; Sun, 5 Feb 2006 11:09:54 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k15B9sWe021595 for ; Sun, 5 Feb 2006 11:09:54 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k15B9sfT021592 for perforce@freebsd.org; Sun, 5 Feb 2006 11:09:54 GMT (envelope-from brueffer@freebsd.org) Date: Sun, 5 Feb 2006 11:09:54 GMT Message-Id: <200602051109.k15B9sfT021592@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 91153 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2006 11:09:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=91153 Change 91153 by brueffer@brueffer_serenity on 2006/02/05 11:09:12 Markup changes that result in more visually pleasing output, mainly the addition of empty lines via .Pp. Also an Xref and the meaning of an event class corrected. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit_class.5#7 edit .. //depot/projects/trustedbsd/openbsm/man/audit_control.5#9 edit .. //depot/projects/trustedbsd/openbsm/man/audit_event.5#8 edit .. //depot/projects/trustedbsd/openbsm/man/audit_user.5#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit_class.5#7 (text+ko) ==== @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_class.5#6 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_class.5#7 $ .\" .Dd January 24, 2004 .Dt AUDIT_CLASS 5 @@ -40,8 +40,9 @@ Each auditable event is a member of an event class. Each line maps an audit event mask (bitmap) to a class and a description. -Entries are of the form -.Dl classmask:eventclass:description. +Entries are of the form: +.Pp +.Dl classmask:eventclass:description .Pp Example entries in this file are: .Bd -literal -offset indent ==== //depot/projects/trustedbsd/openbsm/man/audit_control.5#9 (text+ko) ==== @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#8 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#9 $ .\" .Dd January 4, 2006 .Dt AUDIT_CONTROL 5 @@ -38,7 +38,9 @@ .Nm file contains several audit system parameters. Each line of this file is of the form: -.Dl parameter:value. +.Pp +.Dl parameter:value +.Pp The parameters are: .Bl -tag -width Ds .It Pa dir @@ -71,6 +73,7 @@ for details. Event classes may be preceded by a prefix which changes their interpretation. The following prefixes may be used for each class: +.Pp .Bl -tag -width Ds -compact -offset indent .It + Record successful events @@ -103,9 +106,9 @@ .It Pa /etc/security/audit_control .El .Sh SEE ALSO -.Xr audit 1 , .Xr audit_class 5 , .Xr audit_user 5 , +.Xr audit 8 , .Xr auditd 8 .Sh AUTHORS This software was created by McAfee Research, the security research division ==== //depot/projects/trustedbsd/openbsm/man/audit_event.5#8 (text+ko) ==== @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_event.5#7 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_event.5#8 $ .\" .Dd January 24, 2004 .Dt AUDIT_EVENT 5 @@ -38,8 +38,10 @@ .Nm file contains descriptions of the auditable events on the system. Each line maps an audit event number to a name, a description, and a class. -Entries are of the form -.Dl eventnum:eventname:description:eventclass . +Entries are of the form: +.Pp +.Dl eventnum:eventname:description:eventclass +.Pp Each .Vt eventclass should have a corresponding entry in the ==== //depot/projects/trustedbsd/openbsm/man/audit_user.5#7 (text+ko) ==== @@ -25,9 +25,9 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_user.5#6 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_user.5#7 $ .\" -.Dd January 24, 2004 +.Dd February 5, 2006 .Dt AUDIT_USER 5 .Os .Sh NAME @@ -44,9 +44,11 @@ .Pp Each line maps a user name to a list of classes that should be audited and a list of classes that should not be audited. -Entries are of the form of -.Dl username:alwaysaudit:neveraudit , -where +Entries are of the form: +.Pp +.Dl username:alwaysaudit:neveraudit +.Pp +In the format above, .Vt alwaysaudit is a set of event classes that are always audited, and .Vt neveraudit @@ -64,8 +66,8 @@ jdoe:-fc,ad:+fw .Ed .Pp -These settings would cause login and administrative events that succeed on -behalf of user root to be audited. +These settings would cause login/logout and administrative events that +succeed on behalf of user root to be audited. No failure events are audited. For the user .Em jdoe , From owner-p4-projects@FreeBSD.ORG Sun Feb 5 13:03:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FE2916A423; Sun, 5 Feb 2006 13:03:16 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D28216A420 for ; Sun, 5 Feb 2006 13:03:16 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F0B2243D46 for ; Sun, 5 Feb 2006 13:03:15 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k15D3FNk033588 for ; Sun, 5 Feb 2006 13:03:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k15D3FPU033585 for perforce@freebsd.org; Sun, 5 Feb 2006 13:03:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Feb 2006 13:03:15 GMT Message-Id: <200602051303.k15D3FPU033585@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91158 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2006 13:03:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=91158 Change 91158 by rwatson@rwatson_peppercorn on 2006/02/05 13:03:07 Manage audit record memory with the slab allocator, turning initialization routines into a ctor, tear-down to a dtor, cleaning up, etc. This will allow audit records to be allocated from per-cpu caches. On recent FreeBSD, dropping the audit_mtx around freeing to UMA is no longer required (at one point it was possible to acquire Giant on that path), so a mutex-free thread-local drain is no longer required. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#6 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#6 (text+ko) ==== @@ -1,5 +1,6 @@ /* * Copyright (c) 1999-2005 Apple Computer, Inc. + * Copyright (c) 2006 Robert N. M. Watson * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -54,14 +55,17 @@ #include #include +#include +#include + #include #include -#include -#include #include #include +#include + /* * The AUDIT_EXCESSIVELY_VERBOSE define enables a number of * gratuitously noisy printf's to the console. Due to the @@ -75,8 +79,8 @@ #define AUDIT_PRINTF(X) #endif +static uma_zone_t audit_record_zone; static MALLOC_DEFINE(M_AUDITPROC, "audit_proc", "Audit process storage"); -static MALLOC_DEFINE(M_AUDITREC, "audit_rec", "Audit event records"); MALLOC_DEFINE(M_AUDITDATA, "audit_data", "Audit data storage"); MALLOC_DEFINE(M_AUDITPATH, "audit_path", "Audit path storage"); MALLOC_DEFINE(M_AUDITTEXT, "audit_text", "Audit text storage"); @@ -191,28 +195,60 @@ static int audit_file_rotate_wait; /* - * Perform a deep free of an audit record (core record and referenced objects) + * Construct an audit record for the passed thread. */ +static int +audit_record_ctor(void *mem, int size, void *arg, int flags) +{ + struct kaudit_record *ar; + struct thread *td; + + KASSERT(sizeof(*ar) == size, ("audit_record_ctor: wrong size")); + + td = arg; + ar = mem; + bzero(ar, sizeof(*ar)); + ar->k_ar.ar_magic = AUDIT_RECORD_MAGIC; + nanotime(&ar->k_ar.ar_starttime); + + /* + * Export the subject credential. + * + * XXXAUDIT: td_ucred access is OK without proc lock, but some other + * fields here may require the proc lock. + */ + cru2x(td->td_ucred, &ar->k_ar.ar_subj_cred); + ar->k_ar.ar_subj_ruid = td->td_ucred->cr_ruid; + ar->k_ar.ar_subj_rgid = td->td_ucred->cr_rgid; + ar->k_ar.ar_subj_egid = td->td_ucred->cr_groups[0]; + ar->k_ar.ar_subj_auid = td->td_proc->p_au->ai_auid; + ar->k_ar.ar_subj_asid = td->td_proc->p_au->ai_asid; + ar->k_ar.ar_subj_pid = td->td_proc->p_pid; + ar->k_ar.ar_subj_amask = td->td_proc->p_au->ai_mask; + ar->k_ar.ar_subj_term = td->td_proc->p_au->ai_termid; + bcopy(td->td_proc->p_comm, ar->k_ar.ar_subj_comm, MAXCOMLEN); + + return (0); +} + static void -audit_record_free(struct kaudit_record *ar) +audit_record_dtor(void *mem, int size, void *arg) { + struct kaudit_record *ar; + + KASSERT(sizeof(*ar) == size, ("audit_record_dtor: wrong size")); - if (ar->k_ar.ar_arg_upath1 != NULL) { + ar = mem; + if (ar->k_ar.ar_arg_upath1 != NULL) free(ar->k_ar.ar_arg_upath1, M_AUDITPATH); - } - if (ar->k_ar.ar_arg_upath2 != NULL) { + if (ar->k_ar.ar_arg_upath2 != NULL) free(ar->k_ar.ar_arg_upath2, M_AUDITPATH); - } - if (ar->k_ar.ar_arg_text != NULL) { + if (ar->k_ar.ar_arg_text != NULL) free(ar->k_ar.ar_arg_text, M_AUDITTEXT); - } - if (ar->k_ar.ar_arg_iovecstr != NULL) { + if (ar->k_ar.ar_arg_iovecstr != NULL) free(ar->k_ar.ar_arg_iovecstr, M_AUDITTEXT); - } - if (ar->k_udata != NULL) { + if (ar->k_udata != NULL) free(ar->k_udata, M_AUDITDATA); - } - free(ar, M_AUDITREC); } /* @@ -504,58 +540,39 @@ } /* - * If we have records, but there's no active vnode to - * write to, drain the record queue. Generally, we - * prevent the unnecessary allocation of records - * elsewhere, but we need to allow for races between - * conditional allocation and queueing. Go back to - * waiting when we're done. - * - * XXX: We go out of our way to avoid calling - * audit_record_free(). - * with the audit_mtx held, to avoid a lock order reversal - * as free() may grab Giant. This should be fixed at - * some point. + * If we have records, but there's no active vnode to write + * to, drain the record queue. Generally, we prevent the + * unnecessary allocation of records elsewhere, but we need + * to allow for races between conditional allocation and + * queueing. Go back to waiting when we're done. */ if (audit_vp == NULL) { while ((ar = TAILQ_FIRST(&audit_q))) { TAILQ_REMOVE(&audit_q, ar, k_q); + uma_zfree(audit_record_zone, ar); audit_q_len--; + /* + * XXXRW: Why broadcast if we hold the + * mutex and know that audit_vp is NULL? + */ if (audit_q_len <= audit_qctrl.aq_lowater) cv_broadcast(&audit_commit_cv); - - TAILQ_INSERT_TAIL(&ar_worklist, ar, k_q); - } - mtx_unlock(&audit_mtx); - while ((ar = TAILQ_FIRST(&ar_worklist))) { - TAILQ_REMOVE(&ar_worklist, ar, k_q); - audit_record_free(ar); } - mtx_lock(&audit_mtx); continue; } /* - * We have both records to write and an active vnode - * to write to. Dequeue a record, and start the write. - * Eventually, it might make sense to dequeue several - * records and perform our own clustering, if the lower - * layers aren't doing it automatically enough. - * - * XXX: We go out of our way to avoid calling - * audit_record_free() - * with the audit_mtx held, to avoid a lock order reversal - * as free() may grab Giant. This should be fixed at - * some point. - * - * XXXAUDIT: free() no longer grabs Giant. + * We have both records to write and an active vnode to write + * to. Dequeue a record, and start the write. Eventually, + * it might make sense to dequeue several records and perform + * our own clustering, if the lower layers aren't doing it + * automatically enough. */ while ((ar = TAILQ_FIRST(&audit_q))) { TAILQ_REMOVE(&audit_q, ar, k_q); audit_q_len--; if (audit_q_len <= audit_qctrl.aq_lowater) cv_broadcast(&audit_commit_cv); - TAILQ_INSERT_TAIL(&ar_worklist, ar, k_q); } @@ -572,7 +589,7 @@ printf("audit_worker: write error %d\n", error); } - audit_record_free(ar); + uma_zfree(audit_record_zone, ar); } mtx_lock(&audit_mtx); } @@ -618,6 +635,10 @@ cv_init(&audit_commit_cv, "audit_commit_cv"); cv_init(&audit_fail_cv, "audit_fail_cv"); + audit_record_zone = uma_zcreate("audit_record_zone", + sizeof(struct kaudit_record *), audit_record_ctor, + audit_record_dtor, NULL, NULL, UMA_ALIGN_PTR, 0); + /* Initialize the BSM audit subsystem. */ kau_init(); @@ -735,65 +756,24 @@ struct kaudit_record *ar; int no_record; - /* - * Eventually, there may be certain classes of events that - * we will audit regardless of the audit state at the time - * the record is created. These events will generally - * correspond to changes in the audit state. The dummy - * code below is from our first prototype, but may also - * be used in the final version (with modified event numbers). - */ -#if 0 - if (event != AUDIT_EVENT_FILESTOP && event != AUDIT_EVENT_FILESTART) { -#endif - mtx_lock(&audit_mtx); - no_record = (audit_suspended || !audit_enabled); - mtx_unlock(&audit_mtx); - if (no_record) - return (NULL); -#if 0 - } -#endif + mtx_lock(&audit_mtx); + no_record = (audit_suspended || !audit_enabled); + mtx_unlock(&audit_mtx); + if (no_record) + return (NULL); /* - * Initialize the audit record header. - * XXX: We may want to fail-stop if allocation fails. * XXX: The number of outstanding uncommitted audit records is - * limited by the number of concurrent threads servicing system + * limited to the number of concurrent threads servicing system * calls in the kernel. */ + ar = uma_zalloc_arg(audit_record_zone, td, M_WAITOK); + ar->k_ar.ar_event = event; - ar = malloc(sizeof(*ar), M_AUDITREC, M_WAITOK); - if (ar == NULL) - return NULL; - mtx_lock(&audit_mtx); audit_pre_q_len++; mtx_unlock(&audit_mtx); - bzero(ar, sizeof(*ar)); - ar->k_ar.ar_magic = AUDIT_RECORD_MAGIC; - ar->k_ar.ar_event = event; - nanotime(&ar->k_ar.ar_starttime); - - /* - * Export the subject credential. - * - * XXXAUDIT: td_ucred access is OK without proc lock, but some other - * fields here may require the proc lock. - */ - cru2x(td->td_ucred, &ar->k_ar.ar_subj_cred); - ar->k_ar.ar_subj_ruid = td->td_ucred->cr_ruid; - ar->k_ar.ar_subj_rgid = td->td_ucred->cr_rgid; - ar->k_ar.ar_subj_egid = td->td_ucred->cr_groups[0]; - ar->k_ar.ar_subj_auid = td->td_proc->p_au->ai_auid; - ar->k_ar.ar_subj_asid = td->td_proc->p_au->ai_asid; - ar->k_ar.ar_subj_pid = td->td_proc->p_pid; - ar->k_ar.ar_subj_amask = td->td_proc->p_au->ai_mask; - ar->k_ar.ar_subj_term = td->td_proc->p_au->ai_termid; - - bcopy(td->td_proc->p_comm, ar->k_ar.ar_subj_comm, MAXCOMLEN); - return (ar); } @@ -851,11 +831,15 @@ if (au_preselect(ar->k_ar.ar_event, aumask, sorf) != 0) ar->k_ar_commit |= AR_COMMIT_KERNEL; + /* + * XXXRW: Why is this necessary? Should we ever accept a record that + * we're not willing to commit? + */ if ((ar->k_ar_commit & (AR_COMMIT_USER | AR_COMMIT_KERNEL)) == 0) { mtx_lock(&audit_mtx); audit_pre_q_len--; mtx_unlock(&audit_mtx); - audit_record_free(ar); + uma_zfree(audit_record_zone, ar); return; } @@ -881,7 +865,7 @@ if (audit_suspended || !audit_enabled) { audit_pre_q_len--; mtx_unlock(&audit_mtx); - audit_record_free(ar); + uma_zfree(audit_record_zone, ar); return; } From owner-p4-projects@FreeBSD.ORG Sun Feb 5 13:07:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BACB16A423; Sun, 5 Feb 2006 13:07:24 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C750216A420 for ; Sun, 5 Feb 2006 13:07:23 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7022243D45 for ; Sun, 5 Feb 2006 13:07:23 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k15D7NHP033979 for ; Sun, 5 Feb 2006 13:07:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k15D7NoL033976 for perforce@freebsd.org; Sun, 5 Feb 2006 13:07:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Feb 2006 13:07:23 GMT Message-Id: <200602051307.k15D7NoL033976@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91159 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2006 13:07:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=91159 Change 91159 by rwatson@rwatson_zoo on 2006/02/05 13:06:22 Integrate TrustedBSD audit3 branch from TrustedBSD OpenBSM branch to merge recent OpenBSM changes: - Lots of man page fixes (spelling, cross-reference, style, content). - Additional credits. - ARM fix for auditd, auditreduce, praudit. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/README#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.8#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.1#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.1#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_control.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_event.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_free_token.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_mask.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_token.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_user.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/libbsm.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_class.5#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_control.5#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_event.5#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_user.5#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_warn.5#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditon.2#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/getaudit.2#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/getauid.2#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/setaudit.2#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/setauid.2#4 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/README#6 (text+ko) ==== @@ -62,6 +62,8 @@ Wojciech Koszek Chunyang Yuan Poul-Henning Kamp + Christian Brueffer + Olivier Houchard In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the @@ -83,4 +85,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#5 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#6 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.8#3 (text+ko) ==== @@ -29,9 +29,9 @@ .\" .\" @APPLE_BSD_LICENSE_HEADER_END@ .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.8#2 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.8#3 $ .\" -.Dd Jan 24, 2004 +.Dd January 24, 2004 .Dt AUDIT 8 .Os .Sh NAME @@ -48,7 +48,7 @@ The optional .Ar file operand specifies the location of the audit control input file (default -.Pa /etc/security/audit_control ). +.Pa /etc/security/audit_control ) . .Pp The options are as follows: .Bl -tag -width Ds @@ -65,15 +65,17 @@ and renamed to indicate the time of the shutdown. .El .Sh NOTES -The auditd(8) daemon must already be running. +The +.Xr auditd 8 +daemon must already be running. .Sh FILES .Bl -tag -width "/etc/security/audit_control" -compact .It Pa /etc/security/audit_control Default audit policy file used to configure the auditing system. .El .Sh SEE ALSO +.Xr audit_control 5 , .Xr auditd 8 -.Xr audit_control 5 .Sh AUTHORS This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#1 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#2 $ */ /* * Program to trigger the audit daemon with a message that is either: @@ -65,7 +65,7 @@ int main(int argc, char **argv) { - char ch; + int ch; unsigned int trigger = 0; if (argc != 2) ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.8#2 (text+ko) ==== @@ -29,9 +29,9 @@ .\" .\" @APPLE_BSD_LICENSE_HEADER_END@ .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.8#1 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.8#2 $ .\" -.Dd Jan 24, 2004 +.Dd January 24, 2004 .Dt AUDITD 8 .Os .Sh NAME @@ -63,9 +63,14 @@ .Pp To assure uninterrupted audit support, the .Nm auditd -daemon should not be started and stopped manually. Instead, the audit(1) command +daemon should not be started and stopped manually. +Instead, the +.Xr audit 8 +command should be used to inform the daemon to change state/configuration after altering -the audit_control file. +the +.Pa audit_control +file. .Pp .\" Sending a SIGHUP to a running .\" .Nm auditd ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#1 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#2 $ */ #include @@ -708,7 +708,7 @@ int main(int argc, char **argv) { - char ch; + int ch; int debug = 0; int rc; ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.1#6 (text+ko) ==== @@ -25,9 +25,9 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.1#5 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.1#6 $ .\" -.Dd Jan 24, 2004 +.Dd January 24, 2004 .Dt AUDITREDUCE 1 .Os .Sh NAME @@ -124,7 +124,8 @@ .Sh Examples .Pp To select all records associated with effective user ID root from the audit -log /var/audit/20031016184719.20031017122634: +log +.Pa /var/audit/20031016184719.20031017122634 : .Pp .Nm -e root /var/audit/20031016184719.20031017122634 @@ -136,9 +137,9 @@ .Nm -m AUE_SETLOGIN /var/audit/20031016184719.20031017122634 .Sh SEE ALSO +.Xr praudit 1 , .Xr audit_control 5 , -.Xr audit_event 5 , -.Xr praudit 1 +.Xr audit_event 5 .Sh AUTHORS This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.c#4 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.c#5 $ */ /* @@ -529,7 +529,7 @@ FILE *fp; int i; char *objval, *converr; - char ch; + int ch; char timestr[128]; char *fname; ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.1#5 (text+ko) ==== @@ -25,9 +25,9 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.1#4 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.1#5 $ .\" -.Dd Jan 24, 2004 +.Dd January 24, 2004 .Dt PRAUDIT 1 .Os .Sh NAME ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.c#3 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.c#4 $ */ /* @@ -105,7 +105,7 @@ int main(int argc, char **argv) { - char ch; + int ch; int i; FILE *fp; ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile#5 (text+ko) ==== @@ -1,7 +1,7 @@ # # OpenBSM libbsm # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile#4 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile#5 $ # LIB= bsm @@ -35,7 +35,9 @@ MLINKS= libbsm.3 bsm.3 \ au_class.3 getauclassent.3 \ + au_class.3 getauclassent_r.3 \ au_class.3 getauclassnam.3 \ + au_class.3 getauclassnam_r.3 \ au_class.3 setauclass.3 \ au_class.3 endauclass.3 \ au_control.3 setac.3 \ @@ -47,9 +49,13 @@ au_event.3 setauevent.3 \ au_event.3 endauevent.3 \ au_event.3 getauevent.3 \ + au_event.3 getauevent_r.3 \ au_event.3 getauevnam.3 \ + au_event.3 getauevnam_r.3 \ au_event.3 getauevnum.3 \ + au_event.3 getauevnum_r.3 \ au_event.3 getauevnonam.3 \ + au_event.3 getauevnonam_r.3 \ au_io.3 au_fetch_tok.3 \ au_io.3 au_print_tok.3 \ au_io.3 au_read_rec.3 \ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_control.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_control.3#2 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_control.3#3 $ .\" .Dd April 19, 2005 .Dt AU_CONTROL 3 @@ -67,7 +67,7 @@ database. .Pp .Fn getacdir -Return the name of the directory where log data is stored via the passed +returns the name of the directory where log data is stored via the passed character buffer .Va name of length ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_event.3#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_event.3#3 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_event.3#4 $ .\" .Dd April 19, 2005 .Dt AU_EVENT 3 @@ -123,9 +123,9 @@ and .Fn getauevnuam will return a reference to a -.Dt struct au_event_ent +.Ft struct au_event_ent or -.Dt au_event_t +.Ft au_event_t on success, or .Dv NULL on failure, with .Va errno ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_free_token.3#3 (text+ko) ==== @@ -27,7 +27,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_free_token.3#2 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_free_token.3#3 $ .\" .Dd April 19, 2005 .Dt AU_FREE_TOKEN 3 @@ -40,7 +40,7 @@ .Sh SYNOPSIS .In libbsm.h .Ft void -.Fn au_free_tokenen "token_t *tok" +.Fn au_free_token "token_t *tok" .Sh DESCRIPTION The BSM API generally manages deallocation of .Vt token_t ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_mask.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_mask.3#2 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_mask.3#3 $ .\" .Dd April 19, 2005 .Dt AU_MASK 3 @@ -109,7 +109,7 @@ .Sh IMPLEMENTATION NOTES .Fn au_preselect makes implicit use of various audit database routines, and may influence -the behavior of simultaenous or interleaved processing of those databases by +the behavior of simultaneous or interleaved processing of those databases by other code. .Sh SEE ALSO .Xr libbsm 3 , ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_token.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_token.3#2 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_token.3#3 $ .\" .Dd April 19, 2005 .Dt AU_TOKEN 3 @@ -179,10 +179,10 @@ .Fn au_to_trailer "int rec_size" .Sh DESCRIPTION These interfaces support the allocation of BSM audit tokens, represented by -.Dt token_t , +.Ft token_t , for various data types. .Sh RETURN VALUES -On sucess, a pointer to a +On success, a pointer to a .Vt token_t will be returned; the allocated .Vt token_t ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_user.3#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_user.3#3 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_user.3#4 $ .\" .Dd April 19, 2005 .Dt AU_USER 3 @@ -72,7 +72,7 @@ .Dv au_never . .Pp .Fn getauuserent -return the next user found in the +returns the next user found in the .Xr audit_user 5 database, or the first if the function has not yet been called. .Dv NULL @@ -96,7 +96,7 @@ database, if open. .Pp .Nm au_user_mask -calculate a new session audit mask to be returned via +calculates a new session audit mask to be returned via .Dv mask_p for the user identified by .Dv username . ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/libbsm.3#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/libbsm.3#3 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/libbsm.3#4 $ .\" .Dd April 19, 2005 .Dt LIBBSM 3 @@ -48,57 +48,56 @@ interfaces, I/O interfaces, mask interfaces, notification interfaces, token interfaces, and user interfaces. These are described respectively in the -.Xr au_stream 3 , .Xr au_class 3 , .Xr au_control 3 , .Xr au_event 3 , .Xr au_mask 3 , .Xr au_notify 3 , +.Xr au_stream 3 , .Xr au_token 3 , .Xr au_user 3 man pages. .Ss Audit Event Stream Interfaces Audit event stream interfaces support interaction with file-backed audit event streams: -.Xr au_free_token 3 , +.Xr au_close 3 . .Xr au_free_token 3 , .Xr au_open 3 , .Xr au_write 3 , -.Xr au_close 3 . .Ss Audit Class Interfaces Audit class interfaces support the look up of information from the .Xr audit_class 5 database: +.Xr endauclass 3 , .Xr getauclassent 3 , .Xr getauclassent_r 3 , .Xr getauclassnam 3 , .Xr getauclassnam_r 3 , -.Xr setauclass 3 , -.Xr endauclass 3 . +.Xr setauclass 3 . .Ss Audit Control Interfaces Audit control interfaces support the look up of information from the .Xr audit_control 5 database: +.Xr endac 3 , .Xr setac 3 , -.Xr endac 3 , .Xr getacdir 3 , +.Xr getacflg 3 , .Xr getacmin 3 , -.Xr getacflg 3 , .Xr getacna 3 . .Ss Audit Event Interfaces Audit event interfaces support the look up of information from the .Xr audit_event 5 database: +.Xr endauevent 3 , .Xr setauevent 3 , -.Xr endauevent 3 , .Xr getauevent 3 , .Xr getauevent_r 3 , .Xr getauevnam 3 , .Xr getauevnam_r 3 , -.Xr getauevnum 3 , -.Xr getauevnum_r 3 , .Xr getauevnonam 3 , .Xr getauevnonam_r 3 , +.Xr getauevnum 3 , +.Xr getauevnum_r 3 . .Ss Audit I/O Interfaces Audit I/O interfaces support the processing and printing of tokens, as well as the reading of audit records: @@ -117,9 +116,9 @@ .Ss Audit Notification Interfaces Audit notification routines track audit state in a form permitting efficient update, avoiding frequent system calls to check the kernel audit state: +.Xr au_get_state 3 , .Xr au_notify_initialize 3 , -.Xr au_notify_terminate 3 , -.Xr au_get_state 3 . +.Xr au_notify_terminate 3 . These interfaces are implemented only for Darwin/Mac OS X. .Ss Audit Token Interface Audit token interfaces permit the creation of tokens for use in creating @@ -127,63 +126,63 @@ Each interface converts a C type to its .Vt token_t representation. +.Xr au_to_arg 3 , .Xr au_to_arg32 3 , .Xr au_to_arg64 3 , -.Xr au_to_arg 3 , .Xr au_to_attr64 3 , .Xr au_to_data 3 , +.Xr au_to_exec_args 3 , +.Xr au_to_exec_env 3 , .Xr au_to_exit 3 , +.Xr au_to_file 3 , .Xr au_to_groups 3 , -.Xr au_to_newgroups 3 , +.Xr au_to_header32 3 , +.Xr au_to_header64 3 , .Xr au_to_in_addr 3 , .Xr au_to_in_addr_ex 3 , .Xr au_to_ip 3 , .Xr au_to_ipc 3 , .Xr au_to_ipc_perm 3 , .Xr au_to_iport 3 , +.Xr au_to_me 3 , +.Xr au_to_newgroups 3 , .Xr au_to_opaque 3 , -.Xr au_to_file 3 , -.Xr au_to_text 3 , .Xr au_to_path 3 , +.Xr au_to_process 3 , .Xr au_to_process32 3 , .Xr au_to_process64 3 , -.Xr au_to_process 3 , +.Xr au_to_process_ex 3 , .Xr au_to_process32_ex 3 , .Xr au_to_process64_ex 3 , -.Xr au_to_process_ex 3 , +.Xr au_to_return 3 , .Xr au_to_return32 3 , .Xr au_to_return64 3 , -.Xr au_to_return 3 , .Xr au_to_seq 3 , .Xr au_to_socket 3 , .Xr au_to_socket_ex_32 3 , .Xr au_to_socket_ex_128 3 , +.Xr au_to_sock_inet 3 , .Xr au_to_sock_inet32 3 , .Xr au_to_sock_inet128 3 , -.Xr au_to_sock_inet 3 , +.Xr au_to_subject 3 , .Xr au_to_subject32 3 , .Xr au_to_subject64 3 , -.Xr au_to_subject 3 , +.Xr au_to_subject_ex 3 , .Xr au_to_subject32_ex 3 , .Xr au_to_subject64_ex 3 , -.Xr au_to_subject_ex 3 , -.Xr au_to_me 3 , -.Xr au_to_exec_args 3 , -.Xr au_to_exec_env 3 , -.Xr au_to_header32 3 , -.Xr au_to_header64 3 , +.Xr au_to_text 3 , .Xr au_to_trailer 3 . .Ss Audit User Interfaces Audit user interfaces support the look up of information from the .Xr audit_user 5 database: +.Xr au_user_mask 3 , +.Xr endauuser 3 , .Xr setauuser 3 , -.Xr endauuser 3 , .Xr getauuserent 3 , .Xr getauuserent_r 3 , .Xr getauusernam 3 , .Xr getauusernam_r 3 , -.Xr au_user_mask 3 , .Xr getfauditflags 3 . .Sh SEE ALSO .Xr au_class 3 , ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#5 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#4 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#5 $ .\" .Dd May 1, 2005 .Dt AUDIT.LOG 5 @@ -204,7 +204,7 @@ token contains an IP packet header in network byte order. An .Dv ip -token can be cread using +token can be created using .Xr au_to_ip 3 . .Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" .It Sy "Field" Ta Sy Bytes Ta Sy Description @@ -249,7 +249,7 @@ A .Dv path token can be created using -.Xr auto_path 3 . +.Xr au_to_path 3 . .Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" .It Sy "Field" Ta Sy Bytes Ta Sy Description .It Li "Token ID" Ta "1 byte" Ta "Token ID" @@ -262,7 +262,7 @@ token contains a set of nul-terminated path names. The .Xr libbsm 3 -API cannot currently create an +API cannot currently create a .Dv path_attr token. .Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" @@ -283,7 +283,7 @@ This includes both the traditional .Ux security properties, such as user IDs and group IDs, but also audit -information such as the audit user ID and sesion. +information such as the audit user ID and session. A .Dv process token can be created using @@ -310,12 +310,12 @@ .Dv process token, with the addition of a machine address type and variable length address storage capable of containing IPv6 addresses. -A +An .Dv expanded process token can be created using .Xr au_to_process32_ex 3 or -.Xr au_to_process64 3 . +.Xr au_to_process64_ex 3 . .Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" .It Sy "Field" Ta Sy Bytes Ta Sy Description .It Li "Token ID" Ta "1 byte" Ta "Token ID" @@ -385,7 +385,7 @@ .Dv subject token, with the addition of type/length and variable size machine address information in the terminal ID. -A +An .Dv expanded subject token can be created using .Xr au_to_subject32_ex 3 @@ -412,7 +412,7 @@ .Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" .It Sy "Field" Ta Sy Bytes Ta Sy Description .It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li "object ID type" Ta "1 byte" Ta "Object ID" +.It Li "Object ID type" Ta "1 byte" Ta "Object ID" .It Li "Object ID" Ta "4 bytes" Ta "Object ID" .El .Ss Text Token @@ -438,7 +438,7 @@ .Dv path tokens may also be present in an audit record indicating which path, if any, was used to reach the object. -A +An .Dv attribute token can be created using .Xr au_to_attr32 3 @@ -593,8 +593,8 @@ .It Li XXXXX .El .Sh SEE ALSO -.Xr audit 8, -.Xr libbsm 3 +.Xr libbsm 3 , +.Xr audit 8 .Sh AUTHORS The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_class.5#5 (text+ko) ==== @@ -25,9 +25,9 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_class.5#4 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_class.5#5 $ .\" -.Dd Jan 24, 2004 +.Dd January 24, 2004 .Dt AUDIT_CLASS 5 .Os .Sh NAME @@ -40,8 +40,9 @@ Each auditable event is a member of an event class. Each line maps an audit event mask (bitmap) to a class and a description. -Entries are of the form -.Dl classmask:eventclass:description. +Entries are of the form: +.Pp +.Dl classmask:eventclass:description .Pp Example entries in this file are: .Bd -literal -offset indent ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_control.5#5 (text+ko) ==== @@ -25,9 +25,9 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_control.5#4 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_control.5#5 $ .\" -.Dd Jan 24, 2004 +.Dd January 4, 2006 .Dt AUDIT_CONTROL 5 .Os .Sh NAME @@ -38,7 +38,9 @@ .Nm file contains several audit system parameters. Each line of this file is of the form: -.Dl parameter:value. +.Pp +.Dl parameter:value +.Pp The parameters are: .Bl -tag -width Ds .It Pa dir @@ -63,13 +65,15 @@ Not currently used as the value of 20 percent is chosen by the kernel. .El .Sh AUDIT FLAGS -Audit flags are a comma delimited list of audit classes as defined in the -audit_class file. +Audit flags are a comma-delimited list of audit classes as defined in the +.Pa audit_class +file. See .Xr audit_class 5 for details. Event classes may be preceded by a prefix which changes their interpretation. The following prefixes may be used for each class: +.Pp .Bl -tag -width Ds -compact -offset indent .It + Record successful events @@ -78,9 +82,9 @@ .It ^ Record both successful and failed events .It ^+ -Don't record successful events +Do not record successful events .It ^- -Don't record failed events +Do not record failed events .El .Sh DEFAULT The following settings appear in the default @@ -88,7 +92,7 @@ file: .Bd -literal -offset indent dir:/var/audit -flags:lo,ad,-all,^-fc,^-cl +flags:lo minfree:20 naflags:lo .Ed @@ -96,17 +100,16 @@ The .Va flags parameter above specifies the system-wide mask corresponding to login/logout -events, administrative events, and all failures except for failures in creating -or closing files. +events. .Sh FILES .Bl -tag -width "/etc/security/audit_control" -compact .It Pa /etc/security/audit_control .El .Sh SEE ALSO -.Xr audit 1 , -.Xr auditd 8 , .Xr audit_class 5 , -.Xr audit_user 5 +.Xr audit_user 5 , +.Xr audit 8 , +.Xr auditd 8 .Sh AUTHORS This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_event.5#5 (text+ko) ==== @@ -25,9 +25,9 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_event.5#4 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_event.5#5 $ .\" -.Dd Jan 24, 2004 +.Dd January 24, 2004 .Dt AUDIT_EVENT 5 .Os .Sh NAME @@ -38,11 +38,15 @@ .Nm file contains descriptions of the auditable events on the system. Each line maps an audit event number to a name, a description, and a class. -Entries are of the form -.Dl eventnum:eventname:description:eventclass . +Entries are of the form: +.Pp +.Dl eventnum:eventname:description:eventclass +.Pp Each .Vt eventclass -should have a corresponding entry in the audit_class file. +should have a corresponding entry in the +.Pa audit_class +file. See .Xr audit_class 5 for details. ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_user.5#5 (text+ko) ==== @@ -25,9 +25,9 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_user.5#4 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_user.5#5 $ .\" -.Dd Jan 24, 2004 +.Dd February 5, 2006 .Dt AUDIT_USER 5 .Os .Sh NAME @@ -44,9 +44,11 @@ .Pp Each line maps a user name to a list of classes that should be audited and a list of classes that should not be audited. -Entries are of the form of -.Dl username:alwaysaudit:neveraudit , -where +Entries are of the form: +.Pp +.Dl username:alwaysaudit:neveraudit +.Pp +In the format above, .Vt alwaysaudit is a set of event classes that are always audited, and .Vt neveraudit @@ -64,8 +66,8 @@ jdoe:-fc,ad:+fw .Ed .Pp -These settings would cause login and administrative events that succeed on -behalf of user root to be audited. +These settings would cause login/logout and administrative events that +succeed on behalf of user root to be audited. No failure events are audited. For the user .Em jdoe , ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_warn.5#5 (text+ko) ==== @@ -25,9 +25,9 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_warn.5#4 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_warn.5#5 $ .\" -.Dd Mar 17, 2004 +.Dd March 17, 2004 .Dt AUDIT_WARN 5 .Os .Sh NAME ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditon.2#5 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditon.2#4 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditon.2#5 $ .\" .Dd April 19, 2005 .Dt AUDITON 2 @@ -53,8 +53,9 @@ .It Dv A_SETPOLICY Set audit policy flags. .Ft *data -must point to an long value set to one of the audit -policy control values defined in audit.h. +must point to a long value set to one of the audit +policy control values defined in +.Pa audit.h . Currently, only .Dv AUDIT_CNT and @@ -83,7 +84,7 @@ .It Dv A_SETQCTRL Set kernel audit queue parameters. .Ft *data -must point to a +must point to a .Ft au_qctrl_t structure containing the kernel audit queue control settings: @@ -106,7 +107,7 @@ .It Dv A_SETCOND Set the current auditing condition. .Ft *data -must point to an long value containing the new +must point to a long value containing the new audit condition, one of .Dv AUC_AUDITING , .Dv AUC_NOAUDIT , @@ -115,13 +116,13 @@ .It Dv A_SETCLASS Set the event class preselection mask for an audit event. .Ft *data -must point to a +must point to a .Ft au_evclass_map_t structure containing the audit event and mask. .It Dv A_SETPMASK Set the preselection masks for a process. .Ft *data -must point to a +must point to a .Ft auditpinfo_t structure that contains the given process's audit preselection masks for both success and failure. @@ -167,7 +168,7 @@ .It Dv A_GETPOLICY Return the current audit policy setting. .Ft *data -must point to an long value which will be set to +must point to a long value which will be set to one of the current audit policy flags. Currently, only .Dv AUDIT_CNT @@ -188,8 +189,8 @@ .Ft au_fstat_t structure. The .Ft af_filesz -field will set to the maximum audit log file size. A value of 0 -indicates no limit to the size. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Feb 5 13:24:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CAED16A423; Sun, 5 Feb 2006 13:24:45 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2765D16A420 for ; Sun, 5 Feb 2006 13:24:45 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA46143D45 for ; Sun, 5 Feb 2006 13:24:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k15DOixo034567 for ; Sun, 5 Feb 2006 13:24:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k15DOimq034564 for perforce@freebsd.org; Sun, 5 Feb 2006 13:24:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Feb 2006 13:24:44 GMT Message-Id: <200602051324.k15DOimq034564@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91160 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2006 13:24:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=91160 Change 91160 by rwatson@rwatson_zoo on 2006/02/05 13:24:16 Correct typo: allocate size of record, not size of pointer, caught immediately by kassert on test box. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#7 (text+ko) ==== @@ -636,7 +636,7 @@ cv_init(&audit_fail_cv, "audit_fail_cv"); audit_record_zone = uma_zcreate("audit_record_zone", - sizeof(struct kaudit_record *), audit_record_ctor, + sizeof(struct kaudit_record), audit_record_ctor, audit_record_dtor, NULL, NULL, UMA_ALIGN_PTR, 0); /* Initialize the BSM audit subsystem. */ From owner-p4-projects@FreeBSD.ORG Sun Feb 5 13:29:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCAC216A423; Sun, 5 Feb 2006 13:29:51 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 90BEC16A420 for ; Sun, 5 Feb 2006 13:29:51 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D76D43D48 for ; Sun, 5 Feb 2006 13:29:51 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k15DTp6A034812 for ; Sun, 5 Feb 2006 13:29:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k15DTpj0034809 for perforce@freebsd.org; Sun, 5 Feb 2006 13:29:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Feb 2006 13:29:51 GMT Message-Id: <200602051329.k15DTpj0034809@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91161 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2006 13:29:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=91161 Change 91161 by rwatson@rwatson_zoo on 2006/02/05 13:29:30 Some additional todo items. Affected files ... .. //depot/projects/trustedbsd/audit3/notes/TODO_audit.txt#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/notes/TODO_audit.txt#3 (text+ko) ==== @@ -64,3 +64,17 @@ - Expand the subject token to include jail information. Add this informtion for processes that are running in a jail. + +- Allow gathering of information on a second file descriptor argument; this +is rquired for system calls taking two file descriptors. Specifically, +sendfile(). + +- Start updating the statistics in struct audit_stat. Export via a sysctl +or system call. + +- Provide a way for user space to walk the list of event mappings present +in the kernel, so that when synchronizing the user and kernel versions of +the list, entries removed from the user space file can be removed from the +kernel event mapping. Make the synchronization code a library function in +OpenBSM so that the same code can be used in both auditd and the audit +test suite. From owner-p4-projects@FreeBSD.ORG Sun Feb 5 14:26:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0391216A423; Sun, 5 Feb 2006 14:26:05 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B755B16A420 for ; Sun, 5 Feb 2006 14:26:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA6D143D60 for ; Sun, 5 Feb 2006 14:25:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k15EPxEC039669 for ; Sun, 5 Feb 2006 14:25:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k15EPxft039666 for perforce@freebsd.org; Sun, 5 Feb 2006 14:25:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Feb 2006 14:25:59 GMT Message-Id: <200602051425.k15EPxft039666@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91163 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2006 14:26:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=91163 Change 91163 by rwatson@rwatson_zoo on 2006/02/05 14:25:13 Shift namei bits right 8 bits, so as to be consistent with current allocation of bits on FreeBSD. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/sys/namei.h#5 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/sys/namei.h#5 (text+ko) ==== @@ -139,8 +139,8 @@ #define NOMACCHECK 0x0800000 /* do not perform MAC checks */ #define MPSAFE 0x1000000 /* namei() must acquire Giant if needed. */ #define GIANTHELD 0x2000000 /* namei() is holding giant. */ -#define AUDITVNODE1 0x40000000 /* audit the looked up vnode information */ -#define AUDITVNODE2 0x80000000 /* audit the looked up vnode information */ +#define AUDITVNODE1 0x4000000 /* audit the looked up vnode information */ +#define AUDITVNODE2 0x8000000 /* audit the looked up vnode information */ #define PARAMASK 0xffffe00 /* mask of parameter descriptors */ #define NDHASGIANT(NDP) (((NDP)->ni_cnd.cn_flags & GIANTHELD) != 0) From owner-p4-projects@FreeBSD.ORG Sun Feb 5 17:01:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 672F616A423; Sun, 5 Feb 2006 17:01:20 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2574416A420 for ; Sun, 5 Feb 2006 17:01:20 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E712743D49 for ; Sun, 5 Feb 2006 17:01:19 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k15H1Jdd055894 for ; Sun, 5 Feb 2006 17:01:19 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k15H1JWp055891 for perforce@freebsd.org; Sun, 5 Feb 2006 17:01:19 GMT (envelope-from wsalamon@computer.org) Date: Sun, 5 Feb 2006 17:01:19 GMT Message-Id: <200602051701.k15H1JWp055891@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 91166 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2006 17:01:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=91166 Change 91166 by wsalamon@gretsch on 2006/02/05 17:00:44 Test code library now loads the kernel event->class mapping. Affected files ... .. //depot/projects/trustedbsd/audit3/notes/TODO_audit.txt#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/notes/TODO_audit.txt#4 (text+ko) ==== @@ -59,9 +59,6 @@ - Write some utility apps to query the state of auditing, manipulate the audit event table in the kernel, and other useful things. -- Add a function to the audit test library to load the kernel event->class -mapping so auditd need not be run before testing. - - Expand the subject token to include jail information. Add this informtion for processes that are running in a jail. From owner-p4-projects@FreeBSD.ORG Sun Feb 5 19:20:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F44216A422; Sun, 5 Feb 2006 19:20:18 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 39F1516A423 for ; Sun, 5 Feb 2006 19:20:18 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECE4E43D48 for ; Sun, 5 Feb 2006 19:20:17 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k15JKHGt062383 for ; Sun, 5 Feb 2006 19:20:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k15JKHcB062380 for perforce@freebsd.org; Sun, 5 Feb 2006 19:20:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Feb 2006 19:20:17 GMT Message-Id: <200602051920.k15JKHcB062380@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91177 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2006 19:20:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=91177 Change 91177 by rwatson@rwatson_peppercorn on 2006/02/05 19:19:17 Support for chowning an audit trail to a specific group, if configured. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#11 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#11 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#10 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#11 $ */ #include @@ -46,6 +46,7 @@ #include #include +#include #include #include #include @@ -171,6 +172,34 @@ } /* + * Create the new audit file with appropriate permissions and ownership. Try + * to clean up if something goes wrong. + */ +static int +#ifdef AUDIT_REVIEW_GROUP +open_trail(const char *fname, uid_t uid, gid_t gid) +#else +open_trail(const char *fname) +#endif +{ + int error, fd; + + fd = open(fname, O_RDONLY | O_CREAT, S_IRUSR | S_IRGRP); + if (fd < 0) + return (-1); +#ifdef AUDIT_REVIEW_GROUP + if (fchown(fd, uid, gid) < 0) { + error = errno; + close(fd); + (void)unlink(fname); + errno = error; + return (-1); + } +#endif + return (fd); +} + +/* * Create the new file name, swap with existing audit file. */ static int @@ -180,7 +209,12 @@ char *fn; char TS[POSTFIX_LEN]; struct dir_ent *dirent; - int fd; +#ifdef AUDIT_REVIEW_GROUP + struct group *grp; + gid_t gid; + uid_t uid; +#endif + int error, fd; if (getTSstr(TS, POSTFIX_LEN) != 0) return (-1); @@ -188,6 +222,22 @@ strcpy(timestr, TS); strcat(timestr, NOT_TERMINATED); +#ifdef AUDIT_REVIEW_GROUP + /* + * XXXRW: Currently, this code falls back to the daemon gid, which is + * likely the wheel group. Is there a better way to deal with this? + */ + grp = getgrnam(AUDIT_REVIEW_GROUP); + if (grp == NULL) { + syslog(LOG_INFO, + "Audit review group '%s' not available, using daemon gid", + AUDIT_REVIEW_GROUP); + gid = -1; + } else + gid = grp->gr_gid; + uid = getuid(); +#endif + /* Try until we succeed. */ while ((dirent = TAILQ_FIRST(&dir_q))) { if ((fn = affixdir(timestr, dirent)) == NULL) { @@ -201,20 +251,27 @@ * kernel if all went well. */ syslog(LOG_INFO, "New audit file is %s\n", fn); - fd = open(fn, O_RDONLY | O_CREAT, S_IRUSR | S_IRGRP); +#ifdef AUDIT_REVIEW_GROUP + fd = open_trail(fn, uid, gid); +#else + fd = open_trail(fn); +#endif if (fd < 0) - perror("File open"); - else if (auditctl(fn) != 0) { - syslog(LOG_ERR, - "auditctl failed setting log file! : %s\n", - strerror(errno)); - close(fd); - } else { - /* Success. */ - close_lastfile(TS); - lastfile = fn; - close(fd); - return (0); + warn("open(%s)", fn); + if (fd >= 0) { + error = auditctl(fn); + if (error) { + syslog(LOG_ERR, + "auditctl failed setting log file! : %s\n", + strerror(errno)); + close(fd); + } else { + /* Success. */ + close_lastfile(TS); + lastfile = fn; + close(fd); + return (0); + } } /* ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#4 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#5 $ */ #ifndef _AUDITD_H_ @@ -43,6 +43,13 @@ #define MAX_DIR_SIZE 255 #define AUDITD_NAME "auditd" +/* + * If defined, then the audit daemon will attempt to chown newly created logs + * to this group. Otherwise, they will be the default for the user running + * auditd, likely the audit group. + */ +#define AUDIT_REVIEW_GROUP "audit" + #define POSTFIX_LEN 16 #define NOT_TERMINATED ".not_terminated" From owner-p4-projects@FreeBSD.ORG Sun Feb 5 19:40:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE14716A423; Sun, 5 Feb 2006 19:40:43 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7583616A420 for ; Sun, 5 Feb 2006 19:40:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2678943D46 for ; Sun, 5 Feb 2006 19:40:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k15JegNB063344 for ; Sun, 5 Feb 2006 19:40:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k15Jegw3063341 for perforce@freebsd.org; Sun, 5 Feb 2006 19:40:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Feb 2006 19:40:42 GMT Message-Id: <200602051940.k15Jegw3063341@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91178 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2006 19:40:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=91178 Change 91178 by rwatson@rwatson_zoo on 2006/02/05 19:39:50 Replicate CVS change to allocate gid to audit group (second try). Affected files ... .. //depot/projects/trustedbsd/audit3/etc/group#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/etc/group#4 (text+ko) ==== @@ -24,6 +24,7 @@ uucp:*:66: dialer:*:68: network:*:69: +audit:*:77: www:*:80: nogroup:*:65533: nobody:*:65534: From owner-p4-projects@FreeBSD.ORG Sun Feb 5 19:41:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 628EC16A423; Sun, 5 Feb 2006 19:41:45 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2276D16A420 for ; Sun, 5 Feb 2006 19:41:45 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB36343D4C for ; Sun, 5 Feb 2006 19:41:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k15Jfib8063448 for ; Sun, 5 Feb 2006 19:41:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k15Jfio3063445 for perforce@freebsd.org; Sun, 5 Feb 2006 19:41:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Feb 2006 19:41:44 GMT Message-Id: <200602051941.k15Jfio3063445@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91179 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2006 19:41:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=91179 Change 91179 by rwatson@rwatson_zoo on 2006/02/05 19:40:53 Mention comment support in /etc/security files for alpha 1. Add audit event for sysarch() system call on FreeBSD. Affected files ... .. //depot/projects/trustedbsd/openbsm/CHANGELOG#8 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#37 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/CHANGELOG#8 (text+ko) ==== @@ -71,5 +71,6 @@ - Annotate BSM events with origin OS and compatibility information. - auditd(8), audit(8) added to the OpenBSM distribution. auditd extended to support reloading of kernel event table. +- Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/CHANGELOG#7 $ +$P4: //depot/projects/trustedbsd/openbsm/CHANGELOG#8 $ ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#37 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#36 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#37 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -383,6 +383,7 @@ #define AUE_ACL_DELETE_FD 403 /* FreeBSD. */ #define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ #define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ +#define AUE_SYSARCH 406 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the From owner-p4-projects@FreeBSD.ORG Sun Feb 5 21:38:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49C4C16A423; Sun, 5 Feb 2006 21:38:34 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0C73A16A420 for ; Sun, 5 Feb 2006 21:38:34 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C9D4A43D45 for ; Sun, 5 Feb 2006 21:38:33 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k15LcXDB077012 for ; Sun, 5 Feb 2006 21:38:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k15LcX4a077009 for perforce@freebsd.org; Sun, 5 Feb 2006 21:38:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Feb 2006 21:38:33 GMT Message-Id: <200602052138.k15LcX4a077009@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91187 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2006 21:38:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=91187 Change 91187 by rwatson@rwatson_peppercorn on 2006/02/05 21:38:24 When exiting a thread, submit any pending record. Today, we don't audit thread exit, but should that happen, this will prevent unhappiness, as the thread exit system call will never return, and hence not commit the record. Pointed out by/with: cognet Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/kern_thread.c#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/kern_thread.c#7 (text+ko) ==== @@ -471,6 +471,10 @@ (long)p->p_pid, p->p_comm); KASSERT(TAILQ_EMPTY(&td->td_sigqueue.sq_list), ("signal pending")); +#ifdef AUDIT + AUDIT_SYSCALL_EXIT(0, td); +#endif + if (td->td_standin != NULL) { /* * Note that we don't need to free the cred here as it From owner-p4-projects@FreeBSD.ORG Sun Feb 5 21:40:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2789016A423; Sun, 5 Feb 2006 21:40:37 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0191716A420 for ; Sun, 5 Feb 2006 21:40:37 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C3E2143D46 for ; Sun, 5 Feb 2006 21:40:36 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k15LeaGd077165 for ; Sun, 5 Feb 2006 21:40:36 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k15LeaVJ077162 for perforce@freebsd.org; Sun, 5 Feb 2006 21:40:36 GMT (envelope-from alc@freebsd.org) Date: Sun, 5 Feb 2006 21:40:36 GMT Message-Id: <200602052140.k15LeaVJ077162@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 91188 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2006 21:40:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=91188 Change 91188 by alc@alc_home on 2006/02/05 21:40:13 The contiguity-aware uma_small_alloc() utilizes a vm object. So, "booted" must not be set until the virtual memory system is initialized. In fact, this change just eliminates the early setting of "booted", relying on the setting of "booted" in uma_startup2(). Affected files ... .. //depot/projects/superpages/src/sys/vm/uma_core.c#6 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/uma_core.c#6 (text+ko) ==== @@ -1664,10 +1664,6 @@ bucket_init(); -#ifdef UMA_MD_SMALL_ALLOC - booted = 1; -#endif - #ifdef UMA_DEBUG printf("UMA startup complete.\n"); #endif From owner-p4-projects@FreeBSD.ORG Sun Feb 5 21:48:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E359A16A420; Sun, 5 Feb 2006 21:48:47 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8CA5616A420 for ; Sun, 5 Feb 2006 21:48:47 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1CE7543D46 for ; Sun, 5 Feb 2006 21:48:47 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k15LmknN077452 for ; Sun, 5 Feb 2006 21:48:47 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k15Lmkem077449 for perforce@freebsd.org; Sun, 5 Feb 2006 21:48:46 GMT (envelope-from alc@freebsd.org) Date: Sun, 5 Feb 2006 21:48:46 GMT Message-Id: <200602052148.k15Lmkem077449@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 91189 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2006 21:48:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=91189 Change 91189 by alc@alc_home on 2006/02/05 21:48:15 A contiguity-aware reimplementation of uma_small_alloc(). This improves performance by reducing the number of 2MB page TLB misses for heap allocated data accessed through the direct map. Affected files ... .. //depot/projects/superpages/src/sys/amd64/amd64/uma_machdep.c#2 edit Differences ... ==== //depot/projects/superpages/src/sys/amd64/amd64/uma_machdep.c#2 (text+ko) ==== @@ -28,10 +28,12 @@ __FBSDID("$FreeBSD: src/sys/amd64/amd64/uma_machdep.c,v 1.1 2003/10/14 05:51:31 alc Exp $"); #include +#include #include #include #include #include +#include #include #include #include @@ -39,11 +41,29 @@ #include #include +static struct vm_object uma_small_object_store; + +static void uma_small_init(void *notused); +SYSINIT(uma_small, SI_SUB_VM, SI_ORDER_SECOND, uma_small_init, NULL) + +static void +uma_small_init(void *notused) +{ + vm_object_t object; + + object = &uma_small_object_store; + VM_OBJECT_LOCK_INIT(object, "uma small object"); + _vm_object_allocate(OBJT_DEFAULT, cnt.v_page_count, object); + object->pg_color = 0; + vm_object_set_flag(object, OBJ_SUPERPAGES); +} + void * uma_small_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) { - static vm_pindex_t colour; + vm_object_t object; vm_page_t m; + vm_pindex_t pindex; void *va; int pflags; @@ -54,8 +74,12 @@ pflags = VM_ALLOC_SYSTEM; if (wait & M_ZERO) pflags |= VM_ALLOC_ZERO; - for (;;) { - m = vm_page_alloc(NULL, colour++, pflags | VM_ALLOC_NOOBJ); + for (object = &uma_small_object_store;;) { + VM_OBJECT_LOCK(object); + m = TAILQ_LAST(&object->memq, pglist); + pindex = m != NULL ? m->pindex + 1 : 0; + m = vm_page_alloc(object, pindex, pflags); + VM_OBJECT_UNLOCK(object); if (m == NULL) { if (wait & M_NOWAIT) return (NULL); @@ -73,10 +97,14 @@ void uma_small_free(void *mem, int size, u_int8_t flags) { + vm_object_t object; vm_page_t m; + object = &uma_small_object_store; m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)mem)); + VM_OBJECT_LOCK(object); vm_page_lock_queues(); vm_page_free(m); vm_page_unlock_queues(); + VM_OBJECT_UNLOCK(object); } From owner-p4-projects@FreeBSD.ORG Sun Feb 5 23:09:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23B2B16A426; Sun, 5 Feb 2006 23:09:26 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B664416A430 for ; Sun, 5 Feb 2006 23:09:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 731C843D45 for ; Sun, 5 Feb 2006 23:09:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k15N9PA1081948 for ; Sun, 5 Feb 2006 23:09:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k15N9PhE081945 for perforce@freebsd.org; Sun, 5 Feb 2006 23:09:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Feb 2006 23:09:25 GMT Message-Id: <200602052309.k15N9PhE081945@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91192 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2006 23:09:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=91192 Change 91192 by rwatson@rwatson_peppercorn on 2006/02/05 23:08:48 Follow same general strategy for syscalls.isc as other syscall tables: don't assign signal-related AUE event numbers that are actually AUE_NULL. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_isc_syscall.h#4 edit .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_isc_sysent.c#4 edit .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/syscalls.isc#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_isc_syscall.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_isc_sysent.c#4 (text+ko) ==== @@ -22,21 +22,21 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 1 = isc_setostype */ { SYF_MPSAFE | AS(ibcs2_rename_args), (sy_call_t *)ibcs2_rename, AUE_RENAME }, /* 2 = ibcs2_rename */ - { SYF_MPSAFE | AS(ibcs2_sigaction_args), (sy_call_t *)ibcs2_sigaction, AUE_SIGACTION }, /* 3 = ibcs2_sigaction */ - { AS(ibcs2_sigprocmask_args), (sy_call_t *)ibcs2_sigprocmask, AUE_SIGPROCMASK }, /* 4 = ibcs2_sigprocmask */ - { SYF_MPSAFE | AS(ibcs2_sigpending_args), (sy_call_t *)ibcs2_sigpending, AUE_SIGPENDING }, /* 5 = ibcs2_sigpending */ + { SYF_MPSAFE | AS(ibcs2_sigaction_args), (sy_call_t *)ibcs2_sigaction, AUE_NULL }, /* 3 = ibcs2_sigaction */ + { AS(ibcs2_sigprocmask_args), (sy_call_t *)ibcs2_sigprocmask, AUE_NULL }, /* 4 = ibcs2_sigprocmask */ + { SYF_MPSAFE | AS(ibcs2_sigpending_args), (sy_call_t *)ibcs2_sigpending, AUE_NULL }, /* 5 = ibcs2_sigpending */ { SYF_MPSAFE | AS(getgroups_args), (sy_call_t *)getgroups, AUE_GETGROUPS }, /* 6 = getgroups */ { SYF_MPSAFE | AS(setgroups_args), (sy_call_t *)setgroups, AUE_SETGROUPS }, /* 7 = setgroups */ { SYF_MPSAFE | AS(ibcs2_pathconf_args), (sy_call_t *)ibcs2_pathconf, AUE_PATHCONF }, /* 8 = ibcs2_pathconf */ { SYF_MPSAFE | AS(ibcs2_fpathconf_args), (sy_call_t *)ibcs2_fpathconf, AUE_FPATHCONF }, /* 9 = ibcs2_fpathconf */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 10 = nosys */ - { SYF_MPSAFE | AS(ibcs2_wait_args), (sy_call_t *)ibcs2_wait, AUE_O_WAIT }, /* 11 = ibcs2_wait */ + { SYF_MPSAFE | AS(ibcs2_wait_args), (sy_call_t *)ibcs2_wait, AUE_WAIT4 }, /* 11 = ibcs2_wait */ { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_SETSID }, /* 12 = setsid */ { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_GETPID }, /* 13 = getpid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 14 = isc_adduser */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 15 = isc_setuser */ { SYF_MPSAFE | AS(ibcs2_sysconf_args), (sy_call_t *)ibcs2_sysconf, AUE_NULL }, /* 16 = ibcs2_sysconf */ - { SYF_MPSAFE | AS(ibcs2_sigsuspend_args), (sy_call_t *)ibcs2_sigsuspend, AUE_SIGSUSPEND }, /* 17 = ibcs2_sigsuspend */ + { SYF_MPSAFE | AS(ibcs2_sigsuspend_args), (sy_call_t *)ibcs2_sigsuspend, AUE_NULL }, /* 17 = ibcs2_sigsuspend */ { SYF_MPSAFE | AS(ibcs2_symlink_args), (sy_call_t *)ibcs2_symlink, AUE_SYMLINK }, /* 18 = ibcs2_symlink */ { SYF_MPSAFE | AS(ibcs2_readlink_args), (sy_call_t *)ibcs2_readlink, AUE_READLINK }, /* 19 = ibcs2_readlink */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 20 = isc_getmajor */ ==== //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/syscalls.isc#4 (text+ko) ==== @@ -11,13 +11,13 @@ 0 AUE_NULL UNIMPL nosys 1 AUE_NULL UNIMPL isc_setostype 2 AUE_RENAME MNOPROTO { int ibcs2_rename(char *from, char *to); } -3 AUE_SIGACTION MNOPROTO { int ibcs2_sigaction(int sig, \ +3 AUE_NULL MNOPROTO { int ibcs2_sigaction(int sig, \ struct ibcs2_sigaction *act, \ struct ibcs2_sigaction *oact); } -4 AUE_SIGPROCMASK NOPROTO { int ibcs2_sigprocmask(int how, \ +4 AUE_NULL NOPROTO { int ibcs2_sigprocmask(int how, \ ibcs2_sigset_t *set, \ ibcs2_sigset_t *oset); } -5 AUE_SIGPENDING MNOPROTO { int ibcs2_sigpending(ibcs2_sigset_t *mask); } +5 AUE_NULL MNOPROTO { int ibcs2_sigpending(ibcs2_sigset_t *mask); } 6 AUE_GETGROUPS MNOPROTO { int getgroups(u_int gidsetsize, \ gid_t *gidset); } 7 AUE_SETGROUPS MNOPROTO { int setgroups(u_int gidsetsize, \ @@ -25,13 +25,13 @@ 8 AUE_PATHCONF MNOPROTO { int ibcs2_pathconf(char *path, int name); } 9 AUE_FPATHCONF MNOPROTO { int ibcs2_fpathconf(int fd, int name); } 10 AUE_NULL UNIMPL nosys -11 AUE_O_WAIT MNOPROTO { int ibcs2_wait(int a1, int a2, int a3); } +11 AUE_WAIT4 MNOPROTO { int ibcs2_wait(int a1, int a2, int a3); } 12 AUE_SETSID MNOPROTO { int setsid(void); } 13 AUE_GETPID MNOPROTO { pid_t getpid(void); } 14 AUE_NULL UNIMPL isc_adduser 15 AUE_NULL UNIMPL isc_setuser 16 AUE_NULL MNOPROTO { int ibcs2_sysconf(int name); } -17 AUE_SIGSUSPEND MNOPROTO { int ibcs2_sigsuspend(ibcs2_sigset_t *mask); } +17 AUE_NULL MNOPROTO { int ibcs2_sigsuspend(ibcs2_sigset_t *mask); } 18 AUE_SYMLINK MNOPROTO { int ibcs2_symlink(char *path, char *link); } 19 AUE_READLINK MNOPROTO { int ibcs2_readlink(char *path, char *buf, \ int count); } From owner-p4-projects@FreeBSD.ORG Sun Feb 5 23:22:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E98A16A424; Sun, 5 Feb 2006 23:22:43 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CFB7716A420 for ; Sun, 5 Feb 2006 23:22:42 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8DAD943D45 for ; Sun, 5 Feb 2006 23:22:42 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k15NMgCt082590 for ; Sun, 5 Feb 2006 23:22:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k15NMgH1082587 for perforce@freebsd.org; Sun, 5 Feb 2006 23:22:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Feb 2006 23:22:42 GMT Message-Id: <200602052322.k15NMgH1082587@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91194 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2006 23:22:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=91194 Change 91194 by rwatson@rwatson_peppercorn on 2006/02/05 23:21:54 Make syscalls.xenix consistent with other mappings of system calls to audit event identifiers: remove signal receive related events which are actually defined as AUE_NULL. Convert xenix_eaccess() to AUE_EACCESS. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_xenix.h#4 edit .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_xenix_syscall.h#4 edit .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_xenix_sysent.c#4 edit .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/syscalls.xenix#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_xenix.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_xenix_syscall.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_xenix_sysent.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ { AS(xenix_rdchk_args), (sy_call_t *)xenix_rdchk, AUE_NULL }, /* 7 = xenix_rdchk */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 8 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 9 = nosys */ - { SYF_MPSAFE | AS(xenix_chsize_args), (sy_call_t *)xenix_chsize, AUE_NULL }, /* 10 = xenix_chsize */ + { SYF_MPSAFE | AS(xenix_chsize_args), (sy_call_t *)xenix_chsize, AUE_FTRUNCATE }, /* 10 = xenix_chsize */ { SYF_MPSAFE | AS(xenix_ftime_args), (sy_call_t *)xenix_ftime, AUE_NULL }, /* 11 = xenix_ftime */ { SYF_MPSAFE | AS(xenix_nap_args), (sy_call_t *)xenix_nap, AUE_NULL }, /* 12 = xenix_nap */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 13 = xenix_sdget */ @@ -55,12 +55,12 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 34 = xenix_unexecseg */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 35 = nosys */ { SYF_MPSAFE | AS(select_args), (sy_call_t *)select, AUE_SELECT }, /* 36 = select */ - { SYF_MPSAFE | AS(xenix_eaccess_args), (sy_call_t *)xenix_eaccess, AUE_NULL }, /* 37 = xenix_eaccess */ + { SYF_MPSAFE | AS(xenix_eaccess_args), (sy_call_t *)xenix_eaccess, AUE_EACCESS }, /* 37 = xenix_eaccess */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 38 = xenix_paccess */ - { SYF_MPSAFE | AS(ibcs2_sigaction_args), (sy_call_t *)ibcs2_sigaction, AUE_SIGACTION }, /* 39 = ibcs2_sigaction */ - { SYF_MPSAFE | AS(ibcs2_sigprocmask_args), (sy_call_t *)ibcs2_sigprocmask, AUE_SIGPROCMASK }, /* 40 = ibcs2_sigprocmask */ - { SYF_MPSAFE | AS(ibcs2_sigpending_args), (sy_call_t *)ibcs2_sigpending, AUE_SIGPENDING }, /* 41 = ibcs2_sigpending */ - { SYF_MPSAFE | AS(ibcs2_sigsuspend_args), (sy_call_t *)ibcs2_sigsuspend, AUE_SIGSUSPEND }, /* 42 = ibcs2_sigsuspend */ + { SYF_MPSAFE | AS(ibcs2_sigaction_args), (sy_call_t *)ibcs2_sigaction, AUE_NULL }, /* 39 = ibcs2_sigaction */ + { SYF_MPSAFE | AS(ibcs2_sigprocmask_args), (sy_call_t *)ibcs2_sigprocmask, AUE_NULL }, /* 40 = ibcs2_sigprocmask */ + { SYF_MPSAFE | AS(ibcs2_sigpending_args), (sy_call_t *)ibcs2_sigpending, AUE_NULL }, /* 41 = ibcs2_sigpending */ + { SYF_MPSAFE | AS(ibcs2_sigsuspend_args), (sy_call_t *)ibcs2_sigsuspend, AUE_NULL }, /* 42 = ibcs2_sigsuspend */ { AS(ibcs2_getgroups_args), (sy_call_t *)ibcs2_getgroups, AUE_GETGROUPS }, /* 43 = ibcs2_getgroups */ { AS(ibcs2_setgroups_args), (sy_call_t *)ibcs2_setgroups, AUE_SETGROUPS }, /* 44 = ibcs2_setgroups */ { SYF_MPSAFE | AS(ibcs2_sysconf_args), (sy_call_t *)ibcs2_sysconf, AUE_NULL }, /* 45 = ibcs2_sysconf */ ==== //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/syscalls.xenix#4 (text+ko) ==== @@ -17,7 +17,7 @@ 7 AUE_NULL STD { int xenix_rdchk(int fd); } 8 AUE_NULL UNIMPL nosys 9 AUE_NULL UNIMPL nosys -10 AUE_NULL MSTD { int xenix_chsize(int fd, long size); } +10 AUE_FTRUNCATE MSTD { int xenix_chsize(int fd, long size); } 11 AUE_NULL MSTD { int xenix_ftime(struct timeb *tp); } 12 AUE_NULL MSTD { int xenix_nap(int millisec); } 13 AUE_NULL UNIMPL xenix_sdget @@ -46,16 +46,16 @@ 36 AUE_SELECT MNOPROTO { int select(u_int nd, fd_set *in, \ fd_set *ou, fd_set *ex, \ struct timeval *tv); } -37 AUE_NULL MSTD { int xenix_eaccess(char *path, int flags); } +37 AUE_EACCESS MSTD { int xenix_eaccess(char *path, int flags); } 38 AUE_NULL UNIMPL xenix_paccess -39 AUE_SIGACTION MSTD { int ibcs2_sigaction(int sig, \ +39 AUE_NULL MSTD { int ibcs2_sigaction(int sig, \ struct ibcs2_sigaction *act, \ struct ibcs2_sigaction *oact); } -40 AUE_SIGPROCMASK MSTD { int ibcs2_sigprocmask(int how, \ +40 AUE_NULL MSTD { int ibcs2_sigprocmask(int how, \ ibcs2_sigset_t *set, \ ibcs2_sigset_t *oset); } -41 AUE_SIGPENDING MSTD { int ibcs2_sigpending(ibcs2_sigset_t *mask); } -42 AUE_SIGSUSPEND MSTD { int ibcs2_sigsuspend(ibcs2_sigset_t *mask); } +41 AUE_NULL MSTD { int ibcs2_sigpending(ibcs2_sigset_t *mask); } +42 AUE_NULL MSTD { int ibcs2_sigsuspend(ibcs2_sigset_t *mask); } 43 AUE_GETGROUPS STD { int ibcs2_getgroups(int gidsetsize, \ ibcs2_gid_t *gidset); } 44 AUE_SETGROUPS STD { int ibcs2_setgroups(int gidsetsize, \ From owner-p4-projects@FreeBSD.ORG Sun Feb 5 23:22:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7264316A428; Sun, 5 Feb 2006 23:22:43 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1DD2816A422 for ; Sun, 5 Feb 2006 23:22:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DBED943D45 for ; Sun, 5 Feb 2006 23:22:42 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k15NMg3g082596 for ; Sun, 5 Feb 2006 23:22:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k15NMgBs082593 for perforce@freebsd.org; Sun, 5 Feb 2006 23:22:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Feb 2006 23:22:42 GMT Message-Id: <200602052322.k15NMgBs082593@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91195 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2006 23:22:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=91195 Change 91195 by rwatson@rwatson_peppercorn on 2006/02/05 23:22:15 Comment that xenix_eaccess() is probably meant to be implemented by kern_eaccess(), not kern_access(). Affected files ... .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_xenix.c#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_xenix.c#4 (text+ko) ==== @@ -215,6 +215,9 @@ if (uap->flags & IBCS2_X_OK) bsd_flags |= X_OK; + /* + * XXXRW: This should probably be kern_eaccess()? + */ CHECKALTEXIST(td, uap->path, &path); error = kern_access(td, path, UIO_SYSSPACE, bsd_flags); free(path, M_TEMP); From owner-p4-projects@FreeBSD.ORG Sun Feb 5 23:42:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AE7016A423; Sun, 5 Feb 2006 23:42:08 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3955D16A420 for ; Sun, 5 Feb 2006 23:42:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA2C843D45 for ; Sun, 5 Feb 2006 23:42:07 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k15Ng71U083503 for ; Sun, 5 Feb 2006 23:42:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k15Ng7IN083500 for perforce@freebsd.org; Sun, 5 Feb 2006 23:42:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Feb 2006 23:42:07 GMT Message-Id: <200602052342.k15Ng7IN083500@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91198 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2006 23:42:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=91198 Change 91198 by rwatson@rwatson_peppercorn on 2006/02/05 23:42:04 Assign audit event identifiers to ibcs2 system call vector. Note that certain system calls here are not fully audited to the front system call actually invoking several quite different pieces of actual functionality. For example, ibcs2_pgrpsys() and ibcs2_ulimit(). These may need to be revisited if we want to formally support audit with ibcs2 emulation. Also, we need to make sure the logic is in place to do substitutions on audit events associated with shmsys, semsys, etc. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_proto.h#5 edit .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_syscall.h#5 edit .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_sysent.c#5 edit .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/syscalls.master#5 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_proto.h#5 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/ibcs2/ibcs2_proto.h,v 1.22 2005/07/13 20:35:08 jhb Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.21 2005/07/13 20:32:42 jhb Exp */ ==== //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_syscall.h#5 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/ibcs2/ibcs2_syscall.h,v 1.19 2005/07/13 20:35:08 jhb Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.21 2005/07/13 20:32:42 jhb Exp */ ==== //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_sysent.c#5 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/ibcs2/ibcs2_sysent.c,v 1.24 2005/07/13 20:35:08 jhb Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.21 2005/07/13 20:32:42 jhb Exp */ @@ -19,68 +19,68 @@ /* The casts are bogus but will do for now. */ struct sysent ibcs2_sysent[] = { { SYF_MPSAFE | 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = syscall */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_NULL }, /* 1 = exit */ - { SYF_MPSAFE | 0, (sy_call_t *)fork, AUE_NULL }, /* 2 = fork */ + { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ + { SYF_MPSAFE | 0, (sy_call_t *)fork, AUE_FORK }, /* 2 = fork */ { AS(ibcs2_read_args), (sy_call_t *)ibcs2_read, AUE_NULL }, /* 3 = ibcs2_read */ { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ - { SYF_MPSAFE | AS(ibcs2_open_args), (sy_call_t *)ibcs2_open, AUE_NULL }, /* 5 = ibcs2_open */ - { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_NULL }, /* 6 = close */ - { SYF_MPSAFE | AS(ibcs2_wait_args), (sy_call_t *)ibcs2_wait, AUE_NULL }, /* 7 = ibcs2_wait */ - { SYF_MPSAFE | AS(ibcs2_creat_args), (sy_call_t *)ibcs2_creat, AUE_NULL }, /* 8 = ibcs2_creat */ - { SYF_MPSAFE | AS(link_args), (sy_call_t *)link, AUE_NULL }, /* 9 = link */ - { SYF_MPSAFE | AS(ibcs2_unlink_args), (sy_call_t *)ibcs2_unlink, AUE_NULL }, /* 10 = ibcs2_unlink */ - { SYF_MPSAFE | AS(ibcs2_execv_args), (sy_call_t *)ibcs2_execv, AUE_NULL }, /* 11 = ibcs2_execv */ - { SYF_MPSAFE | AS(ibcs2_chdir_args), (sy_call_t *)ibcs2_chdir, AUE_NULL }, /* 12 = ibcs2_chdir */ + { SYF_MPSAFE | AS(ibcs2_open_args), (sy_call_t *)ibcs2_open, AUE_OPEN_RWTC }, /* 5 = ibcs2_open */ + { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ + { SYF_MPSAFE | AS(ibcs2_wait_args), (sy_call_t *)ibcs2_wait, AUE_WAIT4 }, /* 7 = ibcs2_wait */ + { SYF_MPSAFE | AS(ibcs2_creat_args), (sy_call_t *)ibcs2_creat, AUE_CREAT }, /* 8 = ibcs2_creat */ + { SYF_MPSAFE | AS(link_args), (sy_call_t *)link, AUE_LINK }, /* 9 = link */ + { SYF_MPSAFE | AS(ibcs2_unlink_args), (sy_call_t *)ibcs2_unlink, AUE_UNLINK }, /* 10 = ibcs2_unlink */ + { SYF_MPSAFE | AS(ibcs2_execv_args), (sy_call_t *)ibcs2_execv, AUE_EXECVE }, /* 11 = ibcs2_execv */ + { SYF_MPSAFE | AS(ibcs2_chdir_args), (sy_call_t *)ibcs2_chdir, AUE_CHDIR }, /* 12 = ibcs2_chdir */ { SYF_MPSAFE | AS(ibcs2_time_args), (sy_call_t *)ibcs2_time, AUE_NULL }, /* 13 = ibcs2_time */ - { SYF_MPSAFE | AS(ibcs2_mknod_args), (sy_call_t *)ibcs2_mknod, AUE_NULL }, /* 14 = ibcs2_mknod */ - { SYF_MPSAFE | AS(ibcs2_chmod_args), (sy_call_t *)ibcs2_chmod, AUE_NULL }, /* 15 = ibcs2_chmod */ - { SYF_MPSAFE | AS(ibcs2_chown_args), (sy_call_t *)ibcs2_chown, AUE_NULL }, /* 16 = ibcs2_chown */ + { SYF_MPSAFE | AS(ibcs2_mknod_args), (sy_call_t *)ibcs2_mknod, AUE_MKNOD }, /* 14 = ibcs2_mknod */ + { SYF_MPSAFE | AS(ibcs2_chmod_args), (sy_call_t *)ibcs2_chmod, AUE_CHMOD }, /* 15 = ibcs2_chmod */ + { SYF_MPSAFE | AS(ibcs2_chown_args), (sy_call_t *)ibcs2_chown, AUE_CHOWN }, /* 16 = ibcs2_chown */ { SYF_MPSAFE | AS(obreak_args), (sy_call_t *)obreak, AUE_NULL }, /* 17 = obreak */ - { SYF_MPSAFE | AS(ibcs2_stat_args), (sy_call_t *)ibcs2_stat, AUE_NULL }, /* 18 = ibcs2_stat */ - { SYF_MPSAFE | AS(ibcs2_lseek_args), (sy_call_t *)ibcs2_lseek, AUE_NULL }, /* 19 = ibcs2_lseek */ + { SYF_MPSAFE | AS(ibcs2_stat_args), (sy_call_t *)ibcs2_stat, AUE_STAT }, /* 18 = ibcs2_stat */ + { SYF_MPSAFE | AS(ibcs2_lseek_args), (sy_call_t *)ibcs2_lseek, AUE_LSEEK }, /* 19 = ibcs2_lseek */ { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_NULL }, /* 20 = getpid */ - { AS(ibcs2_mount_args), (sy_call_t *)ibcs2_mount, AUE_NULL }, /* 21 = ibcs2_mount */ - { AS(ibcs2_umount_args), (sy_call_t *)ibcs2_umount, AUE_NULL }, /* 22 = ibcs2_umount */ - { SYF_MPSAFE | AS(ibcs2_setuid_args), (sy_call_t *)ibcs2_setuid, AUE_NULL }, /* 23 = ibcs2_setuid */ - { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_NULL }, /* 24 = getuid */ - { SYF_MPSAFE | AS(ibcs2_stime_args), (sy_call_t *)ibcs2_stime, AUE_NULL }, /* 25 = ibcs2_stime */ - { SYF_MPSAFE | AS(ptrace_args), (sy_call_t *)ptrace, AUE_NULL }, /* 26 = ptrace */ + { AS(ibcs2_mount_args), (sy_call_t *)ibcs2_mount, AUE_MOUNT }, /* 21 = ibcs2_mount */ + { AS(ibcs2_umount_args), (sy_call_t *)ibcs2_umount, AUE_UMOUNT }, /* 22 = ibcs2_umount */ + { SYF_MPSAFE | AS(ibcs2_setuid_args), (sy_call_t *)ibcs2_setuid, AUE_SETUID }, /* 23 = ibcs2_setuid */ + { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_GETUID }, /* 24 = getuid */ + { SYF_MPSAFE | AS(ibcs2_stime_args), (sy_call_t *)ibcs2_stime, AUE_SETTIMEOFDAY }, /* 25 = ibcs2_stime */ + { SYF_MPSAFE | AS(ptrace_args), (sy_call_t *)ptrace, AUE_PTRACE }, /* 26 = ptrace */ { SYF_MPSAFE | AS(ibcs2_alarm_args), (sy_call_t *)ibcs2_alarm, AUE_NULL }, /* 27 = ibcs2_alarm */ - { SYF_MPSAFE | AS(ibcs2_fstat_args), (sy_call_t *)ibcs2_fstat, AUE_NULL }, /* 28 = ibcs2_fstat */ + { SYF_MPSAFE | AS(ibcs2_fstat_args), (sy_call_t *)ibcs2_fstat, AUE_FSTAT }, /* 28 = ibcs2_fstat */ { SYF_MPSAFE | 0, (sy_call_t *)ibcs2_pause, AUE_NULL }, /* 29 = ibcs2_pause */ { SYF_MPSAFE | AS(ibcs2_utime_args), (sy_call_t *)ibcs2_utime, AUE_NULL }, /* 30 = ibcs2_utime */ { SYF_MPSAFE | AS(ibcs2_stty_args), (sy_call_t *)ibcs2_stty, AUE_NULL }, /* 31 = ibcs2_stty */ { SYF_MPSAFE | AS(ibcs2_gtty_args), (sy_call_t *)ibcs2_gtty, AUE_NULL }, /* 32 = ibcs2_gtty */ - { SYF_MPSAFE | AS(ibcs2_access_args), (sy_call_t *)ibcs2_access, AUE_NULL }, /* 33 = ibcs2_access */ - { SYF_MPSAFE | AS(ibcs2_nice_args), (sy_call_t *)ibcs2_nice, AUE_NULL }, /* 34 = ibcs2_nice */ - { SYF_MPSAFE | AS(ibcs2_statfs_args), (sy_call_t *)ibcs2_statfs, AUE_NULL }, /* 35 = ibcs2_statfs */ + { SYF_MPSAFE | AS(ibcs2_access_args), (sy_call_t *)ibcs2_access, AUE_ACCESS }, /* 33 = ibcs2_access */ + { SYF_MPSAFE | AS(ibcs2_nice_args), (sy_call_t *)ibcs2_nice, AUE_NICE }, /* 34 = ibcs2_nice */ + { SYF_MPSAFE | AS(ibcs2_statfs_args), (sy_call_t *)ibcs2_statfs, AUE_STATFS }, /* 35 = ibcs2_statfs */ { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_NULL }, /* 36 = sync */ - { SYF_MPSAFE | AS(ibcs2_kill_args), (sy_call_t *)ibcs2_kill, AUE_NULL }, /* 37 = ibcs2_kill */ - { SYF_MPSAFE | AS(ibcs2_fstatfs_args), (sy_call_t *)ibcs2_fstatfs, AUE_NULL }, /* 38 = ibcs2_fstatfs */ + { SYF_MPSAFE | AS(ibcs2_kill_args), (sy_call_t *)ibcs2_kill, AUE_KILL }, /* 37 = ibcs2_kill */ + { SYF_MPSAFE | AS(ibcs2_fstatfs_args), (sy_call_t *)ibcs2_fstatfs, AUE_FSTATFS }, /* 38 = ibcs2_fstatfs */ { SYF_MPSAFE | AS(ibcs2_pgrpsys_args), (sy_call_t *)ibcs2_pgrpsys, AUE_NULL }, /* 39 = ibcs2_pgrpsys */ { SYF_MPSAFE | AS(ibcs2_xenix_args), (sy_call_t *)ibcs2_xenix, AUE_NULL }, /* 40 = ibcs2_xenix */ { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_NULL }, /* 41 = dup */ - { SYF_MPSAFE | 0, (sy_call_t *)pipe, AUE_NULL }, /* 42 = pipe */ + { SYF_MPSAFE | 0, (sy_call_t *)pipe, AUE_PIPE }, /* 42 = pipe */ { SYF_MPSAFE | AS(ibcs2_times_args), (sy_call_t *)ibcs2_times, AUE_NULL }, /* 43 = ibcs2_times */ - { SYF_MPSAFE | AS(profil_args), (sy_call_t *)profil, AUE_NULL }, /* 44 = profil */ + { SYF_MPSAFE | AS(profil_args), (sy_call_t *)profil, AUE_PROFILE }, /* 44 = profil */ { SYF_MPSAFE | AS(ibcs2_plock_args), (sy_call_t *)ibcs2_plock, AUE_NULL }, /* 45 = ibcs2_plock */ - { SYF_MPSAFE | AS(ibcs2_setgid_args), (sy_call_t *)ibcs2_setgid, AUE_NULL }, /* 46 = ibcs2_setgid */ - { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_NULL }, /* 47 = getgid */ + { SYF_MPSAFE | AS(ibcs2_setgid_args), (sy_call_t *)ibcs2_setgid, AUE_SETGID }, /* 46 = ibcs2_setgid */ + { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_GETGID }, /* 47 = getgid */ { SYF_MPSAFE | AS(ibcs2_sigsys_args), (sy_call_t *)ibcs2_sigsys, AUE_NULL }, /* 48 = ibcs2_sigsys */ - { AS(ibcs2_msgsys_args), (sy_call_t *)ibcs2_msgsys, AUE_NULL }, /* 49 = ibcs2_msgsys */ + { AS(ibcs2_msgsys_args), (sy_call_t *)ibcs2_msgsys, AUE_MSGSYS }, /* 49 = ibcs2_msgsys */ { SYF_MPSAFE | AS(ibcs2_sysi86_args), (sy_call_t *)ibcs2_sysi86, AUE_NULL }, /* 50 = ibcs2_sysi86 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 51 = ibcs2_acct */ - { AS(ibcs2_shmsys_args), (sy_call_t *)ibcs2_shmsys, AUE_NULL }, /* 52 = ibcs2_shmsys */ - { AS(ibcs2_semsys_args), (sy_call_t *)ibcs2_semsys, AUE_NULL }, /* 53 = ibcs2_semsys */ - { AS(ibcs2_ioctl_args), (sy_call_t *)ibcs2_ioctl, AUE_NULL }, /* 54 = ibcs2_ioctl */ + { AS(ibcs2_shmsys_args), (sy_call_t *)ibcs2_shmsys, AUE_SHMSYS }, /* 52 = ibcs2_shmsys */ + { AS(ibcs2_semsys_args), (sy_call_t *)ibcs2_semsys, AUE_SEMSYS }, /* 53 = ibcs2_semsys */ + { AS(ibcs2_ioctl_args), (sy_call_t *)ibcs2_ioctl, AUE_IOCTL }, /* 54 = ibcs2_ioctl */ { SYF_MPSAFE | AS(ibcs2_uadmin_args), (sy_call_t *)ibcs2_uadmin, AUE_NULL }, /* 55 = ibcs2_uadmin */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = nosys */ { SYF_MPSAFE | AS(ibcs2_utssys_args), (sy_call_t *)ibcs2_utssys, AUE_NULL }, /* 57 = ibcs2_utssys */ - { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_NULL }, /* 58 = fsync */ - { SYF_MPSAFE | AS(ibcs2_execve_args), (sy_call_t *)ibcs2_execve, AUE_NULL }, /* 59 = ibcs2_execve */ - { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_NULL }, /* 60 = umask */ - { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_NULL }, /* 61 = chroot */ - { SYF_MPSAFE | AS(ibcs2_fcntl_args), (sy_call_t *)ibcs2_fcntl, AUE_NULL }, /* 62 = ibcs2_fcntl */ + { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 58 = fsync */ + { SYF_MPSAFE | AS(ibcs2_execve_args), (sy_call_t *)ibcs2_execve, AUE_EXECVE }, /* 59 = ibcs2_execve */ + { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ + { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ + { SYF_MPSAFE | AS(ibcs2_fcntl_args), (sy_call_t *)ibcs2_fcntl, AUE_FCNTL }, /* 62 = ibcs2_fcntl */ { SYF_MPSAFE | AS(ibcs2_ulimit_args), (sy_call_t *)ibcs2_ulimit, AUE_NULL }, /* 63 = ibcs2_ulimit */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 64 = reserved for unix/pc */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 65 = reserved for unix/pc */ @@ -97,20 +97,20 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 76 = obsolete rfs_rdebug */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 77 = obsolete rfs_rfstop */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 78 = rfs_rfsys */ - { SYF_MPSAFE | AS(ibcs2_rmdir_args), (sy_call_t *)ibcs2_rmdir, AUE_NULL }, /* 79 = ibcs2_rmdir */ - { SYF_MPSAFE | AS(ibcs2_mkdir_args), (sy_call_t *)ibcs2_mkdir, AUE_NULL }, /* 80 = ibcs2_mkdir */ - { AS(ibcs2_getdents_args), (sy_call_t *)ibcs2_getdents, AUE_NULL }, /* 81 = ibcs2_getdents */ + { SYF_MPSAFE | AS(ibcs2_rmdir_args), (sy_call_t *)ibcs2_rmdir, AUE_RMDIR }, /* 79 = ibcs2_rmdir */ + { SYF_MPSAFE | AS(ibcs2_mkdir_args), (sy_call_t *)ibcs2_mkdir, AUE_MKDIR }, /* 80 = ibcs2_mkdir */ + { AS(ibcs2_getdents_args), (sy_call_t *)ibcs2_getdents, AUE_GETDIRENTRIES }, /* 81 = ibcs2_getdents */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 82 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 83 = nosys */ { SYF_MPSAFE | AS(ibcs2_sysfs_args), (sy_call_t *)ibcs2_sysfs, AUE_NULL }, /* 84 = ibcs2_sysfs */ - { SYF_MPSAFE | AS(ibcs2_getmsg_args), (sy_call_t *)ibcs2_getmsg, AUE_NULL }, /* 85 = ibcs2_getmsg */ - { SYF_MPSAFE | AS(ibcs2_putmsg_args), (sy_call_t *)ibcs2_putmsg, AUE_NULL }, /* 86 = ibcs2_putmsg */ - { AS(ibcs2_poll_args), (sy_call_t *)ibcs2_poll, AUE_NULL }, /* 87 = ibcs2_poll */ + { SYF_MPSAFE | AS(ibcs2_getmsg_args), (sy_call_t *)ibcs2_getmsg, AUE_GETMSG }, /* 85 = ibcs2_getmsg */ + { SYF_MPSAFE | AS(ibcs2_putmsg_args), (sy_call_t *)ibcs2_putmsg, AUE_PUTMSG }, /* 86 = ibcs2_putmsg */ + { AS(ibcs2_poll_args), (sy_call_t *)ibcs2_poll, AUE_POLL }, /* 87 = ibcs2_poll */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 88 = nosys */ { SYF_MPSAFE | AS(ibcs2_secure_args), (sy_call_t *)ibcs2_secure, AUE_NULL }, /* 89 = ibcs2_secure */ - { SYF_MPSAFE | AS(ibcs2_symlink_args), (sy_call_t *)ibcs2_symlink, AUE_NULL }, /* 90 = ibcs2_symlink */ - { SYF_MPSAFE | AS(ibcs2_lstat_args), (sy_call_t *)ibcs2_lstat, AUE_NULL }, /* 91 = ibcs2_lstat */ - { SYF_MPSAFE | AS(ibcs2_readlink_args), (sy_call_t *)ibcs2_readlink, AUE_NULL }, /* 92 = ibcs2_readlink */ + { SYF_MPSAFE | AS(ibcs2_symlink_args), (sy_call_t *)ibcs2_symlink, AUE_SYMLINK }, /* 90 = ibcs2_symlink */ + { SYF_MPSAFE | AS(ibcs2_lstat_args), (sy_call_t *)ibcs2_lstat, AUE_LSTAT }, /* 91 = ibcs2_lstat */ + { SYF_MPSAFE | AS(ibcs2_readlink_args), (sy_call_t *)ibcs2_readlink, AUE_READLINK }, /* 92 = ibcs2_readlink */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 93 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 94 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 95 = nosys */ ==== //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/syscalls.master#5 (text+ko) ==== @@ -4,7 +4,7 @@ ; System call name/number master file (or rather, slave, from IBCS2). ; Processed to created ibcs2_sysent.c, ibcs2_syscalls.c and ibcs2_syscall.h. -; Columns: number type nargs name alt{name,tag,rtyp}/comments +; Columns: number audit type nargs name alt{name,tag,rtyp}/comments ; number system call number, must be in order ; audit the audit event associated with the system call ; A value of AUE_NULL means no auditing, but it also means that @@ -36,45 +36,45 @@ ; #ifdef's, etc. may be included, and are copied to the output files. 0 AUE_NULL MNOPROTO { int nosys(void); } syscall nosys_args int -1 AUE_NULL MNOPROTO { void sys_exit(int rval); } exit \ +1 AUE_EXIT MNOPROTO { void sys_exit(int rval); } exit \ sys_exit_args void -2 AUE_NULL MNOPROTO { int fork(void); } +2 AUE_FORK MNOPROTO { int fork(void); } 3 AUE_NULL STD { int ibcs2_read(int fd, char *buf, \ u_int nbytes); } 4 AUE_NULL MNOPROTO { int write(int fd, char *buf, \ u_int nbytes); } -5 AUE_NULL MSTD { int ibcs2_open(char *path, int flags, \ +5 AUE_OPEN_RWTC MSTD { int ibcs2_open(char *path, int flags, \ int mode); } -6 AUE_NULL MNOPROTO { int close(int fd); } -7 AUE_NULL MSTD { int ibcs2_wait(int a1, int a2, int a3); } -8 AUE_NULL MSTD { int ibcs2_creat(char *path, int mode); } -9 AUE_NULL MNOPROTO { int link(char *path, char *link); } -10 AUE_NULL MSTD { int ibcs2_unlink(char *path); } -11 AUE_NULL MSTD { int ibcs2_execv(char *path, char **argp); } -12 AUE_NULL MSTD { int ibcs2_chdir(char *path); } +6 AUE_CLOSE MNOPROTO { int close(int fd); } +7 AUE_WAIT4 MSTD { int ibcs2_wait(int a1, int a2, int a3); } +8 AUE_CREAT MSTD { int ibcs2_creat(char *path, int mode); } +9 AUE_LINK MNOPROTO { int link(char *path, char *link); } +10 AUE_UNLINK MSTD { int ibcs2_unlink(char *path); } +11 AUE_EXECVE MSTD { int ibcs2_execv(char *path, char **argp); } +12 AUE_CHDIR MSTD { int ibcs2_chdir(char *path); } 13 AUE_NULL MSTD { int ibcs2_time(ibcs2_time_t *tp); } -14 AUE_NULL MSTD { int ibcs2_mknod(char* path, int mode, \ +14 AUE_MKNOD MSTD { int ibcs2_mknod(char* path, int mode, \ int dev); } -15 AUE_NULL MSTD { int ibcs2_chmod(char *path, int mode); } -16 AUE_NULL MSTD { int ibcs2_chown(char *path, int uid, \ +15 AUE_CHMOD MSTD { int ibcs2_chmod(char *path, int mode); } +16 AUE_CHOWN MSTD { int ibcs2_chown(char *path, int uid, \ int gid); } 17 AUE_NULL MNOPROTO { int obreak(caddr_t nsize); } -18 AUE_NULL MSTD { int ibcs2_stat(char* path, \ +18 AUE_STAT MSTD { int ibcs2_stat(char* path, \ struct ibcs2_stat *st); } -19 AUE_NULL MSTD { long ibcs2_lseek(int fd, long offset, \ +19 AUE_LSEEK MSTD { long ibcs2_lseek(int fd, long offset, \ int whence); } 20 AUE_NULL MNOPROTO { pid_t getpid(void); } -21 AUE_NULL STD { int ibcs2_mount(char *special, char *dir, \ +21 AUE_MOUNT STD { int ibcs2_mount(char *special, char *dir, \ int flags, int fstype, char *data, \ int len); } -22 AUE_NULL STD { int ibcs2_umount(char *name); } -23 AUE_NULL MSTD { int ibcs2_setuid(int uid); } -24 AUE_NULL MNOPROTO { uid_t getuid(void); } -25 AUE_NULL MSTD { int ibcs2_stime(long *timep); } -26 AUE_NULL MNOPROTO { int ptrace(int req, pid_t pid, \ +22 AUE_UMOUNT STD { int ibcs2_umount(char *name); } +23 AUE_SETUID MSTD { int ibcs2_setuid(int uid); } +24 AUE_GETUID MNOPROTO { uid_t getuid(void); } +25 AUE_SETTIMEOFDAY MSTD { int ibcs2_stime(long *timep); } +26 AUE_PTRACE MNOPROTO { int ptrace(int req, pid_t pid, \ caddr_t addr, int data); } 27 AUE_NULL MSTD { int ibcs2_alarm(unsigned sec); } -28 AUE_NULL MSTD { int ibcs2_fstat(int fd, \ +28 AUE_FSTAT MSTD { int ibcs2_fstat(int fd, \ struct ibcs2_stat *st); } 29 AUE_NULL MSTD { int ibcs2_pause(void); } 30 AUE_NULL MSTD { int ibcs2_utime(char *path, \ @@ -83,14 +83,14 @@ struct sgttyb *buf); } 32 AUE_NULL MSTD { int ibcs2_gtty(int fd, \ struct sgttyb *buf); } -33 AUE_NULL MSTD { int ibcs2_access(char *path, int flags); } -34 AUE_NULL MSTD { int ibcs2_nice(int incr); } -35 AUE_NULL MSTD { int ibcs2_statfs(char *path, \ +33 AUE_ACCESS MSTD { int ibcs2_access(char *path, int flags); } +34 AUE_NICE MSTD { int ibcs2_nice(int incr); } +35 AUE_STATFS MSTD { int ibcs2_statfs(char *path, \ struct ibcs2_statfs *buf, int len, \ int fstype); } 36 AUE_NULL MNOPROTO { int sync(void); } -37 AUE_NULL MSTD { int ibcs2_kill(int pid, int signo); } -38 AUE_NULL MSTD { int ibcs2_fstatfs(int fd, \ +37 AUE_KILL MSTD { int ibcs2_kill(int pid, int signo); } +38 AUE_FSTATFS MSTD { int ibcs2_fstatfs(int fd, \ struct ibcs2_statfs *buf, int len, \ int fstype); } 39 AUE_NULL MSTD { int ibcs2_pgrpsys(int type, caddr_t dummy, \ @@ -98,35 +98,35 @@ 40 AUE_NULL MSTD { int ibcs2_xenix(int a1, int a2, int a3, \ int a4, int a5); } 41 AUE_NULL MNOPROTO { int dup(u_int fd); } -42 AUE_NULL MNOPROTO { int pipe(void); } +42 AUE_PIPE MNOPROTO { int pipe(void); } 43 AUE_NULL MSTD { int ibcs2_times(struct tms *tp); } -44 AUE_NULL MNOPROTO { int profil(caddr_t samples, u_int size, \ +44 AUE_PROFILE MNOPROTO { int profil(caddr_t samples, u_int size, \ u_int offset, u_int scale); } 45 AUE_NULL MSTD { int ibcs2_plock(int cmd); } -46 AUE_NULL MSTD { int ibcs2_setgid(int gid); } -47 AUE_NULL MNOPROTO { gid_t getgid(void); } +46 AUE_SETGID MSTD { int ibcs2_setgid(int gid); } +47 AUE_GETGID MNOPROTO { gid_t getgid(void); } 48 AUE_NULL MSTD { int ibcs2_sigsys(int sig, ibcs2_sig_t fp); } -49 AUE_NULL STD { int ibcs2_msgsys(int which, int a2, \ +49 AUE_MSGSYS STD { int ibcs2_msgsys(int which, int a2, \ int a3, int a4, int a5, int a6); } 50 AUE_NULL MSTD { int ibcs2_sysi86(int cmd, int *arg); } 51 AUE_NULL UNIMPL ibcs2_acct -52 AUE_NULL STD { int ibcs2_shmsys(int which, int a2, \ +52 AUE_SHMSYS STD { int ibcs2_shmsys(int which, int a2, \ int a3, int a4); } -53 AUE_NULL STD { int ibcs2_semsys(int which, int a2, \ +53 AUE_SEMSYS STD { int ibcs2_semsys(int which, int a2, \ int a3, int a4, int a5); } -54 AUE_NULL STD { int ibcs2_ioctl(int fd, int cmd, \ +54 AUE_IOCTL STD { int ibcs2_ioctl(int fd, int cmd, \ caddr_t data); } 55 AUE_NULL MSTD { int ibcs2_uadmin(int cmd, int func, \ caddr_t data); } 56 AUE_NULL UNIMPL nosys 57 AUE_NULL MSTD { int ibcs2_utssys(int a1, int a2, \ int flag); } -58 AUE_NULL MNOPROTO { int fsync(int fd); } -59 AUE_NULL MSTD { int ibcs2_execve(char *path, char **argp, \ +58 AUE_FSYNC MNOPROTO { int fsync(int fd); } +59 AUE_EXECVE MSTD { int ibcs2_execve(char *path, char **argp, \ char **envp); } -60 AUE_NULL MNOPROTO { int umask(int newmask); } -61 AUE_NULL MNOPROTO { int chroot(char *path); } -62 AUE_NULL MSTD { int ibcs2_fcntl(int fd, int cmd, \ +60 AUE_UMASK MNOPROTO { int umask(int newmask); } +61 AUE_CHROOT MNOPROTO { int chroot(char *path); } +62 AUE_FCNTL MSTD { int ibcs2_fcntl(int fd, int cmd, \ char *arg); } 63 AUE_NULL MSTD { long ibcs2_ulimit(int cmd, int newlimit); } 64 AUE_NULL UNIMPL reserved for unix/pc @@ -144,30 +144,30 @@ 76 AUE_NULL OBSOL rfs_rdebug 77 AUE_NULL OBSOL rfs_rfstop 78 AUE_NULL UNIMPL rfs_rfsys -79 AUE_NULL MSTD { int ibcs2_rmdir(char *path); } -80 AUE_NULL MSTD { int ibcs2_mkdir(char *path, int mode); } -81 AUE_NULL STD { int ibcs2_getdents(int fd, char *buf, \ +79 AUE_RMDIR MSTD { int ibcs2_rmdir(char *path); } +80 AUE_MKDIR MSTD { int ibcs2_mkdir(char *path, int mode); } +81 AUE_GETDIRENTRIES STD { int ibcs2_getdents(int fd, char *buf, \ int nbytes); } 82 AUE_NULL UNIMPL nosys 83 AUE_NULL UNIMPL nosys 84 AUE_NULL MSTD { int ibcs2_sysfs(int cmd, caddr_t d1, \ char *buf); } -85 AUE_NULL MSTD { int ibcs2_getmsg(int fd, \ +85 AUE_GETMSG MSTD { int ibcs2_getmsg(int fd, \ struct ibcs2_stropts *ctl, \ struct ibcs2_stropts *dat, int *flags); } -86 AUE_NULL MSTD { int ibcs2_putmsg(int fd, \ +86 AUE_PUTMSG MSTD { int ibcs2_putmsg(int fd, \ struct ibcs2_stropts *ctl, \ struct ibcs2_stropts *dat, int flags); } -87 AUE_NULL STD { int ibcs2_poll(struct ibcs2_poll *fds, \ +87 AUE_POLL STD { int ibcs2_poll(struct ibcs2_poll *fds, \ long nfds, int timeout); } 88 AUE_NULL UNIMPL nosys 89 AUE_NULL MSTD { int ibcs2_secure(int cmd, int a1, int a2, \ int a3, int a4, int a5); } -90 AUE_NULL MSTD { int ibcs2_symlink(char *path, \ +90 AUE_SYMLINK MSTD { int ibcs2_symlink(char *path, \ char *link); } -91 AUE_NULL MSTD { int ibcs2_lstat(char *path, \ +91 AUE_LSTAT MSTD { int ibcs2_lstat(char *path, \ struct ibcs2_stat *st); } -92 AUE_NULL MSTD { int ibcs2_readlink(char *path, char *buf, \ +92 AUE_READLINK MSTD { int ibcs2_readlink(char *path, char *buf, \ int count); } 93 AUE_NULL UNIMPL nosys 94 AUE_NULL UNIMPL nosys From owner-p4-projects@FreeBSD.ORG Sun Feb 5 23:49:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B22E16A424; Sun, 5 Feb 2006 23:49:22 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5D82F16A420 for ; Sun, 5 Feb 2006 23:49:22 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2ECD643D48 for ; Sun, 5 Feb 2006 23:49:17 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k15NnGdB083806 for ; Sun, 5 Feb 2006 23:49:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k15NnGh7083803 for perforce@freebsd.org; Sun, 5 Feb 2006 23:49:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Feb 2006 23:49:16 GMT Message-Id: <200602052349.k15NnGh7083803@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91199 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2006 23:49:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=91199 Change 91199 by rwatson@rwatson_zoo on 2006/02/05 23:49:08 Update changelog. Affected files ... .. //depot/projects/trustedbsd/openbsm/CHANGELOG#9 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/CHANGELOG#9 (text+ko) ==== @@ -1,3 +1,9 @@ +OpenBSM 1.0 alpha 3 + +- auditd will now fchown() the trail file to the audit review group, if + defined at compile-time. +- Added AUE_SYSARCH for FreeBSD. + OpenBSM 1.0 alpha 2 - Man page formatting improvements. @@ -73,4 +79,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/CHANGELOG#8 $ +$P4: //depot/projects/trustedbsd/openbsm/CHANGELOG#9 $ From owner-p4-projects@FreeBSD.ORG Sun Feb 5 23:52:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD15116A423; Sun, 5 Feb 2006 23:52:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7F95F16A420 for ; Sun, 5 Feb 2006 23:52:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 491C043D5D for ; Sun, 5 Feb 2006 23:52:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k15NqL5s083978 for ; Sun, 5 Feb 2006 23:52:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k15NqLVI083975 for perforce@freebsd.org; Sun, 5 Feb 2006 23:52:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Feb 2006 23:52:21 GMT Message-Id: <200602052352.k15NqLVI083975@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91200 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2006 23:52:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=91200 Change 91200 by rwatson@rwatson_zoo on 2006/02/05 23:51:34 More changelog for OpenBSM 1.0 alpha 3. Affected files ... .. //depot/projects/trustedbsd/openbsm/CHANGELOG#10 edit .. //depot/projects/trustedbsd/openbsm/VERSION#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/CHANGELOG#10 (text+ko) ==== @@ -1,8 +1,11 @@ OpenBSM 1.0 alpha 3 +- Man page formatting, cross reference, mlinks, and accuracy improvements. +- auditd and tools now compile and run on FreeBSD/arm. - auditd will now fchown() the trail file to the audit review group, if defined at compile-time. - Added AUE_SYSARCH for FreeBSD. +- Definition of AUE_SETFSGID fixed for Linux. OpenBSM 1.0 alpha 2 @@ -79,4 +82,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/CHANGELOG#9 $ +$P4: //depot/projects/trustedbsd/openbsm/CHANGELOG#10 $ ==== //depot/projects/trustedbsd/openbsm/VERSION#6 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_2 +OPENBSM_1_0_ALPHA_3 From owner-p4-projects@FreeBSD.ORG Mon Feb 6 01:10:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BF6216A423; Mon, 6 Feb 2006 01:10:59 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D5A6116A420 for ; Mon, 6 Feb 2006 01:10:58 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8AB8B43D45 for ; Mon, 6 Feb 2006 01:10:58 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k161Awn6094836 for ; Mon, 6 Feb 2006 01:10:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k161Aw2J094833 for perforce@freebsd.org; Mon, 6 Feb 2006 01:10:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 6 Feb 2006 01:10:58 GMT Message-Id: <200602060110.k161Aw2J094833@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91206 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 01:11:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=91206 Change 91206 by rwatson@rwatson_peppercorn on 2006/02/06 01:10:14 Bring final OpenBSM 1.0 alpha 3 changes into TrustedBSD audit3 branch: - More man page fixes. - Audit review group. - OpenBSM 1.0 alpha 3 notes. - AUE_SYSARCH. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#19 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#6 (text+ko) ==== @@ -1,3 +1,12 @@ +OpenBSM 1.0 alpha 3 + +- Man page formatting, cross reference, mlinks, and accuracy improvements. +- auditd and tools now compile and run on FreeBSD/arm. +- auditd will now fchown() the trail file to the audit review group, if + defined at compile-time. +- Added AUE_SYSARCH for FreeBSD. +- Definition of AUE_SETFSGID fixed for Linux. + OpenBSM 1.0 alpha 2 - Man page formatting improvements. @@ -71,5 +80,6 @@ - Annotate BSM events with origin OS and compatibility information. - auditd(8), audit(8) added to the OpenBSM distribution. auditd extended to support reloading of kernel event table. +- Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#5 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#6 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#4 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_2 +OPENBSM_1_0_ALPHA_3 ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#2 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#3 $ */ #include @@ -46,6 +46,7 @@ #include #include +#include #include #include #include @@ -171,6 +172,34 @@ } /* + * Create the new audit file with appropriate permissions and ownership. Try + * to clean up if something goes wrong. + */ +static int +#ifdef AUDIT_REVIEW_GROUP +open_trail(const char *fname, uid_t uid, gid_t gid) +#else +open_trail(const char *fname) +#endif +{ + int error, fd; + + fd = open(fname, O_RDONLY | O_CREAT, S_IRUSR | S_IRGRP); + if (fd < 0) + return (-1); +#ifdef AUDIT_REVIEW_GROUP + if (fchown(fd, uid, gid) < 0) { + error = errno; + close(fd); + (void)unlink(fname); + errno = error; + return (-1); + } +#endif + return (fd); +} + +/* * Create the new file name, swap with existing audit file. */ static int @@ -180,7 +209,12 @@ char *fn; char TS[POSTFIX_LEN]; struct dir_ent *dirent; - int fd; +#ifdef AUDIT_REVIEW_GROUP + struct group *grp; + gid_t gid; + uid_t uid; +#endif + int error, fd; if (getTSstr(TS, POSTFIX_LEN) != 0) return (-1); @@ -188,6 +222,22 @@ strcpy(timestr, TS); strcat(timestr, NOT_TERMINATED); +#ifdef AUDIT_REVIEW_GROUP + /* + * XXXRW: Currently, this code falls back to the daemon gid, which is + * likely the wheel group. Is there a better way to deal with this? + */ + grp = getgrnam(AUDIT_REVIEW_GROUP); + if (grp == NULL) { + syslog(LOG_INFO, + "Audit review group '%s' not available, using daemon gid", + AUDIT_REVIEW_GROUP); + gid = -1; + } else + gid = grp->gr_gid; + uid = getuid(); +#endif + /* Try until we succeed. */ while ((dirent = TAILQ_FIRST(&dir_q))) { if ((fn = affixdir(timestr, dirent)) == NULL) { @@ -201,20 +251,27 @@ * kernel if all went well. */ syslog(LOG_INFO, "New audit file is %s\n", fn); - fd = open(fn, O_RDONLY | O_CREAT, S_IRUSR | S_IRGRP); +#ifdef AUDIT_REVIEW_GROUP + fd = open_trail(fn, uid, gid); +#else + fd = open_trail(fn); +#endif if (fd < 0) - perror("File open"); - else if (auditctl(fn) != 0) { - syslog(LOG_ERR, - "auditctl failed setting log file! : %s\n", - strerror(errno)); - close(fd); - } else { - /* Success. */ - close_lastfile(TS); - lastfile = fn; - close(fd); - return (0); + warn("open(%s)", fn); + if (fd >= 0) { + error = auditctl(fn); + if (error) { + syslog(LOG_ERR, + "auditctl failed setting log file! : %s\n", + strerror(errno)); + close(fd); + } else { + /* Success. */ + close_lastfile(TS); + lastfile = fn; + close(fd); + return (0); + } } /* ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.h#1 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.h#2 $ */ #ifndef _AUDITD_H_ @@ -43,6 +43,13 @@ #define MAX_DIR_SIZE 255 #define AUDITD_NAME "auditd" +/* + * If defined, then the audit daemon will attempt to chown newly created logs + * to this group. Otherwise, they will be the default for the user running + * auditd, likely the audit group. + */ +#define AUDIT_REVIEW_GROUP "audit" + #define POSTFIX_LEN 16 #define NOT_TERMINATED ".not_terminated" ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#19 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#18 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#19 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -383,6 +383,7 @@ #define AUE_ACL_DELETE_FD 403 /* FreeBSD. */ #define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ #define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ +#define AUE_SYSARCH 406 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the From owner-p4-projects@FreeBSD.ORG Mon Feb 6 01:12:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC5BD16A423; Mon, 6 Feb 2006 01:12:00 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AF9FC16A420 for ; Mon, 6 Feb 2006 01:12:00 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A33243D49 for ; Mon, 6 Feb 2006 01:12:00 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k161C0gO094963 for ; Mon, 6 Feb 2006 01:12:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k161C0Ck094960 for perforce@freebsd.org; Mon, 6 Feb 2006 01:12:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 6 Feb 2006 01:12:00 GMT Message-Id: <200602060112.k161C0Ck094960@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91207 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 01:12:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=91207 Change 91207 by rwatson@rwatson_peppercorn on 2006/02/06 01:10:59 Integrate sys/bsm from contrib/openbsm/bsm in the TrustedBSD audit3 branch: - AUE_SYSARCH Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#20 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#20 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#19 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#20 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -383,6 +383,7 @@ #define AUE_ACL_DELETE_FD 403 /* FreeBSD. */ #define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ #define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ +#define AUE_SYSARCH 406 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the From owner-p4-projects@FreeBSD.ORG Mon Feb 6 01:46:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4B7116A423; Mon, 6 Feb 2006 01:46:44 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8143C16A422 for ; Mon, 6 Feb 2006 01:46:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 20A8F43D48 for ; Mon, 6 Feb 2006 01:46:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k161ki8U096552 for ; Mon, 6 Feb 2006 01:46:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k161khiK096549 for perforce@freebsd.org; Mon, 6 Feb 2006 01:46:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 6 Feb 2006 01:46:43 GMT Message-Id: <200602060146.k161khiK096549@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91211 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 01:46:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=91211 Change 91211 by rwatson@rwatson_peppercorn on 2006/02/06 01:46:00 Restore comment accidentally removed at some point. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/kern_exit.c#11 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/kern_exit.c#11 (text+ko) ==== @@ -428,6 +428,9 @@ LIST_REMOVE(p, p_hash); sx_xunlock(&allproc_lock); + /* + * Reparent all of our children to init. + */ sx_xlock(&proctree_lock); q = LIST_FIRST(&p->p_children); if (q != NULL) /* only need this if any child is S_ZOMB */ From owner-p4-projects@FreeBSD.ORG Mon Feb 6 01:52:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A112D16A423; Mon, 6 Feb 2006 01:52:52 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6192316A420 for ; Mon, 6 Feb 2006 01:52:52 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A67943D45 for ; Mon, 6 Feb 2006 01:52:52 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k161qqXK096810 for ; Mon, 6 Feb 2006 01:52:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k161qpLt096807 for perforce@freebsd.org; Mon, 6 Feb 2006 01:52:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 6 Feb 2006 01:52:51 GMT Message-Id: <200602060152.k161qpLt096807@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91212 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 01:52:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=91212 Change 91212 by rwatson@rwatson_peppercorn on 2006/02/06 01:52:03 Fix comment. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#30 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#30 (text+ko) ==== @@ -4,7 +4,7 @@ ; System call name/number master file. ; Processed to created init_sysent.c, syscalls.c and syscall.h. -; Columns: number audit [M]type name audit alt{name,tag,rtyp}/comments +; Columns: number audit [M]type name alt{name,tag,rtyp}/comments ; number system call number, must be in order ; audit the audit event associated with the system call ; A value of AUE_NULL means no auditing, but it also means that From owner-p4-projects@FreeBSD.ORG Mon Feb 6 02:08:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53CBA16A423; Mon, 6 Feb 2006 02:08:13 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1719316A420 for ; Mon, 6 Feb 2006 02:08:13 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BCC1343D46 for ; Mon, 6 Feb 2006 02:08:12 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1628Cs3097576 for ; Mon, 6 Feb 2006 02:08:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1628C9r097573 for perforce@freebsd.org; Mon, 6 Feb 2006 02:08:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 6 Feb 2006 02:08:12 GMT Message-Id: <200602060208.k1628C9r097573@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91216 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 02:08:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=91216 Change 91216 by rwatson@rwatson_peppercorn on 2006/02/06 02:07:45 Remove minor white space inconsistency with respect to parent branch. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#9 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#9 (text+ko) ==== @@ -538,6 +538,7 @@ strncpy(errmsg, "Invalid fspath", errmsg_len); goto bail; } + /* * We need to see if we have the "update" option * before we call vfs_domount(), since vfs_domount() has special From owner-p4-projects@FreeBSD.ORG Mon Feb 6 02:14:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F11B16A423; Mon, 6 Feb 2006 02:14:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E723D16A420 for ; Mon, 6 Feb 2006 02:14:20 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 97E6543D45 for ; Mon, 6 Feb 2006 02:14:20 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k162EK1o097879 for ; Mon, 6 Feb 2006 02:14:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k162EKlv097876 for perforce@freebsd.org; Mon, 6 Feb 2006 02:14:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 6 Feb 2006 02:14:20 GMT Message-Id: <200602060214.k162EKlv097876@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91217 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 02:14:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=91217 Change 91217 by rwatson@rwatson_peppercorn on 2006/02/06 02:13:42 Reduce some minor white space differences from the vendor. Remove one comment that probably is OK not to have. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#22 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#22 (text+ko) ==== @@ -328,7 +328,6 @@ error = getvnode(td->td_proc->p_fd, fd, &fp); if (error) return (error); - mp = fp->f_vnode->v_mount; fdrop(fp, td); if (mp == NULL) @@ -1142,7 +1141,7 @@ int mode; } */ *uap; { - /* Auditing is done in kern_open() */ + return (kern_open(td, uap->path, UIO_USERSPACE, O_WRONLY | O_CREAT | O_TRUNC, uap->mode)); } @@ -2465,7 +2464,6 @@ if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); vfslocked = VFS_LOCK_GIANT(fp->f_vnode->v_mount); - error = setfflags(td, fp->f_vnode, uap->flags); VFS_UNLOCK_GIANT(vfslocked); fdrop(fp, td); @@ -2602,9 +2600,7 @@ if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); vfslocked = VFS_LOCK_GIANT(fp->f_vnode->v_mount); - AUDIT_ARG(vnode, fp->f_vnode, ARG_VNODE1); - error = setfmode(td, fp->f_vnode, uap->mode); VFS_UNLOCK_GIANT(vfslocked); fdrop(fp, td); @@ -2760,7 +2756,6 @@ if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); vfslocked = VFS_LOCK_GIANT(fp->f_vnode->v_mount); - error = setfown(td, fp->f_vnode, uap->uid, uap->gid); VFS_UNLOCK_GIANT(vfslocked); fdrop(fp, td); @@ -3379,7 +3374,6 @@ int vfslocked; AUDIT_ARG(mode, mode); - restart: bwillwrite(); NDINIT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, @@ -3734,7 +3728,6 @@ /* vn_lock(vp, LK_SHARED | LK_RETRY, td); */ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); AUDIT_ARG(vnode, fp->f_vnode, ARG_VNODE1); - loff = auio.uio_offset = fp->f_offset; #ifdef MAC error = mac_check_vnode_readdir(td->td_ucred, vp); From owner-p4-projects@FreeBSD.ORG Mon Feb 6 02:16:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 34EAC16A423; Mon, 6 Feb 2006 02:16:24 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EB3E216A420 for ; Mon, 6 Feb 2006 02:16:23 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 95C3B43D45 for ; Mon, 6 Feb 2006 02:16:23 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k162GNTc098061 for ; Mon, 6 Feb 2006 02:16:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k162GNKK098058 for perforce@freebsd.org; Mon, 6 Feb 2006 02:16:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 6 Feb 2006 02:16:23 GMT Message-Id: <200602060216.k162GNKK098058@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91218 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 02:16:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=91218 Change 91218 by rwatson@rwatson_peppercorn on 2006/02/06 02:15:55 Remove one more minor white space difference from vendor. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#23 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#23 (text+ko) ==== @@ -3072,7 +3072,6 @@ return(EINVAL); if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); - if ((fp->f_flag & FWRITE) == 0) { fdrop(fp, td); return (EINVAL); From owner-p4-projects@FreeBSD.ORG Mon Feb 6 02:54:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9372416A423; Mon, 6 Feb 2006 02:54:10 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 27B5016A420 for ; Mon, 6 Feb 2006 02:54:10 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E4D8E43D48 for ; Mon, 6 Feb 2006 02:54:09 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k162s91w099349 for ; Mon, 6 Feb 2006 02:54:09 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k162s9HH099346 for perforce@freebsd.org; Mon, 6 Feb 2006 02:54:09 GMT (envelope-from wsalamon@computer.org) Date: Mon, 6 Feb 2006 02:54:09 GMT Message-Id: <200602060254.k162s9HH099346@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 91219 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 02:54:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=91219 Change 91219 by wsalamon@gretsch on 2006/02/06 02:54:00 Remove comments that are no longer true, leftover from interim development. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#10 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#10 (text+ko) ==== @@ -675,10 +675,6 @@ fstype = malloc(MFSNAMELEN, M_TEMP, M_WAITOK); error = copyinstr(uap->type, fstype, MFSNAMELEN, NULL); if (!error) { - /* Audit the fstype here, even though it will be copied - * again later. But if an error is detected, it won't get - * copied later, so grab as much info as possible. - */ AUDIT_ARG(text, fstype); mtx_lock(&Giant); /* XXX ? */ vfsp = vfs_byname_kld(fstype, td, &error); @@ -690,7 +686,7 @@ { /* Even though it will get captured again during vnode lookup, * capture the user-supplied path here because there are several - * error-out cases before the lookup, or the lookup may fail. + * error-out cases before the lookup. */ char *pathbuf = malloc(MNAMELEN, M_TEMP, M_WAITOK); error = copyinstr(uap->path, pathbuf, MNAMELEN, NULL); @@ -712,12 +708,6 @@ ma = mount_argb(ma, !(uap->flags & MNT_NOSUID), "nosuid"); ma = mount_argb(ma, !(uap->flags & MNT_NOEXEC), "noexec"); - /* Note that for auditing purposes, the we depend on the - * file system cmount function to call kernel_mount(), which - * calls vfs_donmount(), and that is where the user path and - * type information is copied into the kernel; only then can - * we capture the path information for auditing. - */ error = vfsp->vfc_vfsops->vfs_cmount(ma, uap->data, uap->flags, td); return (error); } From owner-p4-projects@FreeBSD.ORG Mon Feb 6 04:49:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86FFD16A423; Mon, 6 Feb 2006 04:49:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4798E16A420 for ; Mon, 6 Feb 2006 04:49:01 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E752343D45 for ; Mon, 6 Feb 2006 04:49:00 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k164n02m011262 for ; Mon, 6 Feb 2006 04:49:00 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k164n0mR011255 for perforce@freebsd.org; Mon, 6 Feb 2006 04:49:00 GMT (envelope-from imp@freebsd.org) Date: Mon, 6 Feb 2006 04:49:00 GMT Message-Id: <200602060449.k164n0mR011255@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91226 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 04:49:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=91226 Change 91226 by imp@imp_harmony on 2006/02/06 04:48:57 IFC @91224 (loopback) Affected files ... .. //depot/projects/arm/src/sys/alpha/linux/linux_proto.h#4 integrate .. //depot/projects/arm/src/sys/alpha/linux/linux_syscall.h#4 integrate .. //depot/projects/arm/src/sys/alpha/linux/linux_sysent.c#4 integrate .. //depot/projects/arm/src/sys/alpha/linux/syscalls.master#5 integrate .. //depot/projects/arm/src/sys/arm/include/atomic.h#4 integrate .. //depot/projects/arm/src/sys/bsm/audit_kevents.h#5 integrate .. //depot/projects/arm/src/sys/conf/NOTES#16 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/if_pflog.c#4 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/if_pflog.h#3 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf_ioctl.c#4 integrate .. //depot/projects/arm/src/sys/dev/asr/asr.c#6 integrate .. //depot/projects/arm/src/sys/dev/sound/isa/mss.c#4 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/csapcm.c#3 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/arm/src/sys/dev/sound/usb/uaudio.c#5 integrate .. //depot/projects/arm/src/sys/i386/conf/NOTES#10 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/Makefile#2 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_isc_syscall.h#3 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_isc_sysent.c#3 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_xenix.h#3 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_xenix_syscall.h#3 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_xenix_sysent.c#3 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/syscalls.isc#3 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/syscalls.xenix#3 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_proto.h#4 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_syscall.h#4 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_sysent.c#4 integrate .. //depot/projects/arm/src/sys/i386/linux/syscalls.master#4 integrate .. //depot/projects/arm/src/sys/kern/init_sysent.c#8 integrate .. //depot/projects/arm/src/sys/kern/kern_descrip.c#7 integrate .. //depot/projects/arm/src/sys/kern/kern_exit.c#8 integrate .. //depot/projects/arm/src/sys/kern/kern_fork.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_prot.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_thr.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_thread.c#6 integrate .. //depot/projects/arm/src/sys/kern/syscalls.c#8 integrate .. //depot/projects/arm/src/sys/kern/syscalls.master#9 integrate .. //depot/projects/arm/src/sys/kern/vfs_lookup.c#5 integrate .. //depot/projects/arm/src/sys/modules/Makefile#11 integrate .. //depot/projects/arm/src/sys/modules/pf/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/pflog/Makefile#1 branch .. //depot/projects/arm/src/sys/netinet6/in6_gif.c#5 integrate .. //depot/projects/arm/src/sys/security/audit/audit.c#2 integrate .. //depot/projects/arm/src/sys/security/audit/audit.h#2 integrate .. //depot/projects/arm/src/sys/sys/namei.h#3 integrate .. //depot/projects/arm/src/sys/sys/syscall.h#8 integrate .. //depot/projects/arm/src/sys/sys/syscall.mk#8 integrate .. //depot/projects/arm/src/sys/sys/sysproto.h#8 integrate .. //depot/projects/arm/src/sys/sys/thr.h#3 integrate Differences ... ==== //depot/projects/arm/src/sys/alpha/linux/linux_proto.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.23 2005/07/13 20:35:07 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.64 2005/07/13 20:32:41 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.24 2006/02/06 01:16:00 rwatson Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/arm/src/sys/alpha/linux/linux_syscall.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.21 2005/07/13 20:35:07 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.64 2005/07/13 20:32:41 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.22 2006/02/06 01:16:00 rwatson Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/arm/src/sys/alpha/linux/linux_sysent.c#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.21 2005/07/13 20:35:07 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.64 2005/07/13 20:32:41 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.22 2006/02/06 01:16:00 rwatson Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp */ #include @@ -21,156 +21,156 @@ struct sysent linux_sysent[] = { #define nosys linux_nosys { 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_NULL }, /* 1 = exit */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_NULL }, /* 2 = linux_fork */ - { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ - { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ + { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_FORK }, /* 2 = linux_fork */ + { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_READ }, /* 3 = read */ + { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_WRITE }, /* 4 = write */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 5 = */ - { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_NULL }, /* 6 = close */ - { SYF_MPSAFE | AS(osf1_wait4_args), (sy_call_t *)osf1_wait4, AUE_NULL }, /* 7 = osf1_wait4 */ + { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ + { SYF_MPSAFE | AS(osf1_wait4_args), (sy_call_t *)osf1_wait4, AUE_WAIT4 }, /* 7 = osf1_wait4 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 8 = */ - { SYF_MPSAFE | AS(linux_link_args), (sy_call_t *)linux_link, AUE_NULL }, /* 9 = linux_link */ - { SYF_MPSAFE | AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_NULL }, /* 10 = linux_unlink */ + { SYF_MPSAFE | AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK }, /* 9 = linux_link */ + { SYF_MPSAFE | AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK }, /* 10 = linux_unlink */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 11 = */ - { SYF_MPSAFE | AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_NULL }, /* 12 = linux_chdir */ - { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_NULL }, /* 13 = fchdir */ - { SYF_MPSAFE | AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_NULL }, /* 14 = linux_mknod */ - { SYF_MPSAFE | AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_NULL }, /* 15 = linux_chmod */ - { SYF_MPSAFE | AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_NULL }, /* 16 = linux_chown */ + { SYF_MPSAFE | AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR }, /* 12 = linux_chdir */ + { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR }, /* 13 = fchdir */ + { SYF_MPSAFE | AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD }, /* 14 = linux_mknod */ + { SYF_MPSAFE | AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD }, /* 15 = linux_chmod */ + { SYF_MPSAFE | AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN }, /* 16 = linux_chown */ { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 17 = linux_brk */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 18 = */ - { SYF_MPSAFE | AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_NULL }, /* 19 = linux_lseek */ - { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_NULL }, /* 20 = getpid */ + { SYF_MPSAFE | AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK }, /* 19 = linux_lseek */ + { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_GETPID }, /* 20 = getpid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 21 = osf1_mount */ - { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_NULL }, /* 22 = linux_umount */ - { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_NULL }, /* 23 = setuid */ - { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_NULL }, /* 24 = getuid */ + { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UNMOUNT }, /* 22 = linux_umount */ + { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 23 = setuid */ + { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_GETUID }, /* 24 = getuid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 25 = */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_ptrace, AUE_NULL }, /* 26 = linux_ptrace */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_ptrace, AUE_PTRACE }, /* 26 = linux_ptrace */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 27 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 28 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 29 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 30 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 31 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 32 = */ - { SYF_MPSAFE | AS(linux_access_args), (sy_call_t *)linux_access, AUE_NULL }, /* 33 = linux_access */ + { SYF_MPSAFE | AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS }, /* 33 = linux_access */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 34 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 35 = */ - { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_NULL }, /* 36 = sync */ - { SYF_MPSAFE | AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_NULL }, /* 37 = linux_kill */ + { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_SYNC }, /* 36 = sync */ + { SYF_MPSAFE | AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL }, /* 37 = linux_kill */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 38 = */ - { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_NULL }, /* 39 = setpgid */ + { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 39 = setpgid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 40 = */ - { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_NULL }, /* 41 = dup */ - { SYF_MPSAFE | 0, (sy_call_t *)pipe, AUE_NULL }, /* 42 = pipe */ + { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_DUP }, /* 41 = dup */ + { SYF_MPSAFE | 0, (sy_call_t *)pipe, AUE_PIPE }, /* 42 = pipe */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 43 = osf_set_program_attributes */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 44 = */ - { SYF_MPSAFE | AS(linux_open_args), (sy_call_t *)linux_open, AUE_NULL }, /* 45 = linux_open */ + { SYF_MPSAFE | AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC }, /* 45 = linux_open */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 46 = */ - { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_NULL }, /* 47 = getgid */ - { SYF_MPSAFE | AS(osf1_sigprocmask_args), (sy_call_t *)osf1_sigprocmask, AUE_NULL }, /* 48 = osf1_sigprocmask */ + { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_GETGID }, /* 47 = getgid */ + { SYF_MPSAFE | AS(osf1_sigprocmask_args), (sy_call_t *)osf1_sigprocmask, AUE_SIGPROCMASK }, /* 48 = osf1_sigprocmask */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 49 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 50 = */ - { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_NULL }, /* 51 = acct */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_sigpending, AUE_NULL }, /* 52 = linux_sigpending */ + { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_sigpending, AUE_SIGPENDING }, /* 52 = linux_sigpending */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 53 = */ - { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_NULL }, /* 54 = linux_ioctl */ + { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL }, /* 54 = linux_ioctl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 55 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = */ - { SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_NULL }, /* 57 = linux_symlink */ - { SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_NULL }, /* 58 = linux_readlink */ - { SYF_MPSAFE | AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_NULL }, /* 59 = linux_execve */ - { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_NULL }, /* 60 = umask */ - { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_NULL }, /* 61 = chroot */ + { SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK }, /* 57 = linux_symlink */ + { SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK }, /* 58 = linux_readlink */ + { SYF_MPSAFE | AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE }, /* 59 = linux_execve */ + { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ + { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 62 = */ - { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_NULL }, /* 63 = getpgrp */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getpagesize, AUE_NULL }, /* 64 = linux_getpagesize */ + { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 63 = getpgrp */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getpagesize, AUE_O_GETPAGESIZE }, /* 64 = linux_getpagesize */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 65 = */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_vfork, AUE_NULL }, /* 66 = linux_vfork */ - { SYF_MPSAFE | AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_NULL }, /* 67 = linux_newstat */ - { SYF_MPSAFE | AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_NULL }, /* 68 = linux_newlstat */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_vfork, AUE_VFORK }, /* 66 = linux_vfork */ + { SYF_MPSAFE | AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT }, /* 67 = linux_newstat */ + { SYF_MPSAFE | AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT }, /* 68 = linux_newlstat */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 69 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 70 = */ - { SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_NULL }, /* 71 = linux_mmap */ + { SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP }, /* 71 = linux_mmap */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 72 = */ - { SYF_MPSAFE | AS(linux_munmap_args), (sy_call_t *)linux_munmap, AUE_NULL }, /* 73 = linux_munmap */ - { SYF_MPSAFE | AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_NULL }, /* 74 = linux_mprotect */ - { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_NULL }, /* 75 = madvise */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_vhangup, AUE_NULL }, /* 76 = linux_vhangup */ + { SYF_MPSAFE | AS(linux_munmap_args), (sy_call_t *)linux_munmap, AUE_MUNMAP }, /* 73 = linux_munmap */ + { SYF_MPSAFE | AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT }, /* 74 = linux_mprotect */ + { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 75 = madvise */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_vhangup, AUE_O_VHANGUP }, /* 76 = linux_vhangup */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 77 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 78 = */ - { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_NULL }, /* 79 = linux_setgroups */ - { SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_NULL }, /* 80 = linux_getgroups */ + { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS }, /* 79 = linux_setgroups */ + { SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS }, /* 80 = linux_getgroups */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 81 = */ { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_NULL }, /* 82 = setpgid */ - { SYF_MPSAFE | AS(osf1_setitimer_args), (sy_call_t *)osf1_setitimer, AUE_NULL }, /* 83 = osf1_setitimer */ + { SYF_MPSAFE | AS(osf1_setitimer_args), (sy_call_t *)osf1_setitimer, AUE_SETITIMER }, /* 83 = osf1_setitimer */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 84 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 85 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 86 = osf_getitimer */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_gethostname, AUE_NULL }, /* 87 = linux_gethostname */ - { SYF_MPSAFE | AS(sethostname_args), (sy_call_t *)osethostname, AUE_NULL }, /* 88 = osethostname */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getdtablesize, AUE_NULL }, /* 89 = linux_getdtablesize */ - { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_NULL }, /* 90 = dup2 */ - { SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_NULL }, /* 91 = linux_newfstat */ - { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_NULL }, /* 92 = linux_fcntl */ - { SYF_MPSAFE | AS(osf1_select_args), (sy_call_t *)osf1_select, AUE_NULL }, /* 93 = osf1_select */ - { SYF_MPSAFE | AS(poll_args), (sy_call_t *)poll, AUE_NULL }, /* 94 = poll */ - { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_NULL }, /* 95 = fsync */ - { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_NULL }, /* 96 = setpriority */ - { SYF_MPSAFE | AS(osf1_socket_args), (sy_call_t *)osf1_socket, AUE_NULL }, /* 97 = osf1_socket */ - { SYF_MPSAFE | AS(linux_connect_args), (sy_call_t *)linux_connect, AUE_NULL }, /* 98 = linux_connect */ - { SYF_MPSAFE | AS(accept_args), (sy_call_t *)oaccept, AUE_NULL }, /* 99 = accept */ - { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_NULL }, /* 100 = linux_getpriority */ - { SYF_MPSAFE | AS(osend_args), (sy_call_t *)osend, AUE_NULL }, /* 101 = osend */ - { SYF_MPSAFE | AS(orecv_args), (sy_call_t *)orecv, AUE_NULL }, /* 102 = orecv */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_gethostname, AUE_SYSCTL }, /* 87 = linux_gethostname */ + { SYF_MPSAFE | AS(sethostname_args), (sy_call_t *)osethostname, AUE_SYSCTL }, /* 88 = osethostname */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getdtablesize, AUE_GETDTABLESIZE }, /* 89 = linux_getdtablesize */ + { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 90 = dup2 */ + { SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT }, /* 91 = linux_newfstat */ + { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL }, /* 92 = linux_fcntl */ + { SYF_MPSAFE | AS(osf1_select_args), (sy_call_t *)osf1_select, AUE_SELECT }, /* 93 = osf1_select */ + { SYF_MPSAFE | AS(poll_args), (sy_call_t *)poll, AUE_POLL }, /* 94 = poll */ + { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 95 = fsync */ + { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 96 = setpriority */ + { SYF_MPSAFE | AS(osf1_socket_args), (sy_call_t *)osf1_socket, AUE_SOCKET }, /* 97 = osf1_socket */ + { SYF_MPSAFE | AS(linux_connect_args), (sy_call_t *)linux_connect, AUE_CONNECT }, /* 98 = linux_connect */ + { SYF_MPSAFE | AS(accept_args), (sy_call_t *)oaccept, AUE_ACCEPT }, /* 99 = accept */ + { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY }, /* 100 = linux_getpriority */ + { SYF_MPSAFE | AS(osend_args), (sy_call_t *)osend, AUE_SEND }, /* 101 = osend */ + { SYF_MPSAFE | AS(orecv_args), (sy_call_t *)orecv, AUE_RECV }, /* 102 = orecv */ { SYF_MPSAFE | AS(osf1_sigreturn_args), (sy_call_t *)osf1_sigreturn, AUE_NULL }, /* 103 = osf1_sigreturn */ - { SYF_MPSAFE | AS(bind_args), (sy_call_t *)bind, AUE_NULL }, /* 104 = bind */ - { SYF_MPSAFE | AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_NULL }, /* 105 = setsockopt */ - { SYF_MPSAFE | AS(listen_args), (sy_call_t *)listen, AUE_NULL }, /* 106 = listen */ + { SYF_MPSAFE | AS(bind_args), (sy_call_t *)bind, AUE_BIND }, /* 104 = bind */ + { SYF_MPSAFE | AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT }, /* 105 = setsockopt */ + { SYF_MPSAFE | AS(listen_args), (sy_call_t *)listen, AUE_LISTEN }, /* 106 = listen */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 107 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 108 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 109 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 110 = */ { SYF_MPSAFE | AS(osf1_sigsuspend_args), (sy_call_t *)osf1_sigsuspend, AUE_NULL }, /* 111 = osf1_sigsuspend */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 112 = osf_sigstack */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_recvmsg, AUE_NULL }, /* 113 = linux_recvmsg */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_sendmsg, AUE_NULL }, /* 114 = linux_sendmsg */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_recvmsg, AUE_RECVMSG }, /* 113 = linux_recvmsg */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_sendmsg, AUE_SENDMSG }, /* 114 = linux_sendmsg */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 115 = */ { SYF_MPSAFE | AS(osf1_gettimeofday_args), (sy_call_t *)osf1_gettimeofday, AUE_NULL }, /* 116 = osf1_gettimeofday */ - { SYF_MPSAFE | AS(osf1_getrusage_args), (sy_call_t *)osf1_getrusage, AUE_NULL }, /* 117 = osf1_getrusage */ - { SYF_MPSAFE | AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_NULL }, /* 118 = getsockopt */ + { SYF_MPSAFE | AS(osf1_getrusage_args), (sy_call_t *)osf1_getrusage, AUE_GETRUSAGE }, /* 117 = osf1_getrusage */ + { SYF_MPSAFE | AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_GETSOCKOPT }, /* 118 = getsockopt */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 119 = */ - { SYF_MPSAFE | AS(readv_args), (sy_call_t *)readv, AUE_NULL }, /* 120 = readv */ - { SYF_MPSAFE | AS(writev_args), (sy_call_t *)writev, AUE_NULL }, /* 121 = writev */ + { SYF_MPSAFE | AS(readv_args), (sy_call_t *)readv, AUE_READV }, /* 120 = readv */ + { SYF_MPSAFE | AS(writev_args), (sy_call_t *)writev, AUE_WRITEV }, /* 121 = writev */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 122 = osf_settimeofday */ - { SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 123 = fchown */ - { SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_NULL }, /* 124 = fchmod */ - { SYF_MPSAFE | AS(recvfrom_args), (sy_call_t *)orecvfrom, AUE_NULL }, /* 125 = recvfrom */ - { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_NULL }, /* 126 = setreuid */ - { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_NULL }, /* 127 = setregid */ - { SYF_MPSAFE | AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_NULL }, /* 128 = linux_rename */ - { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_NULL }, /* 129 = linux_truncate */ - { SYF_MPSAFE | AS(oftruncate_args), (sy_call_t *)oftruncate, AUE_NULL }, /* 130 = oftruncate */ - { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_NULL }, /* 131 = flock */ - { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_NULL }, /* 132 = setgid */ - { SYF_MPSAFE | AS(osf1_sendto_args), (sy_call_t *)osf1_sendto, AUE_NULL }, /* 133 = osf1_sendto */ - { SYF_MPSAFE | AS(shutdown_args), (sy_call_t *)shutdown, AUE_NULL }, /* 134 = shutdown */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_socketpair, AUE_NULL }, /* 135 = linux_socketpair */ - { SYF_MPSAFE | AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_NULL }, /* 136 = linux_mkdir */ - { SYF_MPSAFE | AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_NULL }, /* 137 = linux_rmdir */ - { SYF_MPSAFE | AS(utimes_args), (sy_call_t *)utimes, AUE_NULL }, /* 138 = utimes */ + { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 123 = fchown */ + { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 124 = fchmod */ + { AS(recvfrom_args), (sy_call_t *)orecvfrom, AUE_RECVFROM }, /* 125 = recvfrom */ + { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 126 = setreuid */ + { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 127 = setregid */ + { SYF_MPSAFE | AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME }, /* 128 = linux_rename */ + { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 129 = linux_truncate */ + { SYF_MPSAFE | AS(oftruncate_args), (sy_call_t *)oftruncate, AUE_FTRUNCATE }, /* 130 = oftruncate */ + { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 131 = flock */ + { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID }, /* 132 = setgid */ + { SYF_MPSAFE | AS(osf1_sendto_args), (sy_call_t *)osf1_sendto, AUE_SENDTO }, /* 133 = osf1_sendto */ + { SYF_MPSAFE | AS(shutdown_args), (sy_call_t *)shutdown, AUE_SHUTDOWN }, /* 134 = shutdown */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_socketpair, AUE_SOCKETPAIR }, /* 135 = linux_socketpair */ + { SYF_MPSAFE | AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR }, /* 136 = linux_mkdir */ + { SYF_MPSAFE | AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR }, /* 137 = linux_rmdir */ + { SYF_MPSAFE | AS(utimes_args), (sy_call_t *)utimes, AUE_UTIMES }, /* 138 = utimes */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 139 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 140 = */ - { SYF_MPSAFE | AS(ogetpeername_args), (sy_call_t *)ogetpeername, AUE_NULL }, /* 141 = ogetpeername */ + { SYF_MPSAFE | AS(ogetpeername_args), (sy_call_t *)ogetpeername, AUE_GETPEERNAME }, /* 141 = ogetpeername */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 142 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 143 = */ - { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_NULL }, /* 144 = linux_getrlimit */ - { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_NULL }, /* 145 = linux_setrlimit */ + { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT }, /* 144 = linux_getrlimit */ + { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT }, /* 145 = linux_setrlimit */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 146 = */ - { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_NULL }, /* 147 = setsid */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_quotactl, AUE_NULL }, /* 148 = linux_quotactl */ + { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_SETSID }, /* 147 = setsid */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL }, /* 148 = linux_quotactl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 149 = */ - { SYF_MPSAFE | AS(getsockname_args), (sy_call_t *)ogetsockname, AUE_NULL }, /* 150 = getsockname */ + { SYF_MPSAFE | AS(getsockname_args), (sy_call_t *)ogetsockname, AUE_GETSOCKNAME }, /* 150 = getsockname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 151 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 152 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 153 = */ @@ -186,7 +186,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 163 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 164 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 165 = osf_getdomainname */ - { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_NULL }, /* 166 = setdomainname */ + { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL }, /* 166 = setdomainname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 167 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 168 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 169 = */ @@ -220,24 +220,24 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 197 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 198 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 199 = osf_swapon */ - { SYF_MPSAFE | AS(linux_msgctl_args), (sy_call_t *)linux_msgctl, AUE_NULL }, /* 200 = linux_msgctl */ - { SYF_MPSAFE | AS(linux_msgget_args), (sy_call_t *)linux_msgget, AUE_NULL }, /* 201 = linux_msgget */ - { SYF_MPSAFE | AS(linux_msgrcv_args), (sy_call_t *)linux_msgrcv, AUE_NULL }, /* 202 = linux_msgrcv */ - { SYF_MPSAFE | AS(linux_msgsnd_args), (sy_call_t *)linux_msgsnd, AUE_NULL }, /* 203 = linux_msgsnd */ - { AS(linux_semctl_args), (sy_call_t *)linux_semctl, AUE_NULL }, /* 204 = linux_semctl */ - { SYF_MPSAFE | AS(linux_semget_args), (sy_call_t *)linux_semget, AUE_NULL }, /* 205 = linux_semget */ - { SYF_MPSAFE | AS(linux_semop_args), (sy_call_t *)linux_semop, AUE_NULL }, /* 206 = linux_semop */ + { SYF_MPSAFE | AS(linux_msgctl_args), (sy_call_t *)linux_msgctl, AUE_MSGCTL }, /* 200 = linux_msgctl */ + { SYF_MPSAFE | AS(linux_msgget_args), (sy_call_t *)linux_msgget, AUE_MSGGET }, /* 201 = linux_msgget */ + { SYF_MPSAFE | AS(linux_msgrcv_args), (sy_call_t *)linux_msgrcv, AUE_MSGRCV }, /* 202 = linux_msgrcv */ + { SYF_MPSAFE | AS(linux_msgsnd_args), (sy_call_t *)linux_msgsnd, AUE_MSGSND }, /* 203 = linux_msgsnd */ + { AS(linux_semctl_args), (sy_call_t *)linux_semctl, AUE_SEMCTL }, /* 204 = linux_semctl */ + { SYF_MPSAFE | AS(linux_semget_args), (sy_call_t *)linux_semget, AUE_SEMGET }, /* 205 = linux_semget */ + { SYF_MPSAFE | AS(linux_semop_args), (sy_call_t *)linux_semop, AUE_SEMOP }, /* 206 = linux_semop */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 207 = osf_utsname */ - { SYF_MPSAFE | AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_NULL }, /* 208 = linux_lchown */ - { SYF_MPSAFE | AS(linux_shmat_args), (sy_call_t *)linux_shmat, AUE_NULL }, /* 209 = linux_shmat */ - { SYF_MPSAFE | AS(linux_shmctl_args), (sy_call_t *)linux_shmctl, AUE_NULL }, /* 210 = linux_shmctl */ - { SYF_MPSAFE | AS(linux_shmdt_args), (sy_call_t *)linux_shmdt, AUE_NULL }, /* 211 = linux_shmdt */ - { SYF_MPSAFE | AS(linux_shmget_args), (sy_call_t *)linux_shmget, AUE_NULL }, /* 212 = linux_shmget */ + { SYF_MPSAFE | AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN }, /* 208 = linux_lchown */ + { SYF_MPSAFE | AS(linux_shmat_args), (sy_call_t *)linux_shmat, AUE_SHMAT }, /* 209 = linux_shmat */ + { SYF_MPSAFE | AS(linux_shmctl_args), (sy_call_t *)linux_shmctl, AUE_SHMCTL }, /* 210 = linux_shmctl */ + { SYF_MPSAFE | AS(linux_shmdt_args), (sy_call_t *)linux_shmdt, AUE_SHMDT }, /* 211 = linux_shmdt */ + { SYF_MPSAFE | AS(linux_shmget_args), (sy_call_t *)linux_shmget, AUE_SHMGET }, /* 212 = linux_shmget */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 213 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 214 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 215 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 216 = */ - { SYF_MPSAFE | AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_NULL }, /* 217 = linux_msync */ + { SYF_MPSAFE | AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC }, /* 217 = linux_msync */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 218 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 219 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 220 = */ @@ -253,8 +253,8 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 230 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 231 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 232 = */ - { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_NULL }, /* 233 = getpgid */ - { SYF_MPSAFE | AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_NULL }, /* 234 = linux_getsid */ + { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPPID }, /* 233 = getpgid */ + { SYF_MPSAFE | AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID }, /* 234 = linux_getsid */ { SYF_MPSAFE | 0, (sy_call_t *)linux_sigaltstack, AUE_NULL }, /* 235 = linux_sigaltstack */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 236 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 237 = */ @@ -320,57 +320,57 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 297 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 298 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 299 = */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_bdflush, AUE_NULL }, /* 300 = linux_bdflush */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH }, /* 300 = linux_bdflush */ { SYF_MPSAFE | 0, (sy_call_t *)linux_sethae, AUE_NULL }, /* 301 = linux_sethae */ - { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_NULL }, /* 302 = linux_mount */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_old_adjtimex, AUE_NULL }, /* 303 = linux_old_adjtimex */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_swapoff, AUE_NULL }, /* 304 = linux_swapoff */ - { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_NULL }, /* 305 = linux_getdents */ + { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT }, /* 302 = linux_mount */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_old_adjtimex, AUE_ADJTIME }, /* 303 = linux_old_adjtimex */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF }, /* 304 = linux_swapoff */ + { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS }, /* 305 = linux_getdents */ { SYF_MPSAFE | 0, (sy_call_t *)linux_create_module, AUE_NULL }, /* 306 = linux_create_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_init_module, AUE_NULL }, /* 307 = linux_init_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_delete_module, AUE_NULL }, /* 308 = linux_delete_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL }, /* 309 = linux_get_kernel_syms */ { SYF_MPSAFE | AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL }, /* 310 = linux_syslog */ - { SYF_MPSAFE | AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_NULL }, /* 311 = linux_reboot */ - { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_NULL }, /* 312 = linux_clone */ - { AS(linux_uselib_args), (sy_call_t *)linux_uselib, AUE_NULL }, /* 313 = linux_uselib */ - { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_NULL }, /* 314 = mlock */ - { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_NULL }, /* 315 = munlock */ - { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_NULL }, /* 316 = mlockall */ - { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_NULL }, /* 317 = munlockall */ + { SYF_MPSAFE | AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT }, /* 311 = linux_reboot */ + { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK }, /* 312 = linux_clone */ + { AS(linux_uselib_args), (sy_call_t *)linux_uselib, AUE_USELIB }, /* 313 = linux_uselib */ + { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK }, /* 314 = mlock */ + { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK }, /* 315 = munlock */ + { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL }, /* 316 = mlockall */ + { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL }, /* 317 = munlockall */ { SYF_MPSAFE | 0, (sy_call_t *)linux_sysinfo, AUE_NULL }, /* 318 = linux_sysinfo */ - { SYF_MPSAFE | AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_NULL }, /* 319 = linux_sysctl */ + { SYF_MPSAFE | AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL }, /* 319 = linux_sysctl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 320 = sys_idle */ - { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_NULL }, /* 321 = linux_oldumount */ - { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_NULL }, /* 322 = swapon */ + { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT }, /* 321 = linux_oldumount */ + { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 322 = swapon */ { SYF_MPSAFE | AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 323 = linux_times */ - { SYF_MPSAFE | AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_NULL }, /* 324 = linux_personality */ - { SYF_MPSAFE | AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_NULL }, /* 325 = linux_setfsuid */ - { SYF_MPSAFE | AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_NULL }, /* 326 = linux_setfsgid */ + { SYF_MPSAFE | AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY }, /* 324 = linux_personality */ + { SYF_MPSAFE | AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID }, /* 325 = linux_setfsuid */ + { SYF_MPSAFE | AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID }, /* 326 = linux_setfsgid */ { SYF_MPSAFE | AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL }, /* 327 = linux_ustat */ - { SYF_MPSAFE | AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_NULL }, /* 328 = linux_statfs */ - { SYF_MPSAFE | AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_NULL }, /* 329 = linux_fstatfs */ - { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL }, /* 330 = sched_setparam */ - { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL }, /* 331 = sched_getparam */ - { SYF_MPSAFE | AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_NULL }, /* 332 = linux_sched_setscheduler */ - { SYF_MPSAFE | AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_NULL }, /* 333 = linux_sched_getscheduler */ + { SYF_MPSAFE | AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS }, /* 328 = linux_statfs */ + { SYF_MPSAFE | AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS }, /* 329 = linux_fstatfs */ + { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM }, /* 330 = sched_setparam */ + { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM }, /* 331 = sched_getparam */ + { SYF_MPSAFE | AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER }, /* 332 = linux_sched_setscheduler */ + { SYF_MPSAFE | AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER }, /* 333 = linux_sched_getscheduler */ { SYF_MPSAFE | 0, (sy_call_t *)sched_yield, AUE_NULL }, /* 334 = sched_yield */ - { SYF_MPSAFE | AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_NULL }, /* 335 = linux_sched_get_priority_max */ - { SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_NULL }, /* 336 = linux_sched_get_priority_min */ - { SYF_MPSAFE | AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_NULL }, /* 337 = sched_rr_get_interval */ + { SYF_MPSAFE | AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX }, /* 335 = linux_sched_get_priority_max */ + { SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN }, /* 336 = linux_sched_get_priority_min */ + { SYF_MPSAFE | AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL }, /* 337 = sched_rr_get_interval */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 338 = sys_afs_syscall */ { SYF_MPSAFE | AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL }, /* 339 = linux_newuname */ { SYF_MPSAFE | AS(nanosleep_args), (sy_call_t *)nanosleep, AUE_NULL }, /* 340 = nanosleep */ { SYF_MPSAFE | AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL }, /* 341 = linux_mremap */ { SYF_MPSAFE | 0, (sy_call_t *)linux_nfsservctl, AUE_NULL }, /* 342 = linux_nfsservctl */ - { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_NULL }, /* 343 = setresuid */ - { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_NULL }, /* 344 = getresuid */ + { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID }, /* 343 = setresuid */ + { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID }, /* 344 = getresuid */ { SYF_MPSAFE | 0, (sy_call_t *)linux_pciconfig_read, AUE_NULL }, /* 345 = linux_pciconfig_read */ { SYF_MPSAFE | 0, (sy_call_t *)linux_pciconfig_write, AUE_NULL }, /* 346 = linux_pciconfig_write */ { SYF_MPSAFE | 0, (sy_call_t *)linux_query_module, AUE_NULL }, /* 347 = linux_query_module */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_prctl, AUE_NULL }, /* 348 = linux_prctl */ - { SYF_MPSAFE | AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_NULL }, /* 349 = linux_pread */ - { SYF_MPSAFE | AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_NULL }, /* 350 = linux_pwrite */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_prctl, AUE_PRCTL }, /* 348 = linux_prctl */ + { SYF_MPSAFE | AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD }, /* 349 = linux_pread */ + { SYF_MPSAFE | AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE }, /* 350 = linux_pwrite */ { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigreturn, AUE_NULL }, /* 351 = linux_rt_sigreturn */ { SYF_MPSAFE | AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL }, /* 352 = linux_rt_sigaction */ { SYF_MPSAFE | AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL }, /* 353 = linux_rt_sigprocmask */ @@ -378,24 +378,24 @@ { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL }, /* 355 = linux_rt_sigtimedwait */ { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL }, /* 356 = linux_rt_sigqueueinfo */ { SYF_MPSAFE | AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL }, /* 357 = linux_rt_sigsuspend */ - { SYF_MPSAFE | AS(linux_select_args), (sy_call_t *)linux_select, AUE_NULL }, /* 358 = linux_select */ + { SYF_MPSAFE | AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT }, /* 358 = linux_select */ { SYF_MPSAFE | AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_NULL }, /* 359 = gettimeofday */ - { SYF_MPSAFE | AS(settimeofday_args), (sy_call_t *)settimeofday, AUE_NULL }, /* 360 = settimeofday */ - { SYF_MPSAFE | AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_NULL }, /* 361 = linux_getitimer */ - { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_NULL }, /* 362 = linux_setitimer */ - { SYF_MPSAFE | AS(linux_utimes_args), (sy_call_t *)linux_utimes, AUE_NULL }, /* 363 = linux_utimes */ - { SYF_MPSAFE | AS(getrusage_args), (sy_call_t *)getrusage, AUE_NULL }, /* 364 = getrusage */ - { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_NULL }, /* 365 = linux_wait4 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_adjtimex, AUE_NULL }, /* 366 = linux_adjtimex */ - { SYF_MPSAFE | AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_NULL }, /* 367 = linux_getcwd */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_capget, AUE_NULL }, /* 368 = linux_capget */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_capset, AUE_NULL }, /* 369 = linux_capset */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_sendfile, AUE_NULL }, /* 370 = linux_sendfile */ - { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_NULL }, /* 371 = setresgid */ - { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_NULL }, /* 372 = getresgid */ + { SYF_MPSAFE | AS(settimeofday_args), (sy_call_t *)settimeofday, AUE_SETTIMEOFDAY }, /* 360 = settimeofday */ + { SYF_MPSAFE | AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER }, /* 361 = linux_getitimer */ + { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER }, /* 362 = linux_setitimer */ + { SYF_MPSAFE | AS(linux_utimes_args), (sy_call_t *)linux_utimes, AUE_UTIMES }, /* 363 = linux_utimes */ + { SYF_MPSAFE | AS(getrusage_args), (sy_call_t *)getrusage, AUE_GETRUSAGE }, /* 364 = getrusage */ + { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4 }, /* 365 = linux_wait4 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME }, /* 366 = linux_adjtimex */ + { SYF_MPSAFE | AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD }, /* 367 = linux_getcwd */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_capget, AUE_CAPGET }, /* 368 = linux_capget */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_capset, AUE_CAPSET }, /* 369 = linux_capset */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE }, /* 370 = linux_sendfile */ + { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID }, /* 371 = setresgid */ + { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID }, /* 372 = getresgid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 373 = sys_dipc */ - { SYF_MPSAFE | AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_NULL }, /* 374 = linux_pivot_root */ - { SYF_MPSAFE | AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_NULL }, /* 375 = linux_mincore */ + { SYF_MPSAFE | AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT }, /* 374 = linux_pivot_root */ + { SYF_MPSAFE | AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE }, /* 375 = linux_mincore */ { SYF_MPSAFE | 0, (sy_call_t *)linux_pciconfig_iobase, AUE_NULL }, /* 376 = linux_pciconfig_iobase */ - { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_NULL }, /* 377 = linux_getdents64 */ + { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS }, /* 377 = linux_getdents64 */ }; ==== //depot/projects/arm/src/sys/alpha/linux/syscalls.master#5 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.65 2006/02/04 14:03:22 rwatson Exp $ + $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -462,7 +462,7 @@ 323 AUE_NULL MSTD { int linux_times(struct l_times_argv *buf); } 324 AUE_PERSONALITY MSTD { int linux_personality(l_ulong per); } 325 AUE_SETFSUID MSTD { int linux_setfsuid(l_uid_t uid); } -326 AUE_GETFSUID MSTD { int linux_setfsgid(l_gid_t gid); } +326 AUE_SETFSGID MSTD { int linux_setfsgid(l_gid_t gid); } 327 AUE_NULL MSTD { int linux_ustat(l_dev_t dev, \ struct l_ustat *ubuf); } 328 AUE_STATFS MSTD { int linux_statfs(char *path, \ ==== //depot/projects/arm/src/sys/arm/include/atomic.h#4 (text+ko) ==== @@ -33,7 +33,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/atomic.h,v 1.15 2005/12/09 22:58:07 cognet Exp $ + * $FreeBSD: src/sys/arm/include/atomic.h,v 1.16 2006/02/05 22:06:12 cognet Exp $ */ #ifndef _MACHINE_ATOMIC_H_ @@ -154,17 +154,16 @@ "adr %1, 1b\n" "mov %0, #0xe0000004\n" "str %1, [%0]\n" - "ldr %1, %2\n" + "ldr %1, [%2]\n" "cmp %1, %3\n" - "streq %4, %2\n" + "streq %4, [%2]\n" "2:\n" "mov %1, #0\n" "str %1, [%0]\n" "moveq %1, #1\n" "movne %1, #0\n" : "=r" (ras_start), "=r" (done) - ,"=m" (*p), "+r" (cmpval), "+r" (newval) - : "m" (*p)); + ,"+r" (p), "+r" (cmpval), "+r" (newval)); return (done); } @@ -180,14 +179,13 @@ "adr %1, 1b\n" "mov %0, #0xe0000004\n" "str %1, [%0]\n" - "ldr %1, %2\n" + "ldr %1, [%2]\n" "add %1, %1, %3\n" - "str %1, %2\n" + "str %1, [%2]\n" "2:\n" "mov %1, #0\n" "str %1, [%0]\n" - : "=r" (ras_start), "=r" (start), "=m" (*p), "+r" (val) - : "m" (*p)); + : "=r" (ras_start), "=r" (start), "+r" (p), "+r" (val)); } static __inline void @@ -202,15 +200,14 @@ "adr %1, 1b\n" "mov %0, #0xe0000004\n" "str %1, [%0]\n" - "ldr %1, %2\n" + "ldr %1, [%2]\n" "sub %1, %1, %3\n" - "str %1, %2\n" + "str %1, [%2]\n" "2:\n" "mov %1, #0\n" "str %1, [%0]\n" - : "=r" (ras_start), "=r" (start), "=m" (*p), "+r" (val) - : "m" (*p)); + : "=r" (ras_start), "=r" (start), "+r" (p), "+r" (val)); } static __inline void @@ -225,15 +222,14 @@ "adr %1, 1b\n" "mov %0, #0xe0000004\n" "str %1, [%0]\n" - "ldr %1, %2\n" + "ldr %1, [%2]\n" "orr %1, %1, %3\n" - "str %1, %2\n" + "str %1, [%2]\n" "2:\n" "mov %1, #0\n" "str %1, [%0]\n" - : "=r" (ras_start), "=r" (start), "=m" (*address), "+r" (setmask) - : "m" (*address)); + : "=r" (ras_start), "=r" (start), "+r" (address), "+r" (setmask)); } static __inline void @@ -248,14 +244,13 @@ "adr %1, 1b\n" "mov %0, #0xe0000004\n" "str %1, [%0]\n" - "ldr %1, %2\n" + "ldr %1, [%2]\n" "bic %1, %1, %3\n" - "str %1, %2\n" + "str %1, [%2]\n" "2:\n" "mov %1, #0\n" "str %1, [%0]\n" - : "=r" (ras_start), "=r" (start), "=m" (*address), "+r" (clearmask) - : "m" (*address)); + : "=r" (ras_start), "=r" (start), "+r" (address), "+r" (clearmask)); } @@ -271,14 +266,13 @@ "adr %1, 1b\n" "mov %0, #0xe0000004\n" "str %1, [%0]\n" - "ldr %1, %2\n" + "ldr %1, [%2]\n" "add %3, %1, %3\n" - "str %3, %2\n" + "str %3, [%2]\n" "2:\n" "mov %3, #0\n" "str %3, [%0]\n" - : "=r" (ras_start), "=r" (start), "=m" (*p), "+r" (v) - : "m" (*p)); + : "=r" (ras_start), "=r" (start), "+r" (p), "+r" (v)); return (start); } ==== //depot/projects/arm/src/sys/bsm/audit_kevents.h#5 (text+ko) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/arm/src/sys/bsm/audit_kevents.h#4 $ - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.4 2006/02/04 13:22:44 rwatson Exp $ + * $P4: //depot/projects/arm/src/sys/bsm/audit_kevents.h#5 $ + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.5 2006/02/06 01:12:46 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -361,7 +361,7 @@ #define AUE_NMOUNT 380 /* FreeBSD-specific. */ #define AUE_BDFLUSH 381 /* Linux-specific. */ #define AUE_SETFSUID 382 /* Linux-specific. */ -#define AUE_GETFSUID 383 /* Linux-specific. */ +#define AUE_SETFSGID 383 /* Linux-specific. */ #define AUE_PERSONALITY 384 /* Linux-specific. */ #define AUE_SCHED_GETSCHEDULER 385 /* POSIX.1b. */ #define AUE_SCHED_SETSCHEDULER 386 /* POSIX.1b. */ @@ -384,6 +384,7 @@ #define AUE_ACL_DELETE_FD 403 /* FreeBSD. */ #define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ #define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ +#define AUE_SYSARCH 406 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/arm/src/sys/conf/NOTES#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1351 2006/02/03 15:53:37 rwatson Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1352 2006/02/05 05:06:04 kensmith Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1478,12 +1478,6 @@ #options SYM_SETUP_MAX_LUN #-Number of LUNs supported # default:8, range:[1..64] -# The 'asr' driver provides support for current DPT/Adaptec SCSI RAID -# controllers (SmartRAID V and VI and later). -# These controllers require the CAM infrastructure. -# -device asr - # The 'dpt' driver provides support for old DPT controllers (http://www.dpt.com/). # These have hardware RAID-{0,1,5} support, and do multi-initiator I/O. # The DPT controllers are commonly re-licensed under other brand-names - ==== //depot/projects/arm/src/sys/contrib/pf/net/if_pflog.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.18 2005/12/05 11:58:31 ru Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.19 2006/02/05 17:17:32 mlaier Exp $ */ /* $OpenBSD: if_pflog.c,v 1.12 2004/05/19 17:50:51 dhartmei Exp $ */ /* @@ -376,9 +376,15 @@ case MOD_LOAD: LIST_INIT(&pflog_list); if_clone_attach(&pflog_cloner); + PF_LOCK(); + pflog_packet_ptr = pflog_packet; + PF_UNLOCK(); break; case MOD_UNLOAD: + PF_LOCK(); + pflog_packet_ptr = NULL; + PF_UNLOCK(); if_clone_detach(&pflog_cloner); break; @@ -400,4 +406,5 @@ DECLARE_MODULE(pflog, pflog_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY); MODULE_VERSION(pflog, PFLOG_MODVER); +MODULE_DEPEND(pflog, pf, PF_MODVER, PF_MODVER, PF_MODVER); #endif /* __FreeBSD__ */ ==== //depot/projects/arm/src/sys/contrib/pf/net/if_pflog.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.h,v 1.6 2005/06/10 16:49:03 brooks Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.h,v 1.7 2006/02/05 17:17:32 mlaier Exp $ */ /* $OpenBSD: if_pflog.h,v 1.11 2004/05/19 17:50:51 dhartmei Exp $ */ /* @@ -70,10 +70,24 @@ #ifdef _KERNEL +#ifdef __FreeBSD__ +/* XXX */ +#include + +typedef int pflog_packet_t(struct pfi_kif *, struct mbuf *, sa_family_t, + u_int8_t, u_int8_t, struct pf_rule *, struct pf_rule *, + struct pf_ruleset *); +extern pflog_packet_t *pflog_packet_ptr; +#define PFLOG_PACKET(i,x,a,b,c,d,e,f,g) do { \ + if (pflog_packet_ptr != NULL) \ + pflog_packet_ptr(i,a,b,c,d,e,f,g); \ +} while (0) +#else #if NPFLOG > 0 #define PFLOG_PACKET(i,x,a,b,c,d,e,f,g) pflog_packet(i,a,b,c,d,e,f,g) #else #define PFLOG_PACKET(i,x,a,b,c,d,e,f,g) ((void)0) #endif /* NPFLOG > 0 */ +#endif /* __FreeBSD__ */ #endif /* _KERNEL */ #endif /* _NET_IF_PFLOG_H_ */ ==== //depot/projects/arm/src/sys/contrib/pf/net/pf_ioctl.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.22 2005/12/05 11:58:31 ru Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.23 2006/02/05 17:17:32 mlaier Exp $ */ /* $OpenBSD: pf_ioctl.c,v 1.139 2005/03/03 07:13:39 dhartmei Exp $ */ /* @@ -108,6 +108,10 @@ #include #endif /* NPFSYNC > 0 */ +#ifdef __FreeBSD__ +#include +#endif + #ifdef INET6 #include #include @@ -230,6 +234,7 @@ static volatile int pf_pfil_hooked = 0; struct mtx pf_task_mtx; +pflog_packet_t *pflog_packet_ptr = NULL; void init_pf_mutex(void) ==== //depot/projects/arm/src/sys/dev/asr/asr.c#6 (text+ko) ==== @@ -165,7 +165,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.75 2006/02/04 17:56:17 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.76 2006/02/05 05:05:27 scottl Exp $"); #define ASR_VERSION 1 #define ASR_REVISION '1' @@ -538,7 +538,7 @@ static U32 ASR_initiateCp(Asr_softc_t *sc, PI2O_MESSAGE_FRAME Message) { - U32 Mask = -1L; + U32 Mask = 0xffffffff; U32 MessageOffset; u_int Delay = 1500; @@ -609,7 +609,7 @@ KASSERT(*Reply_Ptr != 0, ("*Reply_Ptr == 0")); return(*Reply_Ptr); } - KASSERT(Old != -1L, ("Old == -1")); + KASSERT(Old != 0xffffffff, ("Old == -1")); return (0); } /* ASR_resetIOP */ ==== //depot/projects/arm/src/sys/dev/sound/isa/mss.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.103 2005/11/07 09:25:15 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.105 2006/02/05 17:35:13 netchild Exp $"); /* board-specific include files */ #include @@ -2027,8 +2027,10 @@ mss->conf_rid = 3; mss->bd_id = MD_OPTI924; mss->bd_flags |= BD_F_924PNP; - if(opti_init(dev, mss) != 0) + if(opti_init(dev, mss) != 0) { + free(mss, M_DEVBUF); return ENXIO; + } break; case 0x1022b839: /* NMX2210 */ @@ -2037,8 +2039,10 @@ case 0x01005407: /* AZT0001 */ /* put into MSS mode first (snatched from NetBSD) */ - if (azt2320_mss_mode(mss, dev) == -1) + if (azt2320_mss_mode(mss, dev) == -1) { + free(mss, M_DEVBUF); return ENXIO; + } mss->bd_flags |= BD_F_MSS_OFFSET; mss->io_rid = 2; ==== //depot/projects/arm/src/sys/dev/sound/pci/csapcm.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csapcm.c,v 1.35 2005/09/11 14:15:05 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csapcm.c,v 1.37 2006/02/05 17:34:13 netchild Exp $"); /* Buffer size on dma transfer. Fixed for CS416x. */ #define CS461x_BUFFSIZE (4 * 1024) @@ -722,6 +722,8 @@ { csa_res *resp; + KASSERT(csa != NULL, ("called with bogus resource structure")); + resp = &csa->res; if (resp->irq != NULL) { if (csa->ih) @@ -741,10 +743,8 @@ bus_dma_tag_destroy(csa->parent_dmat); csa->parent_dmat = NULL; } - if (csa != NULL) { - free(csa, M_DEVBUF); - csa = NULL; - } + + free(csa, M_DEVBUF); } static int ==== //depot/projects/arm/src/sys/dev/sound/pcm/sound.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.97 2005/10/02 15:43:57 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.98 2006/02/05 17:47:26 netchild Exp $"); devclass_t pcm_devclass; @@ -862,6 +862,10 @@ SLIST_FOREACH(sce, &d->channels, link) { c = sce->channel; + + KASSERT(c->bufhard != NULL && c->bufsoft != NULL, + ("hosed pcm channel setup")); + sbuf_printf(s, "\n\t"); /* it would be better to indent child channels */ @@ -877,24 +881,22 @@ sbuf_printf(s, ", pid %d", c->pid); sbuf_printf(s, "\n\t"); - if (c->bufhard != NULL && c->bufsoft != NULL) { - sbuf_printf(s, "interrupts %d, ", c->interrupts); - if (c->direction == PCMDIR_REC) - sbuf_printf(s, "overruns %d, hfree %d, sfree %d [b:%d/%d/%d|bs:%d/%d/%d]", - c->xruns, sndbuf_getfree(c->bufhard), sndbuf_getfree(c->bufsoft), - sndbuf_getsize(c->bufhard), sndbuf_getblksz(c->bufhard), - sndbuf_getblkcnt(c->bufhard), - sndbuf_getsize(c->bufsoft), sndbuf_getblksz(c->bufsoft), - sndbuf_getblkcnt(c->bufsoft)); - else - sbuf_printf(s, "underruns %d, ready %d [b:%d/%d/%d|bs:%d/%d/%d]", - c->xruns, sndbuf_getready(c->bufsoft), - sndbuf_getsize(c->bufhard), sndbuf_getblksz(c->bufhard), - sndbuf_getblkcnt(c->bufhard), - sndbuf_getsize(c->bufsoft), sndbuf_getblksz(c->bufsoft), - sndbuf_getblkcnt(c->bufsoft)); - sbuf_printf(s, "\n\t"); - } + sbuf_printf(s, "interrupts %d, ", c->interrupts); + if (c->direction == PCMDIR_REC) + sbuf_printf(s, "overruns %d, hfree %d, sfree %d [b:%d/%d/%d|bs:%d/%d/%d]", + c->xruns, sndbuf_getfree(c->bufhard), sndbuf_getfree(c->bufsoft), + sndbuf_getsize(c->bufhard), sndbuf_getblksz(c->bufhard), + sndbuf_getblkcnt(c->bufhard), + sndbuf_getsize(c->bufsoft), sndbuf_getblksz(c->bufsoft), + sndbuf_getblkcnt(c->bufsoft)); + else + sbuf_printf(s, "underruns %d, ready %d [b:%d/%d/%d|bs:%d/%d/%d]", + c->xruns, sndbuf_getready(c->bufsoft), + sndbuf_getsize(c->bufhard), sndbuf_getblksz(c->bufhard), + sndbuf_getblkcnt(c->bufhard), + sndbuf_getsize(c->bufsoft), sndbuf_getblksz(c->bufsoft), + sndbuf_getblkcnt(c->bufsoft)); + sbuf_printf(s, "\n\t"); sbuf_printf(s, "{%s}", (c->direction == PCMDIR_REC)? "hardware" : "userland"); sbuf_printf(s, " -> "); ==== //depot/projects/arm/src/sys/dev/sound/usb/uaudio.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uaudio.c,v 1.91 2004/11/05 17:46:14 kent Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 6 14:39:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C1DE16A42D; Mon, 6 Feb 2006 14:39:38 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 08CE116A43D for ; Mon, 6 Feb 2006 14:39:38 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC2BF43D49 for ; Mon, 6 Feb 2006 14:39:37 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k16Edba7054686 for ; Mon, 6 Feb 2006 14:39:37 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k16EdbrQ054683 for perforce@freebsd.org; Mon, 6 Feb 2006 14:39:37 GMT (envelope-from cognet@freebsd.org) Date: Mon, 6 Feb 2006 14:39:37 GMT Message-Id: <200602061439.k16EdbrQ054683@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 91237 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 14:39:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=91237 Change 91237 by cognet@cognet on 2006/02/06 14:38:54 Enable promotion of kmem_object pages. For now, map all the PTE the same way other pages are, and write-back it everytime it's needed. Keeping PTE mapped write-through would require much more work. Affected files ... .. //depot/projects/superpages/src/sys/arm/arm/pmap.c#6 edit .. //depot/projects/superpages/src/sys/arm/include/pmap.h#6 edit Differences ... ==== //depot/projects/superpages/src/sys/arm/arm/pmap.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -//* From: $NetBSD: pmap.c,v 1.148 2004/04/03 04:35:48 bsh Exp $ */ +/* From: $NetBSD: pmap.c,v 1.148 2004/04/03 04:35:48 bsh Exp $ */ /*- * Copyright 2004 Olivier Houchard. * Copyright 2003 Wasabi Systems, Inc. @@ -493,7 +493,7 @@ * we have a write-back cache, then we assume setting * only C will make those pages write-through. */ - if (cpufuncs.cf_dcache_wb_range == (void *) cpufunc_nullop) { + if (1 || cpufuncs.cf_dcache_wb_range == (void *) cpufunc_nullop) { pte_l1_s_cache_mode_pt = L1_S_B|L1_S_C; pte_l2_l_cache_mode_pt = L2_B|L2_C; pte_l2_s_cache_mode_pt = L2_B|L2_C; @@ -569,9 +569,11 @@ pte_l2_l_cache_mode = L2_B | L2_C; pte_l2_s_cache_mode = L2_B | L2_C; +#if 0 pte_l1_s_cache_mode_pt = L1_S_C; pte_l2_l_cache_mode_pt = L2_C; pte_l2_s_cache_mode_pt = L2_C; +#endif } #endif /* CPU_ARM10 */ @@ -617,9 +619,11 @@ pte_l2_s_cache_mode = L2_B|L2_C; pte_l2_s_cache_mask = L2_S_CACHE_MASK_xscale; +#if 0 pte_l1_s_cache_mode_pt = L1_S_C; pte_l2_l_cache_mode_pt = L2_C; pte_l2_s_cache_mode_pt = L2_C; +#endif #ifdef XSCALE_CACHE_READ_WRITE_ALLOCATE /* * The XScale core has an enhanced mode where writes that @@ -678,6 +682,9 @@ xscale_use_minidata = 1; #endif + pte_l1_s_cache_mode_pt = pte_l1_s_cache_mode; + pte_l2_l_cache_mode_pt = pte_l2_s_cache_mode; + pte_l2_s_cache_mode_pt = pte_l2_s_cache_mode; pte_l2_s_prot_u = L2_S_PROT_U_xscale; pte_l2_s_prot_w = L2_S_PROT_W_xscale; pte_l2_s_prot_mask = L2_S_PROT_MASK_xscale; @@ -1558,10 +1565,11 @@ /* There's no way we can do it. */ return; } - if ((ptep[i] & pte_l2_s_cache_mask) == + if (((ptep[i] & pte_l2_s_cache_mask) == pte_l2_s_cache_mode_pt || (ptep[i - 1] & pte_l2_s_cache_mask) == - pte_l2_s_cache_mode_pt) + pte_l2_s_cache_mode_pt) && pte_l2_s_cache_mode_pt + != pte_l2_s_cache_mode) panic("fuck"); } #ifdef SP_DEBUG @@ -1572,10 +1580,11 @@ if (*ptep & L2_S_PROT_W) pa0 |= L2_L_PROT_W; /* Let's do it. */ - for (i = 0; i < 0x10; i++) + for (i = 0; i < 0x10; i++) { + pmap_tlb_flushID_SE(pmap, va + i * PAGE_SIZE); ptep[i] = pa0 | L2_L_PROTO | pte_l2_l_cache_mode; - pmap_tlb_flushID(pmap); + } } static void @@ -1614,8 +1623,10 @@ pa = (pt[i] & L2_L_FRAME) + (i & 0xf) * PAGE_SIZE; else pa = pt[i] & L2_S_FRAME; - if ((pt[i - 1] & pte_l2_s_cache_mask) == pte_l2_s_cache_mode_pt - || (pt[i] & pte_l2_s_cache_mask) == pte_l2_s_cache_mode_pt) + if (((pt[i - 1] & pte_l2_s_cache_mask) == pte_l2_s_cache_mode_pt + || + (pt[i] & pte_l2_s_cache_mask) == pte_l2_s_cache_mode_pt) && + pte_l2_s_cache_mode_pt != pte_l2_s_cache_mode) panic("fuck2"); if ((pt[i - 1] & L2_TYPE_MASK) == L2_TYPE_L) pa2 = (pt[i - 1] & L2_L_FRAME) + @@ -1639,9 +1650,6 @@ bzero(pt, 0x100 * sizeof(*pt)); #endif pmap_free_l2_bucket(pmap, &l2->l2_bucket[L2_BUCKET(l1idx)], 0x100); - if (pmap != pmap_kernel() && l2->l2_bucket[L2_BUCKET(l1idx)].l2b_kva != NULL) - panic("missed"); - pmap_tlb_flushID(pmap); } static void @@ -3306,7 +3314,6 @@ TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) pmap_dcache_wb_range(pv->pv_pmap, pv->pv_va, PAGE_SIZE, TRUE, TRUE); } - /* * Add a list of wired pages to the kva * this routine is only used for temporary @@ -3349,7 +3356,6 @@ } } - /* * pmap_object_init_pt preloads the ptes for a given object * into the specified pmap. This eliminates the blast of soft @@ -3676,7 +3682,6 @@ mtx_unlock(&Giant); } - /* * Insert the given physical page (p) at * the specified virtual address (v) in the @@ -3949,7 +3954,7 @@ pmap_vac_me_harder(m, pmap, va); if ((va < VM_MAXUSER_ADDRESS || m->object == kernel_object || - (m->object == kmem_object && FALSE)) && m->reserv) { + (m->object == kmem_object)) && m->reserv) { if (m->reserv->refcnt > 0 && m->reserv->refcnt != SP_LARGE && (m->reserv->refcnt % SMALL) == 0) @@ -4430,11 +4435,11 @@ pmap_free_l2_bucket(pm, l2b, mappings); } + vm_page_unlock_queues(); if (flushall) { pmap_idcache_wbinv_all(pm); pmap_tlb_flushID(pm); } - vm_page_unlock_queues(); #if 0 pmap_release_pmap_lock(pm); PMAP_MAP_TO_HEAD_UNLOCK(); ==== //depot/projects/superpages/src/sys/arm/include/pmap.h#6 (text+ko) ==== @@ -254,7 +254,8 @@ #define L1_S_PROT_MASK (L1_S_PROT_U|L1_S_PROT_W) #define L1_S_CACHE_MASK_generic (L1_S_B|L1_S_C) -#define L1_S_CACHE_MASK_xscale (L1_S_B|L1_S_C|L1_S_XSCALE_TEX(TEX_XSCALE_X)) +#define L1_S_CACHE_MASK_xscale (L1_S_B|L1_S_C|L1_S_XSCALE_TEX(TEX_XSCALE_X)| \ + L1_S_XSCALE_P) #define L2_L_PROT_U (L2_AP(AP_U)) #define L2_L_PROT_W (L2_AP(AP_W)) @@ -335,7 +336,7 @@ #define PMAP_NEEDS_PTE_SYNC 1 #define PMAP_INCLUDE_PTE_SYNC #elif (ARM_MMU_SA1 == 0) -#if defined(CPU_ARM9) && !defined(ARM9_CACHE_WRITE_THROUGH) +#if 1 #define PMAP_NEEDS_PTE_SYNC 1 #define PMAP_INCLUDE_PTE_SYNC #else @@ -527,6 +528,7 @@ #endif extern vm_paddr_t dump_avail[]; + #endif /* _KERNEL */ #endif /* !LOCORE */ From owner-p4-projects@FreeBSD.ORG Mon Feb 6 15:59:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D7B4F16A447; Mon, 6 Feb 2006 15:59:44 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5E82616A447 for ; Mon, 6 Feb 2006 15:59:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3FB1A43D5A for ; Mon, 6 Feb 2006 15:59:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k16Fxh8L058274 for ; Mon, 6 Feb 2006 15:59:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k16Fxg3f058271 for perforce@freebsd.org; Mon, 6 Feb 2006 15:59:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 6 Feb 2006 15:59:42 GMT Message-Id: <200602061559.k16Fxg3f058271@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91238 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 15:59:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=91238 Change 91238 by rwatson@rwatson_peppercorn on 2006/02/06 15:59:26 Add a first cut at audit pipe support, the ability for appropriately privileged processes to register for a "tee" of the live audit record stream via a cloned special device. Unlike the commit to disk, the pipe tee is unreliable, but allows processes to unreliably track audit events via direct kernel I/O rather than going through the audit trail file. This code almost certainly doesn't work yet, but is going into the branch so it can make its way to test machines. On the todo for it is proper select/sigio/poll support, as right now it simply provides blocking read. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/conf/files#13 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#8 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#1 add .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#15 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/conf/files#13 (text+ko) ==== @@ -1828,6 +1828,7 @@ security/audit/audit_bsm.c optional audit security/audit/audit_bsm_klib.c optional audit security/audit/audit_bsm_token.c optional audit +security/audit/audit_pipe.c optional audit security/mac/mac_inet.c optional mac inet security/mac/mac_label.c optional mac security/mac/mac_net.c optional mac ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#8 (text+ko) ==== @@ -407,6 +407,11 @@ ret = EINVAL; goto out; } + + /* + * Try submitting the record to any active audit pipes. + */ + audit_pipe_submit((void *)bsm->data, bsm->len); /* * XXX ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#15 (text+ko) ==== @@ -303,4 +303,9 @@ void audit_rotate_vnode(struct ucred *cred, struct vnode *vp); +/* + * Audit pipe functions. + */ +void audit_pipe_submit(void *record, u_int record_len); + #endif /* ! _BSM_AUDIT_PRIVATE_H */ From owner-p4-projects@FreeBSD.ORG Mon Feb 6 16:26:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91FCD16A423; Mon, 6 Feb 2006 16:26:16 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3572016A420 for ; Mon, 6 Feb 2006 16:26:16 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DFA1143D4C for ; Mon, 6 Feb 2006 16:26:15 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k16GQFkB059633 for ; Mon, 6 Feb 2006 16:26:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k16GQFFn059630 for perforce@freebsd.org; Mon, 6 Feb 2006 16:26:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 6 Feb 2006 16:26:15 GMT Message-Id: <200602061626.k16GQFFn059630@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91240 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 16:26:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=91240 Change 91240 by rwatson@rwatson_zoo on 2006/02/06 16:25:59 Also send user process generated records to audit pipes. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#9 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#9 (text+ko) ==== @@ -372,6 +372,14 @@ * we ignore errors. */ if (ar->k_ar_commit & AR_COMMIT_USER) { + /* + * Try submitting the record to any active audit pipes. + */ + audit_pipe_submit((void *)ar->k_udata, ar->k_ulen); + + /* + * And to disk. + */ ret = vn_rdwr(UIO_WRITE, vp, (void *)ar->k_udata, ar->k_ulen, (off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT, cred, NULL, NULL, td); From owner-p4-projects@FreeBSD.ORG Mon Feb 6 16:33:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9174C16A423; Mon, 6 Feb 2006 16:33:25 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4FDB316A420 for ; Mon, 6 Feb 2006 16:33:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 175C043D49 for ; Mon, 6 Feb 2006 16:33:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k16GXOmk060007 for ; Mon, 6 Feb 2006 16:33:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k16GXOY4060004 for perforce@freebsd.org; Mon, 6 Feb 2006 16:33:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 6 Feb 2006 16:33:24 GMT Message-Id: <200602061633.k16GXOY4060004@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91241 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 16:33:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=91241 Change 91241 by rwatson@rwatson_zoo on 2006/02/06 16:33:03 Fix a number of bugs relating to queue handling. Audit pipes now appear to work at a fairly basic level. You can test this with praudit /dev/auditpipe. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#2 (text+ko) ==== @@ -183,13 +183,14 @@ if (ap->ap_qlen >= ap->ap_qlimit) { ape_remove = TAILQ_FIRST(&ap->ap_queue); TAILQ_REMOVE(&ap->ap_queue, ape_remove, ape_queue); - audit_pipe_entry_free(ape); + audit_pipe_entry_free(ape_remove); ap->ap_drops++; audit_pipe_drops++; } TAILQ_INSERT_TAIL(&ap->ap_queue, ape, ape_queue); ap->ap_inserts++; + ap->ap_qlen++; } /* @@ -250,6 +251,7 @@ if (ap == NULL) return (NULL); ap->ap_qlimit = AUDIT_PIPE_QLIMIT_DEFAULT; + TAILQ_INIT(&ap->ap_queue); TAILQ_INSERT_HEAD(&audit_pipe_list, ap, ap_list); audit_pipe_count++; audit_pipe_ever++; @@ -321,12 +323,13 @@ mtx_lock(&audit_pipe_mtx); ap = dev->si_drv1; - if (ap != NULL) { + if (ap == NULL) { ap = audit_pipe_alloc(); if (ap == NULL) { mtx_unlock(&audit_pipe_mtx); return (ENOMEM); } + dev->si_drv1 = ap; } else if (ap->ap_open) { mtx_unlock(&audit_pipe_mtx); return (EBUSY); From owner-p4-projects@FreeBSD.ORG Mon Feb 6 17:02:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A34D516A423; Mon, 6 Feb 2006 17:02:06 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B89C16A420 for ; Mon, 6 Feb 2006 17:02:06 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4F5B43D6B for ; Mon, 6 Feb 2006 17:02:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k16H24iY069145 for ; Mon, 6 Feb 2006 17:02:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k16H24J7069142 for perforce@freebsd.org; Mon, 6 Feb 2006 17:02:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 6 Feb 2006 17:02:04 GMT Message-Id: <200602061702.k16H24J7069142@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91243 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 17:02:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=91243 Change 91243 by rwatson@rwatson_zoo on 2006/02/06 17:01:03 If the user process passed a buffer too short for a record, drop it and loop, rather than returning truncated data to user space. This is a "truncated drop". Count truncated record drops in the audit pipe stats. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#3 (text+ko) ==== @@ -85,6 +85,7 @@ u_int64_t ap_inserts; /* Records added. */ u_int64_t ap_reads; /* Records read. */ u_int64_t ap_drops; /* Records dropped. */ + u_int64_t ap_truncates; /* Records too long. */ TAILQ_HEAD(, audit_pipe_entry) ap_queue; @@ -228,7 +229,7 @@ ape = TAILQ_FIRST(&ap->ap_queue); KASSERT((ape == NULL && ap->ap_qlen == 0) || - (ape != NULL && ap->ap_qlen != 0), ("audit_pipe_read: qlen")); + (ape != NULL && ap->ap_qlen != 0), ("audit_pipe_pop: qlen")); if (ape == NULL) return (NULL); TAILQ_REMOVE(&ap->ap_queue, ape, ape_queue); @@ -404,6 +405,15 @@ mtx_unlock(&audit_pipe_mtx); return (error); } + /* + * Simply drop records that are too long and keep waiting, as + * this helps maintain the discreet record interface. + */ + if (ape->ape_record_len < uio->uio_resid) { + audit_pipe_entry_free(ape); + ap->ap_truncates++; + continue; + } } mtx_unlock(&audit_pipe_mtx); From owner-p4-projects@FreeBSD.ORG Mon Feb 6 17:09:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A20516A423; Mon, 6 Feb 2006 17:09:14 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0938516A420 for ; Mon, 6 Feb 2006 17:09:14 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF71243D48 for ; Mon, 6 Feb 2006 17:09:13 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k16H9DRQ069369 for ; Mon, 6 Feb 2006 17:09:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k16H9D39069366 for perforce@freebsd.org; Mon, 6 Feb 2006 17:09:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 6 Feb 2006 17:09:13 GMT Message-Id: <200602061709.k16H9D39069366@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91244 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 17:09:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=91244 Change 91244 by rwatson@rwatson_zoo on 2006/02/06 17:08:25 Fix logic in last submit, it wasn't quite right. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#4 (text+ko) ==== @@ -399,22 +399,25 @@ ap = dev->si_drv1; KASSERT(ap != NULL, ("audit_pipe_read: ap == NULL")); ape = audit_pipe_pop(ap); - while ((ape = audit_pipe_pop(ap)) == NULL) { - error = cv_wait_sig(&audit_pipe_cv, &audit_pipe_mtx); - if (error) { - mtx_unlock(&audit_pipe_mtx); - return (error); - } + do { /* - * Simply drop records that are too long and keep waiting, as - * this helps maintain the discreet record interface. + * Wait for a record that fits into the read buffer, dropping + * records that would be truncated if actually passed to the + * process. This helps maintain the discreet record read + * interface. */ - if (ape->ape_record_len < uio->uio_resid) { - audit_pipe_entry_free(ape); - ap->ap_truncates++; - continue; + while ((ape = audit_pipe_pop(ap)) == NULL) { + error = cv_wait_sig(&audit_pipe_cv, &audit_pipe_mtx); + if (error) { + mtx_unlock(&audit_pipe_mtx); + return (error); + } } - } + if (ape->ape_record_len <= uio->uio_resid) + break; + audit_pipe_entry_free(ape); + ap->ap_truncates++; + } while (1); mtx_unlock(&audit_pipe_mtx); /* From owner-p4-projects@FreeBSD.ORG Mon Feb 6 18:25:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B6E8216A423; Mon, 6 Feb 2006 18:25:47 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 603BF16A420 for ; Mon, 6 Feb 2006 18:25:47 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A8D143D45 for ; Mon, 6 Feb 2006 18:25:47 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k16IPkSV075911 for ; Mon, 6 Feb 2006 18:25:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k16IPk6f075908 for perforce@freebsd.org; Mon, 6 Feb 2006 18:25:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 6 Feb 2006 18:25:46 GMT Message-Id: <200602061825.k16IPk6f075908@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91247 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 18:25:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=91247 Change 91247 by rwatson@rwatson_zoo on 2006/02/06 18:25:03 Add support for asynchronous I/O (sigio), non-blocking I/O, and select()/poll() to the audit pipe psuedo-device. Rename the audit pipe entry memory type so it is a bit shorter and aligns more nicely in vmstat -m output. Don't need to use audit_pipe_mtx to protect dev->si_drv1 references while the device is open, only during open, close, and when accessing fields in struct audit_pipe. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#5 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#5 (text+ko) ==== @@ -32,11 +32,18 @@ #include #include #include +#include #include #include #include #include +#include +#include #include +#include +#include +#include +#include #include #include @@ -54,7 +61,7 @@ * Memory types. */ static MALLOC_DEFINE(M_AUDIT_PIPE, "audit_pipe", "Audit pipes"); -static MALLOC_DEFINE(M_AUDIT_PIPE_ENTRY, "audit_pipe_entry", +static MALLOC_DEFINE(M_AUDIT_PIPE_ENTRY, "audit_pipeent", "Audit pipe entries and buffers"); /* @@ -76,8 +83,14 @@ * Description of an individual audit_pipe. Consists largely of a bounded * length queue. */ +#define AUDIT_PIPE_ASYNC 0x00000001 +#define AUDIT_PIPE_NBIO 0x00000002 struct audit_pipe { int ap_open; /* Device open? */ + u_int ap_flags; + + struct selinfo ap_selinfo; + struct sigio *ap_sigio; u_int ap_qlen; u_int ap_qlimit; @@ -192,6 +205,9 @@ TAILQ_INSERT_TAIL(&ap->ap_queue, ape, ape_queue); ap->ap_inserts++; ap->ap_qlen++; + selwakeuppri(&ap->ap_selinfo, PSOCK); + if (ap->ap_flags & AUDIT_PIPE_ASYNC) + pgsigio(&ap->ap_sigio, SIGIO, 0); } /* @@ -314,8 +330,6 @@ * Audit pipe open method. Explicit suser check isn't used as this allows * file permissions on the special device to be used to grant audit review * access. - * - * XXXRW: SIGIO/select/etc support? */ static int audit_pipe_open(struct cdev *dev, int oflags, int devtype, struct thread *td) @@ -331,12 +345,14 @@ return (ENOMEM); } dev->si_drv1 = ap; - } else if (ap->ap_open) { + } else { + KASSERT(ap->ap_open, ("audit_pipe_open: ap && !ap_open")); mtx_unlock(&audit_pipe_mtx); return (EBUSY); } - ap->ap_open++; + ap->ap_open = 1; mtx_unlock(&audit_pipe_mtx); + fsetown(td->td_proc->p_pid, &ap->ap_sigio); return (0); } @@ -348,12 +364,12 @@ { struct audit_pipe *ap; - mtx_lock(&audit_pipe_mtx); ap = dev->si_drv1; KASSERT(ap != NULL, ("audit_pipe_close: ap == NULL")); KASSERT(ap->ap_open, ("audit_pipe_close: !ap_open")); - ap->ap_open--; - KASSERT(ap->ap_open == 0, ("audit_pipe_close: ap_open")); + funsetown(&ap->ap_sigio); + mtx_lock(&audit_pipe_mtx); + ap->ap_open = 0; audit_pipe_free(ap); dev->si_drv1 = NULL; mtx_unlock(&audit_pipe_mtx); @@ -366,27 +382,65 @@ * * Would be desirable to support filtering, although perhaps something simple * like an event mask, as opposed to something complicated like BPF. - * - * XXXRW: SIGIO/select/etc support? */ static int audit_pipe_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td) { struct audit_pipe *ap; + int error; - mtx_lock(&audit_pipe_mtx); ap = dev->si_drv1; KASSERT(ap != NULL, ("audit_pipe_ioctl: ap == NULL")); - mtx_unlock(&audit_pipe_mtx); - return (ENOTTY); + switch (cmd) { + case FIONBIO: + mtx_lock(&audit_pipe_mtx); + if (*(int *)data) + ap->ap_flags |= AUDIT_PIPE_NBIO; + else + ap->ap_flags &= ~AUDIT_PIPE_NBIO; + mtx_unlock(&audit_pipe_mtx); + error = 0; + break; + + case FIONREAD: + mtx_lock(&audit_pipe_mtx); + if (TAILQ_FIRST(&ap->ap_queue) != NULL) + *(int *)data = + TAILQ_FIRST(&ap->ap_queue)->ape_record_len; + else + *(int *)data = 0; + mtx_unlock(&audit_pipe_mtx); + error = 0; + break; + + case FIOASYNC: + mtx_lock(&audit_pipe_mtx); + if (*(int *)data) + ap->ap_flags |= AUDIT_PIPE_ASYNC; + else + ap->ap_flags &= ~AUDIT_PIPE_ASYNC; + mtx_unlock(&audit_pipe_mtx); + error = 0; + break; + + case FIOSETOWN: + error = fsetown(*(int *)data, &ap->ap_sigio); + break; + + case FIOGETOWN: + *(int *)data = fgetown(&ap->ap_sigio); + error = 0; + + default: + error = ENOTTY; + } + return (error); } /* * Audit pipe read. Pull one record off the queue and copy to user space. * On error, the record is dropped. - * - * XXXRW: SIGIO/select/etc support? */ static int audit_pipe_read(struct cdev *dev, struct uio *uio, int flag) @@ -395,10 +449,9 @@ struct audit_pipe *ap; int error; - mtx_lock(&audit_pipe_mtx); ap = dev->si_drv1; KASSERT(ap != NULL, ("audit_pipe_read: ap == NULL")); - ape = audit_pipe_pop(ap); + mtx_lock(&audit_pipe_mtx); do { /* * Wait for a record that fits into the read buffer, dropping @@ -407,6 +460,10 @@ * interface. */ while ((ape = audit_pipe_pop(ap)) == NULL) { + if (ap->ap_flags & AUDIT_PIPE_NBIO) { + mtx_unlock(&audit_pipe_mtx); + return (EAGAIN); + } error = cv_wait_sig(&audit_pipe_cv, &audit_pipe_mtx); if (error) { mtx_unlock(&audit_pipe_mtx); @@ -425,22 +482,32 @@ * we abandon the remainder of the record, supporting only discreet * record reads. */ - if (ape != NULL) { - error = uiomove(ape->ape_record, ape->ape_record_len, uio); - audit_pipe_entry_free(ape); - } else - error = 0; + error = uiomove(ape->ape_record, ape->ape_record_len, uio); + audit_pipe_entry_free(ape); return (error); } /* - * Audit pipe poll. Not currently supported. + * Audit pipe poll. */ static int audit_pipe_poll(struct cdev *dev, int events, struct thread *td) { + struct audit_pipe *ap; + int revents; - return (EOPNOTSUPP); + revents = 0; + ap = dev->si_drv1; + KASSERT(ap != NULL, ("audit_pipe_poll: ap == NULL")); + if (events & (POLLIN | POLLRDNORM)) { + mtx_lock(&audit_pipe_mtx); + if (TAILQ_FIRST(&ap->ap_queue) != NULL) + revents |= events & (POLLIN | POLLRDNORM); + else + selrecord(td, &ap->ap_selinfo); + mtx_unlock(&audit_pipe_mtx); + } + return (revents); } /* From owner-p4-projects@FreeBSD.ORG Mon Feb 6 19:17:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7414816A423; Mon, 6 Feb 2006 19:17:29 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0C4E716A422; Mon, 6 Feb 2006 19:17:29 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from speedfactory.net (mail6.speedfactory.net [66.23.216.219]) by mx1.FreeBSD.org (Postfix) with ESMTP id 382CB43D45; Mon, 6 Feb 2006 19:17:28 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (unverified [66.23.211.162]) by speedfactory.net (SurgeMail 3.5b3) with ESMTP id 7868658 for multiple; Mon, 06 Feb 2006 14:18:12 -0500 Received: from localhost (john@localhost [127.0.0.1]) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k16JHR8n041914; Mon, 6 Feb 2006 14:17:27 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: Warner Losh Date: Mon, 6 Feb 2006 13:48:50 -0500 User-Agent: KMail/1.9.1 References: <200602040903.k1493lFu093402@repoman.freebsd.org> In-Reply-To: <200602040903.k1493lFu093402@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200602061348.51792.jhb@freebsd.org> X-Virus-Scanned: ClamAV 0.87.1/1278/Mon Feb 6 06:05:04 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-1.4 required=4.2 tests=ALL_TRUSTED autolearn=failed version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx X-Server: High Performance Mail Server - http://surgemail.com r=1653887525 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 91042 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 19:17:30 -0000 On Saturday 04 February 2006 04:03, Warner Losh wrote: > http://perforce.freebsd.org/chv.cgi?CH=91042 > > Change 91042 by imp@imp_plunger on 2006/02/04 09:02:46 > > Fix spelling error > Move locking to avoid nesting the locking and to give the locking a > smaller scope. You shouldn't have a LOR with the IF_ADDR_LOCK unless you have some LOR somewhere else. I used a rather simple version of locking for nic drivers where the lock was basically held for all of foo_start(), foo_init(), the ISR, etc. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Mon Feb 6 19:17:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3314D16A449; Mon, 6 Feb 2006 19:17:32 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB69D16A443; Mon, 6 Feb 2006 19:17:31 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from speedfactory.net (mail6.speedfactory.net [66.23.216.219]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1905C43D45; Mon, 6 Feb 2006 19:17:30 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (unverified [66.23.211.162]) by speedfactory.net (SurgeMail 3.5b3) with ESMTP id 7868664 for multiple; Mon, 06 Feb 2006 14:18:15 -0500 Received: from localhost (john@localhost [127.0.0.1]) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k16JHR8p041914; Mon, 6 Feb 2006 14:17:29 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: Robert Watson Date: Mon, 6 Feb 2006 13:57:17 -0500 User-Agent: KMail/1.9.1 References: <200602052322.k15NMgBs082593@repoman.freebsd.org> In-Reply-To: <200602052322.k15NMgBs082593@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200602061357.18485.jhb@freebsd.org> X-Virus-Scanned: ClamAV 0.87.1/1278/Mon Feb 6 06:05:04 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-1.4 required=4.2 tests=ALL_TRUSTED autolearn=failed version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx X-Server: High Performance Mail Server - http://surgemail.com r=1653887525 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 91195 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 19:17:33 -0000 On Sunday 05 February 2006 18:22, Robert Watson wrote: > http://perforce.freebsd.org/chv.cgi?CH=91195 > > Change 91195 by rwatson@rwatson_peppercorn on 2006/02/05 23:22:15 > > Comment that xenix_eaccess() is probably meant to be implemented by > kern_eaccess(), not kern_access(). Not sure. It was doing VOP_ACCESS() before I changed it to use kern_access(). I'll look at it and see if it should be changed. Hmm, yes it does look like it should use kern_eaccess(). I'll have to make a kern_ version from eaccess() first though. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Mon Feb 6 19:17:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2252C16A426; Mon, 6 Feb 2006 19:17:34 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BDAEC16A422; Mon, 6 Feb 2006 19:17:33 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from speedfactory.net (mail6.speedfactory.net [66.23.216.219]) by mx1.FreeBSD.org (Postfix) with ESMTP id 093D143D4C; Mon, 6 Feb 2006 19:17:32 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (unverified [66.23.211.162]) by speedfactory.net (SurgeMail 3.5b3) with ESMTP id 7868671 for multiple; Mon, 06 Feb 2006 14:18:17 -0500 Received: from localhost (john@localhost [127.0.0.1]) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k16JHR8q041914; Mon, 6 Feb 2006 14:17:30 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: Robert Watson Date: Mon, 6 Feb 2006 14:03:51 -0500 User-Agent: KMail/1.9.1 References: <200602060146.k161khiK096549@repoman.freebsd.org> In-Reply-To: <200602060146.k161khiK096549@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200602061403.52705.jhb@freebsd.org> X-Virus-Scanned: ClamAV 0.87.1/1278/Mon Feb 6 06:05:04 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-1.4 required=4.2 tests=ALL_TRUSTED autolearn=failed version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx X-Server: High Performance Mail Server - http://surgemail.com r=1653887525 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 91211 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 19:17:34 -0000 On Sunday 05 February 2006 20:46, Robert Watson wrote: > http://perforce.freebsd.org/chv.cgi?CH=91211 > > Change 91211 by rwatson@rwatson_peppercorn on 2006/02/06 01:46:00 > > Restore comment accidentally removed at some point. Probably because I just added it last week. :) > Affected files ... > > .. //depot/projects/trustedbsd/audit3/sys/kern/kern_exit.c#11 edit > > Differences ... > > ==== //depot/projects/trustedbsd/audit3/sys/kern/kern_exit.c#11 (text+ko) > ==== > > @@ -428,6 +428,9 @@ > LIST_REMOVE(p, p_hash); > sx_xunlock(&allproc_lock); > > + /* > + * Reparent all of our children to init. > + */ > sx_xlock(&proctree_lock); > q = LIST_FIRST(&p->p_children); > if (q != NULL) /* only need this if any child is S_ZOMB */ -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Mon Feb 6 21:40:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 896E416A428; Mon, 6 Feb 2006 21:40:28 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0BE1B16A420 for ; Mon, 6 Feb 2006 21:40:28 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CE56643D45 for ; Mon, 6 Feb 2006 21:40:27 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k16LeRgn097392 for ; Mon, 6 Feb 2006 21:40:27 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k16LeRix097389 for perforce@freebsd.org; Mon, 6 Feb 2006 21:40:27 GMT (envelope-from jhb@freebsd.org) Date: Mon, 6 Feb 2006 21:40:27 GMT Message-Id: <200602062140.k16LeRix097389@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 91260 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 21:40:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=91260 Change 91260 by jhb@jhb_slimer on 2006/02/06 21:40:00 Save this here until someone tests it. Change the hptmv driver to use a regular mutex since it doesn't use an INTR_FAST handler, thus using a spin mutex just adds extra cost with no benefit. Affected files ... .. //depot/projects/smpng/sys/dev/hptmv/entry.c#9 edit Differences ... ==== //depot/projects/smpng/sys/dev/hptmv/entry.c#9 (text+ko) ==== @@ -167,12 +167,12 @@ { intrmask_t spl = 0; - mtx_lock_spin(&driver_lock); + mtx_lock(&driver_lock); return spl; } void unlock_driver(intrmask_t spl) { - mtx_unlock_spin(&driver_lock); + mtx_unlock(&driver_lock); } #else static int driver_locked = 0; @@ -1169,9 +1169,10 @@ #if __FreeBSD_version >= 500000 static void hpt_init(void *dummy) { - mtx_init(&driver_lock, "hptlock", NULL, MTX_SPIN); + mtx_init(&driver_lock, "hptlock", NULL, MTX_DEF); } SYSINIT(hptinit, SI_SUB_CONFIGURE, SI_ORDER_FIRST, hpt_init, NULL); +SYSUNINIT(hptinit, SI_SUB_CONFIGURE, SI_ORDER_FIRST, mtx_destroy, &driver_lock); #endif static int num_adapters = 0; From owner-p4-projects@FreeBSD.ORG Mon Feb 6 21:41:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E6DFC16A423; Mon, 6 Feb 2006 21:41:33 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C08CD16A420 for ; Mon, 6 Feb 2006 21:41:33 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D55B243D76 for ; Mon, 6 Feb 2006 21:41:29 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k16LfTiB097442 for ; Mon, 6 Feb 2006 21:41:29 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k16LfT07097439 for perforce@freebsd.org; Mon, 6 Feb 2006 21:41:29 GMT (envelope-from jhb@freebsd.org) Date: Mon, 6 Feb 2006 21:41:29 GMT Message-Id: <200602062141.k16LfT07097439@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 91261 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 21:41:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=91261 Change 91261 by jhb@jhb_slimer on 2006/02/06 21:40:31 Save this fix for a race condition here until Kris can test it to verify that it works. Reviewed by: alc Affected files ... .. //depot/projects/smpng/sys/vm/vm_object.c#77 edit Differences ... ==== //depot/projects/smpng/sys/vm/vm_object.c#77 (text+ko) ==== @@ -438,23 +438,37 @@ while (object != NULL) { int vfslocked; - /* - * In general, the object should be locked when working with - * its type. In this case, in order to maintain proper lock - * ordering, an exception is possible because a vnode-backed - * object never changes its type. - */ + vfslocked = 0; + restart: + VM_OBJECT_LOCK(object); if (object->type == OBJT_VNODE) { struct vnode *vp = (struct vnode *) object->handle; - vfslocked = VFS_LOCK_GIANT(vp->v_mount); - } - VM_OBJECT_LOCK(object); - if (object->type == OBJT_VNODE) { + + /* + * Conditionally acquire Giant for a vnode-backed + * object. We have to be careful since the type of + * a vnode object can change while the object is + * unlocked. + */ + if (VFS_NEEDSGIANT(vp->v_mount) && !vfslocked) { + vfslocked = 1; + if (!mtx_trylock(&Giant)) { + VM_OBJECT_UNLOCK(object); + mtx_lock(&Giant); + goto restart; + } + } vm_object_vndeallocate(object); VFS_UNLOCK_GIANT(vfslocked); return; - } + } else + /* + * This is to handle the case that the object + * changed type while we dropped its lock to + * obtain Giant. + */ + VFS_UNLOCK_GIANT(vfslocked); KASSERT(object->ref_count != 0, ("vm_object_deallocate: object deallocated too many times: %d", object->type)); From owner-p4-projects@FreeBSD.ORG Mon Feb 6 21:41:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 08C2616A424; Mon, 6 Feb 2006 21:41:39 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D798616A420 for ; Mon, 6 Feb 2006 21:41:38 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 69CBF43D62 for ; Mon, 6 Feb 2006 21:41:29 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k16LfTDm097448 for ; Mon, 6 Feb 2006 21:41:29 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k16LfTZ3097445 for perforce@freebsd.org; Mon, 6 Feb 2006 21:41:29 GMT (envelope-from jhb@freebsd.org) Date: Mon, 6 Feb 2006 21:41:29 GMT Message-Id: <200602062141.k16LfTZ3097445@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 91262 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 21:41:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=91262 Change 91262 by jhb@jhb_slimer on 2006/02/06 21:41:24 Save this potential bugfix until someone tests it. Affected files ... .. //depot/projects/smpng/sys/netinet6/nd6.c#30 edit Differences ... ==== //depot/projects/smpng/sys/netinet6/nd6.c#30 (text+ko) ==== @@ -398,7 +398,7 @@ if (tick < 0) { ln->ln_expire = 0; ln->ln_ntick = 0; - callout_stop(&ln->ln_timer_ch); + callout_drain(&ln->ln_timer_ch); } else { ln->ln_expire = time_second + tick / hz; if (tick > INT_MAX) { From owner-p4-projects@FreeBSD.ORG Mon Feb 6 21:47:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE60016A468; Mon, 6 Feb 2006 21:47:58 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EBFA416A426 for ; Mon, 6 Feb 2006 21:47:57 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D7B5C43D79 for ; Mon, 6 Feb 2006 21:47:39 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k16LldaF097782 for ; Mon, 6 Feb 2006 21:47:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k16LlbFw097746 for perforce@freebsd.org; Mon, 6 Feb 2006 21:47:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 6 Feb 2006 21:47:37 GMT Message-Id: <200602062147.k16LlbFw097746@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91263 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 21:47:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=91263 Change 91263 by rwatson@rwatson_zoo on 2006/02/06 21:47:06 Integrate TrustedBSD base branch from FreeBSD CVS HEAD: - Loop back sys/security/audit kernel audit framework as merged from TrustedBSD audit3 branch. - Loop back contrib/openbsm user space audit library, documentation, and command line tools as merged from TrustedBSD OpenBSM branch. - Loop back audit modifications to usr.bin/login as merged from TrustedBSD audit3 branch. - Loop back audit group, etc/rc.d/auditd, rc.conf changes, etc, from TrustedBSD audit3 branch. - Loop back assignment of audit identifiers to system calls throughout sys/.../syscalls.master from TrustedBSD audit3 branch. - thr_set_name() for libthr. - Various security advisories, including texinfo, ee, cpio, ipfw, 802.11, kmem, pf. Also: - malloc(9) red zone support - firmware(9) - more rwlock(9) - ip_ipsec.c - pflog now a separate module - various VFS SMP fixes, vfs_ref()/vfs_rel() - pfil uses rwlocks - ipfw uses rwlocks - mtag zone Affected files ... .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#5 integrate .. //depot/projects/trustedbsd/base/UPDATING#61 integrate .. //depot/projects/trustedbsd/base/bin/sh/error.c#9 integrate .. //depot/projects/trustedbsd/base/bin/sh/eval.c#14 integrate .. //depot/projects/trustedbsd/base/bin/sh/expand.c#17 integrate .. //depot/projects/trustedbsd/base/bin/sh/jobs.c#20 integrate .. //depot/projects/trustedbsd/base/bin/sh/main.c#8 integrate .. //depot/projects/trustedbsd/base/bin/sh/miscbltin.c#10 integrate .. //depot/projects/trustedbsd/base/bin/sh/var.c#12 integrate .. //depot/projects/trustedbsd/base/bin/sh/var.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/main.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/CHANGELOG#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/LICENSE#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/Makefile#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/README#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/TODO#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/VERSION#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/Makefile#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/audit/Makefile#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/audit/audit.8#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/audit/audit.c#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/Makefile#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/audit_warn.c#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/auditd.8#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/auditd.c#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/auditd.h#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditreduce/Makefile#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditreduce/auditreduce.1#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditreduce/auditreduce.c#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditreduce/auditreduce.h#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/praudit/Makefile#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/praudit/praudit.1#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/praudit/praudit.c#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/Makefile#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit.h#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit_internal.h#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit_kevents.h#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit_record.h#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit_uevents.h#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/libbsm.h#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/compat/endian.h#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/etc/audit_class#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/etc/audit_control#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/etc/audit_event#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/etc/audit_user#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/etc/audit_warn#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/Makefile#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_class.3#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_control.3#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_event.3#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_free_token.3#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_io.3#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_mask.3#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_token.3#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_user.3#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_audit.c#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_class.c#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_control.c#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_event.c#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_flags.c#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_io.c#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_mask.c#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_notify.c#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_token.c#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_user.c#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_wrappers.c#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/libbsm.3#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/man/Makefile#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/man/audit.2#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/man/audit.log.5#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/man/audit_class.5#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/man/audit_control.5#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/man/audit_event.5#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/man/audit_user.5#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/man/audit_warn.5#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/man/auditctl.2#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/man/auditon.2#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/man/getaudit.2#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/man/getauid.2#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/man/setaudit.2#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/man/setauid.2#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/tools/Makefile#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/tools/audump.c#1 branch .. //depot/projects/trustedbsd/base/etc/Makefile#46 integrate .. //depot/projects/trustedbsd/base/etc/defaults/periodic.conf#17 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#50 integrate .. //depot/projects/trustedbsd/base/etc/etc.sparc64/ttys#10 integrate .. //depot/projects/trustedbsd/base/etc/group#10 integrate .. //depot/projects/trustedbsd/base/etc/inetd.conf#16 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.var.dist#13 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#34 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/auditd#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/hostapd#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/pflog#7 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#47 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#8 integrate .. //depot/projects/trustedbsd/base/include/printf.h#2 integrate .. //depot/projects/trustedbsd/base/lib/Makefile#41 integrate .. //depot/projects/trustedbsd/base/lib/libbsm/Makefile#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/xprintf_time.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/grantpt.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.3#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#23 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/pipe.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/libdisk.3#11 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_mech_switch.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_info.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_init.c#14 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_list.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_private.h#16 integrate .. //depot/projects/trustedbsd/base/lib/libthread_db/libpthread_db.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libthread_db/libthr_db.c#6 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.8#17 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/libmap.c#8 integrate .. //depot/projects/trustedbsd/base/release/Makefile#71 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#64 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#96 integrate .. //depot/projects/trustedbsd/base/release/doc/share/misc/dev.archlist.txt#10 integrate .. //depot/projects/trustedbsd/base/release/picobsd/bridge/config#3 integrate .. //depot/projects/trustedbsd/base/release/picobsd/bridge/crunch.conf#9 integrate .. //depot/projects/trustedbsd/base/release/picobsd/build/picobsd#11 integrate .. //depot/projects/trustedbsd/base/sbin/atacontrol/atacontrol.c#21 integrate .. //depot/projects/trustedbsd/base/sbin/devd/Makefile#8 integrate .. //depot/projects/trustedbsd/base/sbin/devd/devd.cc#16 integrate .. //depot/projects/trustedbsd/base/sbin/devd/devd.hh#4 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/dhcp-options.5#2 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/concat/gconcat.8#6 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/concat/geom_concat.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/eli/geli.8#4 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/eli/geom_eli.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/label/geom_label.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/mirror/geom_mirror.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/nop/geom_nop.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/raid3/geom_raid3.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/shsec/geom_shsec.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/stripe/geom_stripe.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/geom/core/geom.8#6 integrate .. //depot/projects/trustedbsd/base/sbin/geom/core/geom.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/geom/core/geom.h#3 integrate .. //depot/projects/trustedbsd/base/sbin/geom/misc/subr.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/geom/misc/subr.h#4 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#35 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.c#28 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifieee80211.c#16 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#42 integrate .. //depot/projects/trustedbsd/base/sbin/sconfig/sconfig.c#2 integrate .. //depot/projects/trustedbsd/base/share/examples/kld/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/examples/kld/firmware/Makefile#1 branch .. //depot/projects/trustedbsd/base/share/examples/kld/firmware/README#1 branch .. //depot/projects/trustedbsd/base/share/examples/kld/firmware/fwconsumer/Makefile#1 branch .. //depot/projects/trustedbsd/base/share/examples/kld/firmware/fwconsumer/fw_consumer.c#1 branch .. //depot/projects/trustedbsd/base/share/examples/kld/firmware/fwimage/Makefile#1 branch .. //depot/projects/trustedbsd/base/share/examples/kld/firmware/fwimage/firmware.img#1 branch .. //depot/projects/trustedbsd/base/share/man/man3/pthread_mutex_lock.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#62 integrate .. //depot/projects/trustedbsd/base/share/man/man4/altq.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/audit.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/ipw.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/isp.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/iwi.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/le.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/Makefile#21 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/acpi_asus.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/ce.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/cs.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/ep.4#15 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.sparc64/sbus.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_pppoe.4#12 integrate .. //depot/projects/trustedbsd/base/share/man/man4/pcn.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/pty.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ral.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ural.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/vlan.4#15 integrate .. //depot/projects/trustedbsd/base/share/man/man5/devfs.rules.5#3 integrate .. //depot/projects/trustedbsd/base/share/man/man5/periodic.conf.5#17 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#54 integrate .. //depot/projects/trustedbsd/base/share/man/man8/picobsd.8#12 integrate .. //depot/projects/trustedbsd/base/share/man/man9/Makefile#48 integrate .. //depot/projects/trustedbsd/base/share/man/man9/condvar.9#7 integrate .. //depot/projects/trustedbsd/base/share/man/man9/firmware.9#1 branch .. //depot/projects/trustedbsd/base/share/man/man9/memguard.9#3 integrate .. //depot/projects/trustedbsd/base/share/man/man9/mutex.9#14 integrate .. //depot/projects/trustedbsd/base/share/man/man9/redzone.9#1 branch .. //depot/projects/trustedbsd/base/share/man/man9/rwlock.9#1 branch .. //depot/projects/trustedbsd/base/share/man/man9/sema.9#5 integrate .. //depot/projects/trustedbsd/base/share/man/man9/sx.9#12 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.incs.mk#5 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.lib.mk#27 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.libnames.mk#27 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.prog.mk#23 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_proto.h#16 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_syscall.h#15 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_sysent.c#15 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/syscalls.master#15 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/machdep.c#23 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#25 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/trap.c#23 integrate .. //depot/projects/trustedbsd/base/sys/amd64/ia32/ia32_syscall.c#9 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/identcpu.c#6 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/trap.c#10 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/undefined.c#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91.c#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_spiio.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/at91st.c#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/at91var.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/files.at91rm92#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/std.at91rm92#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/trustedbsd/base/sys/arm/conf/KB920X#1 branch .. //depot/projects/trustedbsd/base/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/trustedbsd/base/sys/arm/include/atomic.h#10 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/i80321_aau.c#3 integrate .. //depot/projects/trustedbsd/base/sys/bsm/audit.h#2 integrate .. //depot/projects/trustedbsd/base/sys/bsm/audit_internal.h#1 branch .. //depot/projects/trustedbsd/base/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/trustedbsd/base/sys/bsm/audit_record.h#1 branch .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#52 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_vnops.c#17 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_proto.h#16 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscall.h#16 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscalls.c#16 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_sysent.c#16 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.master#16 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_getcwd.c#17 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_stats.c#23 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.i386#16 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.pc98#15 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#67 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#94 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#58 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.pc98#50 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.sparc64#44 integrate .. //depot/projects/trustedbsd/base/sys/conf/kmod.mk#39 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#67 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/if_pflog.c#13 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/if_pflog.h#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf_ioctl.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_asus.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_fujitsu.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/adv_eisa.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/adv_pci.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr_pci.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amrvar.h#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/an/if_an.c#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/asr/asr.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/asr/i2odep.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#31 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#49 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#30 integrate .. //depot/projects/trustedbsd/base/sys/dev/ce/if_ce.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#48 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.h#30 integrate .. //depot/projects/trustedbsd/base/sys/dev/ep/if_ep.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/ex/if_ex.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwcrom.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/if_ndis/if_ndis.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp.c#29 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.h#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_inline.h#16 delete .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_library.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_library.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_pci.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_sbus.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/ispvar.h#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwi.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwireg.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/le/am7990.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/le/am79900.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/le/am79900reg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/le/am79900var.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/le/am7990reg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/le/am7990var.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/le/if_le_ledma.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/le/if_le_pci.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/le/lance.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/le/lancereg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/le/lancevar.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/md/md.c#48 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb.c#44 integrate .. //depot/projects/trustedbsd/base/sys/dev/pcf/pcf_isa.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/vga_pci.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/if_ral.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/if_ralreg.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/if_ralvar.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/sn/if_sn.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/mss.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/csapcm.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/dsp.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/feeder.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/sound.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_bus_ebus.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_cpu_sparc64.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#42 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#47 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#41 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vnops.c#26 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/ecma167-udf.h#5 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vfsops.c#23 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vnops.c#31 integrate .. //depot/projects/trustedbsd/base/sys/geom/concat/g_concat.c#10 integrate .. //depot/projects/trustedbsd/base/sys/geom/concat/g_concat.h#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli.c#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli.h#3 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli_crypto.c#2 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli_ctl.c#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli_key.c#2 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/pkcs5v2.c#2 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/pkcs5v2.h#2 integrate .. //depot/projects/trustedbsd/base/sys/geom/gate/g_gate.c#10 integrate .. //depot/projects/trustedbsd/base/sys/geom/gate/g_gate.h#7 integrate .. //depot/projects/trustedbsd/base/sys/geom/label/g_label.c#6 integrate .. //depot/projects/trustedbsd/base/sys/geom/label/g_label.h#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/label/g_label_iso9660.c#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/label/g_label_msdosfs.c#3 integrate .. //depot/projects/trustedbsd/base/sys/geom/label/g_label_ufs.c#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.c#10 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.h#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror_ctl.c#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/nop/g_nop.c#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.c#8 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.h#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3_ctl.c#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/shsec/g_shsec.c#3 integrate .. //depot/projects/trustedbsd/base/sys/geom/shsec/g_shsec.h#2 integrate .. //depot/projects/trustedbsd/base/sys/geom/stripe/g_stripe.c#8 integrate .. //depot/projects/trustedbsd/base/sys/geom/stripe/g_stripe.h#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/zero/g_zero.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#63 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/XBOX#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/identcpu.c#34 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#55 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/trap.c#46 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_isc_syscall.h#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_isc_sysent.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_xenix.h#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_xenix_syscall.h#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_xenix_sysent.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/syscalls.isc#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/syscalls.xenix#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/cserial.h#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_proto.h#18 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_syscall.h#18 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysent.c#19 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/syscalls.master#17 integrate .. //depot/projects/trustedbsd/base/sys/i386/xbox/xbox.c#2 integrate .. //depot/projects/trustedbsd/base/sys/ia64/conf/SKI#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_main.c#41 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#52 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_acct.c#26 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#61 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#55 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#47 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#50 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_ktrace.c#28 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_malloc.c#32 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mbuf.c#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_prot.c#36 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_shutdown.c#30 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#58 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thr.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#49 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_umtx.c#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_firmware.c#1 branch .. //depot/projects/trustedbsd/base/sys/kern/sys_pipe.c#47 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_process.c#29 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#52 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#51 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty_pts.c#3 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty_pty.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_usrreq.c#37 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#56 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_cache.c#21 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_default.c#37 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_lookup.c#21 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#42 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#71 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#65 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#71 integrate .. //depot/projects/trustedbsd/base/sys/modules/ce/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/firmware/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/le/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/pf/Makefile#9 integrate .. //depot/projects/trustedbsd/base/sys/modules/pflog/Makefile#5 branch .. //depot/projects/trustedbsd/base/sys/net/if.c#42 integrate .. //depot/projects/trustedbsd/base/sys/net/if.h#24 integrate .. //depot/projects/trustedbsd/base/sys/net/if_bridge.c#8 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ethersubr.c#47 integrate .. //depot/projects/trustedbsd/base/sys/net/if_gif.c#31 integrate .. //depot/projects/trustedbsd/base/sys/net/if_gif.h#13 integrate .. //depot/projects/trustedbsd/base/sys/net/if_var.h#37 integrate .. //depot/projects/trustedbsd/base/sys/net/if_vlan.c#31 integrate .. //depot/projects/trustedbsd/base/sys/net/if_vlan_var.h#12 integrate .. //depot/projects/trustedbsd/base/sys/net/pfil.c#8 integrate .. //depot/projects/trustedbsd/base/sys/net/pfil.h#8 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_eiface.c#19 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_sppp.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/if_ether.c#30 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_gif.c#15 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.c#36 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_dummynet.c#35 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fastfwd.c#16 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#44 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_input.c#46 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_ipsec.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/ip_ipsec.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/ip_mroute.h#9 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_output.c#44 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_gif.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ip6_forward.c#15 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ip6_input.c#29 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ip6_output.c#31 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/udp6_usrreq.c#25 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_serv.c#38 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_srvsubs.c#21 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/NOTES#31 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_i810.c#20 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#1 branch .. //depot/projects/trustedbsd/base/sys/security/audit/audit.h#1 branch .. //depot/projects/trustedbsd/base/sys/security/audit/audit_arg.c#1 branch .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm.c#1 branch .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm_klib.c#1 branch .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm_token.c#1 branch .. //depot/projects/trustedbsd/base/sys/security/audit/audit_private.h#1 branch .. //depot/projects/trustedbsd/base/sys/security/audit/audit_syscalls.c#1 branch .. //depot/projects/trustedbsd/base/sys/security/audit/audit_trigger.c#1 branch .. //depot/projects/trustedbsd/base/sys/sparc64/conf/GENERIC#50 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sbus/dma_sbus.c#4 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sbus/lsi64854.c#6 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sbus/lsi64854var.h#5 integrate .. //depot/projects/trustedbsd/base/sys/sys/_rwlock.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/firmware.h#1 branch .. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#44 integrate .. //depot/projects/trustedbsd/base/sys/sys/mount.h#35 integrate .. //depot/projects/trustedbsd/base/sys/sys/namei.h#14 integrate .. //depot/projects/trustedbsd/base/sys/sys/proc.h#71 integrate .. //depot/projects/trustedbsd/base/sys/sys/ptrace.h#11 integrate .. //depot/projects/trustedbsd/base/sys/sys/rwlock.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/sockio.h#8 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.h#52 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#52 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#53 integrate .. //depot/projects/trustedbsd/base/sys/sys/systm.h#36 integrate .. //depot/projects/trustedbsd/base/sys/sys/thr.h#8 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#60 integrate .. //depot/projects/trustedbsd/base/sys/tools/fw_stub.awk#1 branch .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_extattr.c#29 integrate .. //depot/projects/trustedbsd/base/sys/vm/redzone.c#1 branch .. //depot/projects/trustedbsd/base/sys/vm/redzone.h#1 branch .. //depot/projects/trustedbsd/base/sys/vm/vm_contig.c#28 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#42 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#58 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#56 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageout.c#39 integrate .. //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#45 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom_eli/nokey.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/redzone9/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/regression/redzone9/README#1 branch .. //depot/projects/trustedbsd/base/tools/regression/redzone9/redzone.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/redzone9/test.sh#1 branch .. //depot/projects/trustedbsd/base/tools/tools/genericize/genericize.pl#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/etc/releng_6.rc#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/login/Makefile#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/login/login.1#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/login/login.c#23 integrate .. //depot/projects/trustedbsd/base/usr.bin/login/login.h#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/login/login_audit.c#1 branch .. //depot/projects/trustedbsd/base/usr.bin/mkuzip/mkuzip.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/touch/touch.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/Makefile#46 integrate .. //depot/projects/trustedbsd/base/usr.sbin/audit/Makefile#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/auditd/Makefile#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/auditreduce/Makefile#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/config/configvers.h#13 integrate .. //depot/projects/trustedbsd/base/usr.sbin/config/mkmakefile.c#11 integrate .. //depot/projects/trustedbsd/base/usr.sbin/inetd/inetd.8#13 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mergemaster/mergemaster.8#13 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mergemaster/mergemaster.sh#16 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mountd/exports.5#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/add/pkg_add.1#16 integrate .. //depot/projects/trustedbsd/base/usr.sbin/portsnap/portsnap/portsnap.8#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/praudit/Makefile#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/help/anonftp.hlp#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/help/distributions.hlp#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/help/fixit.hlp#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/help/html.hlp#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/help/options.hlp#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/help/partition.hlp#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/help/register.hlp#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/help/securelevel.hlp#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/help/shortcuts.hlp#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/help/slice.hlp#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/help/tcp.hlp#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/help/usermgmt.hlp#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/menus.c#46 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/system.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/tcpip.c#11 integrate Differences ... ==== //depot/projects/trustedbsd/base/ObsoleteFiles.inc#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.26 2006/01/18 18:48:42 netchild Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.27 2006/02/04 08:07:00 avatar Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -297,10 +297,11 @@ # 200308XX OLD_FILES+=usr/sbin/amldb OLD_FILES+=usr/share/man/man8/amldb.8.gz +# 200307XX +OLD_FILES+=sbin/mount_nwfs +OLD_FILES+=sbin/mount_portalfs +OLD_FILES+=sbin/mount_smbfs # 200306XX -OLD_FILES+=bin/mount_nwfs -OLD_FILES+=bin/mount_portalfs -OLD_FILES+=bin/mount_smbfs OLD_FILES+=usr/sbin/dev_mkdb OLD_FILES+=usr/share/man/man8/dev_mkdb.8.gz # 200304XX ==== //depot/projects/trustedbsd/base/UPDATING#61 (text+ko) ==== @@ -21,6 +21,10 @@ developers choose to disable these features on build machines to maximize performance. +20060201: + The kernel ABI to file system modules was changed on i386. + Please make sure that your kernel and modules are in sync. + 20060118: This actually occured some time ago, but installing the kernel now also installs a bunch of symbol files for the kernel modules. @@ -42,6 +46,10 @@ and netgraph(4) utilities like ports/net/mpd or ports/net/mpd4. 20060106: + si(4)'s device files now contain the unit number. + Uses of {cua,tty}A[0-9a-f] should be replaced by {cua,tty}A0[0-9a-f]. + +20060106: The kernel ABI was mostly destroyed due to a change in the size of struct lock_object which is nested in other structures such as mutexes which are nested in all sorts of other structures. @@ -493,4 +501,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.436 2006/01/18 20:36:58 pav Exp $ +$FreeBSD: src/UPDATING,v 1.438 2006/02/01 13:04:52 yar Exp $ ==== //depot/projects/trustedbsd/base/bin/sh/error.c#9 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.25 2004/04/06 20:06:51 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.26 2006/02/04 14:37:50 schweikh Exp $"); /* * Errors and exceptions. @@ -118,7 +118,7 @@ * This doesn't seem to be needed, since main() emits a newline. */ #if 0 - if (tcgetpgrp(0) == getpid()) + if (tcgetpgrp(0) == getpid()) write(STDERR_FILENO, "\n", 1); #endif if (rootshell && iflag) ==== //depot/projects/trustedbsd/base/bin/sh/eval.c#14 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.49 2005/12/04 18:44:21 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.50 2006/02/04 14:37:50 schweikh Exp $"); #include #include @@ -671,15 +671,15 @@ for (sp = varlist.list ; sp ; sp = sp->next) if (strncmp(sp->text, PATH, sizeof(PATH) - 1) == 0) { path = sp->text + sizeof(PATH) - 1; - /* + /* * On `PATH=... command`, we need to make * sure that the command isn't using the * non-updated hash table of the outer PATH - * setting and we need to make sure that + * setting and we need to make sure that * the hash table isn't filled with items * from the temporary setting. * - * It would be better to forbit using and + * It would be better to forbit using and * updating the table while this command * runs, by the command finding mechanism * is heavily integrated with hash handling, ==== //depot/projects/trustedbsd/base/bin/sh/expand.c#17 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.48 2005/09/06 19:30:00 rse Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.49 2006/02/04 14:37:50 schweikh Exp $"); #include #include @@ -100,7 +100,7 @@ STATIC int varisset(char *, int); STATIC void varvalue(char *, int, int); STATIC void recordregion(int, int, int); -STATIC void removerecordregions(int); +STATIC void removerecordregions(int); STATIC void ifsbreakup(char *, struct arglist *); STATIC void expandmeta(struct strlist *, int); STATIC void expmeta(char *, char *); @@ -309,7 +309,7 @@ } -STATIC void +STATIC void removerecordregions(int endoff) { if (ifslastp == NULL) @@ -332,7 +332,7 @@ } return; } - + ifslastp = &ifsfirst; while (ifslastp->next && ifslastp->next->begoff < endoff) ifslastp=ifslastp->next; @@ -576,7 +576,7 @@ } loc--; if ((varflags & VSQUOTE) && loc > startp && - *(loc - 1) == CTLESC) { + *(loc - 1) == CTLESC) { for (q = startp; q < loc; q++) if (*q == CTLESC) q++; @@ -750,9 +750,9 @@ if (!set) { if (subevalvar(p, var, 0, subtype, startloc, varflags)) { varflags &= ~VSNUL; - /* - * Remove any recorded regions beyond - * start of variable + /* + * Remove any recorded regions beyond + * start of variable */ removerecordregions(startloc); goto again; @@ -972,7 +972,7 @@ do { p = string + ifsp->begoff; nulonly = ifsp->nulonly; - ifs = nulonly ? nullstr : + ifs = nulonly ? nullstr : ( ifsset() ? ifsval() : " \t\n" ); ifsspc = 0; while (p < string + ifsp->endoff) { ==== //depot/projects/trustedbsd/base/bin/sh/jobs.c#20 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.70 2005/12/14 17:26:29 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.71 2006/02/04 14:37:50 schweikh Exp $"); #include #include @@ -353,7 +353,7 @@ WEXITSTATUS(ps->status)); } else { #if JOBS - if (WIFSTOPPED(ps->status)) + if (WIFSTOPPED(ps->status)) i = WSTOPSIG(ps->status); else #endif @@ -787,7 +787,7 @@ ! fd0_redirected_p ()) { close(0); if (open(_PATH_DEVNULL, O_RDONLY) != 0) - error("Can't open %s: %s", + error("Can't open %s: %s", _PATH_DEVNULL, strerror(errno)); } } ==== //depot/projects/trustedbsd/base/bin/sh/main.c#8 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.26 2004/04/06 20:06:51 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.27 2006/02/04 14:47:19 schweikh Exp $"); #include #include @@ -155,6 +155,8 @@ procargs(argc, argv); if (getpwd() == NULL && iflag) out2str("sh: cannot determine working directory\n"); + if (getpwd() != NULL) + setvar ("PWD", getpwd(), VEXPORT); if (argv[0] && argv[0][0] == '-') { state = 1; read_profile("/etc/profile"); ==== //depot/projects/trustedbsd/base/bin/sh/miscbltin.c#10 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/miscbltin.c,v 1.34 2005/10/28 10:45:19 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/miscbltin.c,v 1.35 2006/02/04 14:37:50 schweikh Exp $"); /* * Miscellaneous builtins. @@ -401,7 +401,7 @@ } } if (all) { - for (l = limits; l->name; l++) { + for (l = limits; l->name; l++) { char optbuf[40]; if (getrlimit(l->cmd, &limit) < 0) error("can't get limit: %s", strerror(errno)); ==== //depot/projects/trustedbsd/base/bin/sh/var.c#12 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.29 2005/09/09 21:03:34 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.30 2006/02/04 14:38:37 schweikh Exp $"); #include #include @@ -124,7 +124,7 @@ STATIC int localevar(char *); /* - * Initialize the varable symbol tables and import the environment + * Initialize the variable symbol tables and import the environment. */ #ifdef mkinit @@ -208,7 +208,7 @@ } /* - * Set the value of a variable. The flags argument is tored with the + * Set the value of a variable. The flags argument is stored with the * flags of the variable. If val is NULL, the variable is unset. */ ==== //depot/projects/trustedbsd/base/bin/sh/var.h#7 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)var.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/var.h,v 1.12 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/var.h,v 1.13 2006/02/04 14:41:27 schweikh Exp $ */ /* @@ -40,8 +40,8 @@ /* flags */ #define VEXPORT 0x01 /* variable is exported */ #define VREADONLY 0x02 /* variable cannot be modified */ -#define VSTRFIXED 0x04 /* variable struct is staticly allocated */ -#define VTEXTFIXED 0x08 /* text is staticly allocated */ +#define VSTRFIXED 0x04 /* variable struct is statically allocated */ +#define VTEXTFIXED 0x08 /* text is statically allocated */ #define VSTACK 0x10 /* text is allocated on the stack */ #define VUNSET 0x20 /* the variable is not set */ #define VNOFUNC 0x40 /* don't call the callback function */ ==== //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/main.c#12 (text+ko) ==== @@ -1386,7 +1386,9 @@ if (value == NULL) syslog(LOG_ERR, "no value for 'trace'"); - snmp_trace = strtoul(value, NULL, 0); + else + snmp_trace = + strtoul(value, NULL, 0); break; case -1: ==== //depot/projects/trustedbsd/base/etc/Makefile#46 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.350 2005/12/29 14:40:18 dfr Exp $ +# $FreeBSD: src/etc/Makefile,v 1.351 2006/02/02 10:03:43 rwatson Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -20,6 +20,15 @@ ${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \ ${.CURDIR}/../usr.bin/mail/misc/mail.rc \ ${.CURDIR}/../usr.bin/locate/locate/locate.rc + +OPENBSMDIR= ${.CURDIR}/../contrib/openbsm +BSM_ETC_OPEN_FILES= ${OPENBSMDIR}/etc/audit_class \ + ${OPENBSMDIR}/etc/audit_event +BSM_ETC_RESTRICTED_FILES= ${OPENBSMDIR}/etc/audit_control \ + ${OPENBSMDIR}/etc/audit_user +BSM_ETC_EXEC_FILES= ${OPENBSMDIR}/etc/audit_warn +BSM_ETC_DIR= ${DESTDIR}/etc/security + .if !defined(NO_LPR) BIN1+= printcap .endif @@ -110,6 +119,12 @@ cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt cd ${.CURDIR}/pam.d; ${MAKE} install + cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0444 \ + ${BSM_ETC_OPEN_FILES} ${BSM_ETC_DIR} + cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0400 \ + ${BSM_ETC_RESTRICTED_FILES} ${BSM_ETC_DIR} + cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0500 \ + ${BSM_ETC_EXEC_FILES} ${BSM_ETC_DIR} .if !defined(NO_I4B) cd ${.CURDIR}/isdn; ${MAKE} install .endif ==== //depot/projects/trustedbsd/base/etc/defaults/periodic.conf#17 (text+ko) ==== @@ -13,7 +13,7 @@ # For a more detailed explanation of all the periodic.conf variables, please # refer to the periodic.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/periodic.conf,v 1.34 2006/01/13 18:07:52 wollman Exp $ +# $FreeBSD: src/etc/defaults/periodic.conf,v 1.36 2006/01/30 19:23:24 matteo Exp $ # # What files override these defaults ? @@ -86,7 +86,7 @@ # 400.status-disks daily_status_disks_enable="YES" # Check disk status -daily_status_disks_df_flags="-k -t nonfs" # df(1) flags for check +daily_status_disks_df_flags="-l -h" # df(1) flags for check # 405.status-ata_raid daily_status_ata_raid_enable="NO" # Check ATA raid status ==== //depot/projects/trustedbsd/base/etc/defaults/rc.conf#50 (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.271 2006/01/21 18:08:15 yar Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.274 2006/02/03 01:35:36 flz Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -184,6 +184,7 @@ ppp_user="root" # Which user to run ppp as ### Network daemon (miscellaneous) ### +hostapd_enable="NO" # Run hostap daemon. syslogd_enable="YES" # Run syslog daemon (or NO). syslogd_program="/usr/sbin/syslogd" # path to syslogd, if you want a different one. syslogd_flags="-s" # Flags to syslogd (if enabled). @@ -470,6 +471,8 @@ ### Miscellaneous administrative options ################### ############################################################## +auditd_enable="NO" # Run the audit daemon. +auditd_flags="" # Which options to pass to the audit daemon. cron_enable="YES" # Run the periodic job daemon. cron_program="/usr/sbin/cron" # Which cron executable to run (if enabled). cron_dst="YES" # Handle DST transitions intelligently (YES/NO) @@ -528,9 +531,9 @@ devfs_system_ruleset="" # The name of a ruleset to apply to /dev devfs_set_rulesets="" # A list of /mount/dev=ruleset_name settings to # apply (must be mounted already, i.e. fstab(5)) -performance_cx_lowest="HIGH" # Online CPU idle state +performance_cx_lowest="LOW" # Online CPU idle state performance_cpu_freq="NONE" # Online CPU frequency -economy_cx_lowest="HIGH" # Offline CPU idle state +economy_cx_lowest="LOW" # Offline CPU idle state economy_cpu_freq="NONE" # Offline CPU frequency virecover_enable="YES" # Perform housekeeping for the vi(1) editor ugidfw_enable="NO" # Load mac_bsdextended(4) rules on boot ==== //depot/projects/trustedbsd/base/etc/etc.sparc64/ttys#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.11 2005/06/10 23:06:14 marius Exp $ +# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.12 2006/02/04 23:30:09 marius Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -54,7 +54,7 @@ # uart(4) ttyu0 "/usr/libexec/getty std.9600" vt100 on secure ttyu1 "/usr/libexec/getty std.9600" vt100 on secure -ttyu2 "/usr/libexec/getty std.9600" vt100 off secure +ttyu2 "/usr/libexec/getty std.9600" vt100 on secure ttyu3 "/usr/libexec/getty std.9600" vt100 off secure # Dumb console dcons "/usr/libexec/getty std.9600" vt100 off secure ==== //depot/projects/trustedbsd/base/etc/group#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/group,v 1.32 2005/06/06 20:19:56 brooks Exp $ +# $FreeBSD: src/etc/group,v 1.34 2006/02/05 19:34:09 rwatson Exp $ # wheel:*:0:root >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 6 22:08:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B76716A423; Mon, 6 Feb 2006 22:08:17 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EFB7F16A420 for ; Mon, 6 Feb 2006 22:08:16 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9225343D46 for ; Mon, 6 Feb 2006 22:08:16 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k16M8GXO004237 for ; Mon, 6 Feb 2006 22:08:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k16M8D4r004202 for perforce@freebsd.org; Mon, 6 Feb 2006 22:08:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 6 Feb 2006 22:08:13 GMT Message-Id: <200602062208.k16M8D4r004202@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91270 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 22:08:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=91270 Change 91270 by rwatson@rwatson_zoo on 2006/02/06 22:07:19 Integrate TrustedBSD audit3 branch from the TrustedBSD base branch: - Loop back sys/security/audit kernel audit framework as merged from TrustedBSD audit3 branch. - Loop back contrib/openbsm user space audit library, documentation, and command line tools as merged from TrustedBSD OpenBSM branch. - Loop back audit modifications to usr.bin/login as merged from TrustedBSD audit3 branch. - Loop back audit group, etc/rc.d/auditd, rc.conf changes, etc, from TrustedBSD audit3 branch. - Loop back assignment of audit identifiers to system calls throughout sys/.../syscalls.master from TrustedBSD audit3 branch. - thr_set_name() for libthr. - Various security advisories, including texinfo, ee, cpio, ipfw, 802.11, kmem, pf. - Addition of "audit" group. Also: - malloc(9) red zone support - firmware(9) - more rwlock(9) - ip_ipsec.c - pflog now a separate module - various VFS SMP fixes, vfs_ref()/vfs_rel() - pfil uses rwlocks - ipfw uses rwlocks - mtag zone Affected files ... .. //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#3 integrate .. //depot/projects/trustedbsd/audit3/UPDATING#7 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/error.c#2 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/eval.c#4 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/expand.c#3 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/jobs.c#5 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/main.c#2 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/miscbltin.c#4 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/var.c#4 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/var.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/main.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/LICENSE#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/README#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.8#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/audit_warn.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.8#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.1#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.1#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#20 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_uevents.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/endian.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_class#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_control#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_user#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_warn#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_class.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_control.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_event.3#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_free_token.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_io.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_mask.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_token.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_user.3#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_class.c#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_control.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_flags.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_user.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/libbsm.3#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.2#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_class.5#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_control.5#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_event.5#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_user.5#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_warn.5#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditctl.2#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditon.2#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/getaudit.2#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/getauid.2#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/setaudit.2#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/setauid.2#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/audump.c#5 integrate .. //depot/projects/trustedbsd/audit3/etc/Makefile#9 integrate .. //depot/projects/trustedbsd/audit3/etc/defaults/periodic.conf#5 integrate .. //depot/projects/trustedbsd/audit3/etc/defaults/rc.conf#9 integrate .. //depot/projects/trustedbsd/audit3/etc/etc.sparc64/ttys#5 integrate .. //depot/projects/trustedbsd/audit3/etc/group#5 integrate .. //depot/projects/trustedbsd/audit3/etc/inetd.conf#4 integrate .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.var.dist#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/Makefile#9 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/auditd#10 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/hostapd#1 branch .. //depot/projects/trustedbsd/audit3/etc/rc.d/pflog#6 integrate .. //depot/projects/trustedbsd/audit3/games/fortune/datfiles/fortunes#9 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#4 integrate .. //depot/projects/trustedbsd/audit3/include/printf.h#2 integrate .. //depot/projects/trustedbsd/audit3/lib/Makefile#10 integrate .. //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#15 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/xprintf_time.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/grantpt.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/malloc.3#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/malloc.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/pipe.2#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libdisk/libdisk.3#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_mech_switch.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_info.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_init.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_list.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_private.h#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libthread_db/libpthread_db.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libthread_db/libthr_db.c#4 integrate .. //depot/projects/trustedbsd/audit3/libexec/ftpd/ftpd.8#5 integrate .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/libmap.c#4 integrate .. //depot/projects/trustedbsd/audit3/release/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#6 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#6 integrate .. //depot/projects/trustedbsd/audit3/release/doc/share/misc/dev.archlist.txt#5 integrate .. //depot/projects/trustedbsd/audit3/release/picobsd/bridge/config#2 integrate .. //depot/projects/trustedbsd/audit3/release/picobsd/bridge/crunch.conf#3 integrate .. //depot/projects/trustedbsd/audit3/release/picobsd/build/picobsd#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/atacontrol/atacontrol.c#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/devd/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/devd/devd.cc#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/devd/devd.hh#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/dhclient/dhcp-options.5#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/concat/gconcat.8#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/concat/geom_concat.c#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/eli/geli.8#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/eli/geom_eli.c#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/label/geom_label.c#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/mirror/geom_mirror.c#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/nop/geom_nop.c#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/raid3/geom_raid3.c#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/shsec/geom_shsec.c#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/stripe/geom_stripe.c#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/core/geom.8#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/core/geom.c#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/core/geom.h#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/misc/subr.c#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/misc/subr.h#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifconfig.8#7 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifconfig.c#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifieee80211.c#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipfw/ipfw.8#7 integrate .. //depot/projects/trustedbsd/audit3/sbin/sconfig/sconfig.c#2 integrate .. //depot/projects/trustedbsd/audit3/share/examples/kld/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/examples/kld/firmware/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/share/examples/kld/firmware/README#1 branch .. //depot/projects/trustedbsd/audit3/share/examples/kld/firmware/fwconsumer/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/share/examples/kld/firmware/fwconsumer/fw_consumer.c#1 branch .. //depot/projects/trustedbsd/audit3/share/examples/kld/firmware/fwimage/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/share/examples/kld/firmware/fwimage/firmware.img#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_mutex_lock.3#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/altq.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/audit.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/ipw.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/isp.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/iwi.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/le.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.i386/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.i386/acpi_asus.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.i386/ce.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.i386/cs.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.i386/ep.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.sparc64/sbus.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ng_pppoe.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/pcn.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/pty.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ral.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ural.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/vlan.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/devfs.rules.5#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/periodic.conf.5#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/rc.conf.5#8 integrate .. //depot/projects/trustedbsd/audit3/share/man/man8/picobsd.8#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/condvar.9#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/firmware.9#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man9/memguard.9#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/mutex.9#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/redzone.9#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man9/rwlock.9#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man9/sema.9#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/sx.9#4 integrate .. //depot/projects/trustedbsd/audit3/share/mk/bsd.incs.mk#4 integrate .. //depot/projects/trustedbsd/audit3/share/mk/bsd.lib.mk#6 integrate .. //depot/projects/trustedbsd/audit3/share/mk/bsd.libnames.mk#6 integrate .. //depot/projects/trustedbsd/audit3/share/mk/bsd.prog.mk#5 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_proto.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_syscall.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_sysent.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/linux/syscalls.master#9 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/trap.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/ia32/ia32_syscall.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/identcpu.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/trap.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/undefined.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91_spiio.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91st.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91var.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/files.at91rm92#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/std.at91rm92#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/conf/KB920X#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/include/atomic.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/i80321/i80321_aau.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#23 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#21 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/coda/coda_vnops.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_proto.h#13 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscall.h#13 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscalls.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_sysent.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.master#15 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_getcwd.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_stats.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/Makefile.i386#5 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/Makefile.pc98#5 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/NOTES#9 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files#14 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.i386#7 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.pc98#7 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.sparc64#7 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/kmod.mk#7 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options#9 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/if_pflog.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/if_pflog.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/pf_ioctl.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpi_support/acpi_asus.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpi_support/acpi_fujitsu.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/advansys/adv_eisa.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/advansys/adv_pci.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/amr/amr.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/amr/amr_pci.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/amr/amrvar.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/an/if_an.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/asr/asr.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/asr/i2odep.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ce/if_ce.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ep/if_ep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ex/if_ex.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/firewire/fwcrom.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_freebsd.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_freebsd.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_inline.h#5 delete .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_library.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_library.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_pci.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_sbus.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/ispvar.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/iwi/if_iwireg.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/le/am7990.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/le/am79900.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/le/am79900reg.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/le/am79900var.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/le/am7990reg.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/le/am7990var.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/le/if_le_ledma.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/le/if_le_pci.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/le/lance.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/le/lancereg.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/le/lancevar.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/md/md.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbb.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pci/vga_pci.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ral/if_ral.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ral/if_ralreg.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ral/if_ralvar.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sn/if_sn.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/isa/mss.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/csapcm.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/dsp.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/feeder.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/sound.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/usb/uaudio.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_bus_ebus.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_cpu_sparc64.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/umass.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/devfs/devfs_vnops.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/udf/ecma167-udf.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/udf/udf_vfsops.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/udf/udf_vnops.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/concat/g_concat.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/concat/g_concat.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli_crypto.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli_ctl.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli_key.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/pkcs5v2.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/pkcs5v2.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/gate/g_gate.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/gate/g_gate.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/label/g_label.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/label/g_label.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/label/g_label_iso9660.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/label/g_label_msdosfs.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/label/g_label_ufs.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/mirror/g_mirror.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/mirror/g_mirror.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/mirror/g_mirror_ctl.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/nop/g_nop.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/raid3/g_raid3.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/raid3/g_raid3.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/raid3/g_raid3_ctl.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/shsec/g_shsec.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/shsec/g_shsec.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/stripe/g_stripe.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/stripe/g_stripe.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/zero/g_zero.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/NOTES#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/XBOX#2 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/identcpu.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/trap.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_isc_syscall.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_isc_sysent.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_xenix.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_xenix_syscall.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_xenix_sysent.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/syscalls.isc#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/syscalls.xenix#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/include/cserial.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_proto.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_syscall.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysent.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/syscalls.master#13 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/xbox/xbox.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/conf/SKI#4 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/init_main.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#27 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_acct.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_descrip.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_exec.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_exit.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_fork.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_ktrace.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_malloc.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_mbuf.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_prot.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_shutdown.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_sig.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_thr.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_thread.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_umtx.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_firmware.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/kern/sys_pipe.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sys_process.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#31 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/tty_pts.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/tty_pty.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_usrreq.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_bio.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_cache.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_default.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_lookup.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#24 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/ce/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/firmware/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/le/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/pf/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/pflog/Makefile#3 branch .. //depot/projects/trustedbsd/audit3/sys/net/if.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_bridge.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_ethersubr.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_gif.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_gif.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_var.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_vlan.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_vlan_var.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/net/pfil.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/net/pfil.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_eiface.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_sppp.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/if_ether.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/in_gif.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/in_pcb.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_dummynet.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_fastfwd.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_input.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_ipsec.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_ipsec.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_mroute.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_output.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/in6_gif.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/ip6_forward.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/ip6_input.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/ip6_output.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsserver/nfs_serv.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsserver/nfs_srvsubs.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/conf/NOTES#7 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agp_i810.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_klib.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#16 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_trigger.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/conf/GENERIC#6 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sbus/dma_sbus.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sbus/lsi64854.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sbus/lsi64854var.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/_rwlock.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/firmware.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/sys/mbuf.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/mount.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/namei.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/proc.h#12 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/ptrace.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/rwlock.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sockio.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#17 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#18 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#21 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/systm.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/thr.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/vnode.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/tools/fw_stub.awk#1 branch .. //depot/projects/trustedbsd/audit3/sys/ufs/ufs/ufs_extattr.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/redzone.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/vm/redzone.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/vm/vm_contig.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_fault.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_object.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_page.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_pageout.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vnode_pager.c#7 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/nokey.t#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/redzone9/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/redzone9/README#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/redzone9/redzone.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/redzone9/test.sh#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/genericize/genericize.pl#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/etc/releng_6.rc#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/login/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/login/login.1#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/login/login.c#14 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/login/login.h#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#8 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/mkuzip/mkuzip.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/touch/touch.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#12 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/audit/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/auditd/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/auditreduce/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/config/configvers.h#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/config/mkmakefile.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/inetd/inetd.8#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/mergemaster/mergemaster.8#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/mergemaster/mergemaster.sh#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/mountd/exports.5#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/add/pkg_add.1#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/portsnap/portsnap/portsnap.8#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/praudit/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/help/anonftp.hlp#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/help/distributions.hlp#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/help/fixit.hlp#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/help/html.hlp#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/help/options.hlp#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/help/partition.hlp#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/help/register.hlp#2 delete .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/help/securelevel.hlp#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/help/shortcuts.hlp#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/help/slice.hlp#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/help/tcp.hlp#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/help/usermgmt.hlp#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/menus.c#7 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/system.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/tcpip.c#4 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.26 2006/01/18 18:48:42 netchild Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.27 2006/02/04 08:07:00 avatar Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -297,10 +297,11 @@ # 200308XX OLD_FILES+=usr/sbin/amldb OLD_FILES+=usr/share/man/man8/amldb.8.gz +# 200307XX +OLD_FILES+=sbin/mount_nwfs +OLD_FILES+=sbin/mount_portalfs +OLD_FILES+=sbin/mount_smbfs # 200306XX -OLD_FILES+=bin/mount_nwfs -OLD_FILES+=bin/mount_portalfs -OLD_FILES+=bin/mount_smbfs OLD_FILES+=usr/sbin/dev_mkdb OLD_FILES+=usr/share/man/man8/dev_mkdb.8.gz # 200304XX ==== //depot/projects/trustedbsd/audit3/UPDATING#7 (text+ko) ==== @@ -21,6 +21,10 @@ developers choose to disable these features on build machines to maximize performance. +20060201: + The kernel ABI to file system modules was changed on i386. + Please make sure that your kernel and modules are in sync. + 20060118: This actually occured some time ago, but installing the kernel now also installs a bunch of symbol files for the kernel modules. @@ -42,6 +46,10 @@ and netgraph(4) utilities like ports/net/mpd or ports/net/mpd4. 20060106: + si(4)'s device files now contain the unit number. + Uses of {cua,tty}A[0-9a-f] should be replaced by {cua,tty}A0[0-9a-f]. + +20060106: The kernel ABI was mostly destroyed due to a change in the size of struct lock_object which is nested in other structures such as mutexes which are nested in all sorts of other structures. @@ -493,4 +501,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.436 2006/01/18 20:36:58 pav Exp $ +$FreeBSD: src/UPDATING,v 1.438 2006/02/01 13:04:52 yar Exp $ ==== //depot/projects/trustedbsd/audit3/bin/sh/error.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.25 2004/04/06 20:06:51 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.26 2006/02/04 14:37:50 schweikh Exp $"); /* * Errors and exceptions. @@ -118,7 +118,7 @@ * This doesn't seem to be needed, since main() emits a newline. */ #if 0 - if (tcgetpgrp(0) == getpid()) + if (tcgetpgrp(0) == getpid()) write(STDERR_FILENO, "\n", 1); #endif if (rootshell && iflag) ==== //depot/projects/trustedbsd/audit3/bin/sh/eval.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.49 2005/12/04 18:44:21 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.50 2006/02/04 14:37:50 schweikh Exp $"); #include #include @@ -671,15 +671,15 @@ for (sp = varlist.list ; sp ; sp = sp->next) if (strncmp(sp->text, PATH, sizeof(PATH) - 1) == 0) { path = sp->text + sizeof(PATH) - 1; - /* + /* * On `PATH=... command`, we need to make * sure that the command isn't using the * non-updated hash table of the outer PATH - * setting and we need to make sure that + * setting and we need to make sure that * the hash table isn't filled with items * from the temporary setting. * - * It would be better to forbit using and + * It would be better to forbit using and * updating the table while this command * runs, by the command finding mechanism * is heavily integrated with hash handling, ==== //depot/projects/trustedbsd/audit3/bin/sh/expand.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.48 2005/09/06 19:30:00 rse Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.49 2006/02/04 14:37:50 schweikh Exp $"); #include #include @@ -100,7 +100,7 @@ STATIC int varisset(char *, int); STATIC void varvalue(char *, int, int); STATIC void recordregion(int, int, int); -STATIC void removerecordregions(int); +STATIC void removerecordregions(int); STATIC void ifsbreakup(char *, struct arglist *); STATIC void expandmeta(struct strlist *, int); STATIC void expmeta(char *, char *); @@ -309,7 +309,7 @@ } -STATIC void +STATIC void removerecordregions(int endoff) { if (ifslastp == NULL) @@ -332,7 +332,7 @@ } return; } - + ifslastp = &ifsfirst; while (ifslastp->next && ifslastp->next->begoff < endoff) ifslastp=ifslastp->next; @@ -576,7 +576,7 @@ } loc--; if ((varflags & VSQUOTE) && loc > startp && - *(loc - 1) == CTLESC) { + *(loc - 1) == CTLESC) { for (q = startp; q < loc; q++) if (*q == CTLESC) q++; @@ -750,9 +750,9 @@ if (!set) { if (subevalvar(p, var, 0, subtype, startloc, varflags)) { varflags &= ~VSNUL; - /* - * Remove any recorded regions beyond - * start of variable + /* + * Remove any recorded regions beyond + * start of variable */ removerecordregions(startloc); goto again; @@ -972,7 +972,7 @@ do { p = string + ifsp->begoff; nulonly = ifsp->nulonly; - ifs = nulonly ? nullstr : + ifs = nulonly ? nullstr : ( ifsset() ? ifsval() : " \t\n" ); ifsspc = 0; while (p < string + ifsp->endoff) { ==== //depot/projects/trustedbsd/audit3/bin/sh/jobs.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.70 2005/12/14 17:26:29 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.71 2006/02/04 14:37:50 schweikh Exp $"); #include #include @@ -353,7 +353,7 @@ WEXITSTATUS(ps->status)); } else { #if JOBS - if (WIFSTOPPED(ps->status)) + if (WIFSTOPPED(ps->status)) i = WSTOPSIG(ps->status); else #endif @@ -787,7 +787,7 @@ ! fd0_redirected_p ()) { close(0); if (open(_PATH_DEVNULL, O_RDONLY) != 0) - error("Can't open %s: %s", + error("Can't open %s: %s", _PATH_DEVNULL, strerror(errno)); } } ==== //depot/projects/trustedbsd/audit3/bin/sh/main.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.26 2004/04/06 20:06:51 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.27 2006/02/04 14:47:19 schweikh Exp $"); #include #include @@ -155,6 +155,8 @@ procargs(argc, argv); if (getpwd() == NULL && iflag) out2str("sh: cannot determine working directory\n"); + if (getpwd() != NULL) + setvar ("PWD", getpwd(), VEXPORT); if (argv[0] && argv[0][0] == '-') { state = 1; read_profile("/etc/profile"); ==== //depot/projects/trustedbsd/audit3/bin/sh/miscbltin.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/miscbltin.c,v 1.34 2005/10/28 10:45:19 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/miscbltin.c,v 1.35 2006/02/04 14:37:50 schweikh Exp $"); /* * Miscellaneous builtins. @@ -401,7 +401,7 @@ } } if (all) { - for (l = limits; l->name; l++) { + for (l = limits; l->name; l++) { char optbuf[40]; if (getrlimit(l->cmd, &limit) < 0) error("can't get limit: %s", strerror(errno)); ==== //depot/projects/trustedbsd/audit3/bin/sh/var.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.29 2005/09/09 21:03:34 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.30 2006/02/04 14:38:37 schweikh Exp $"); #include #include @@ -124,7 +124,7 @@ STATIC int localevar(char *); /* - * Initialize the varable symbol tables and import the environment + * Initialize the variable symbol tables and import the environment. */ #ifdef mkinit @@ -208,7 +208,7 @@ } /* - * Set the value of a variable. The flags argument is tored with the + * Set the value of a variable. The flags argument is stored with the * flags of the variable. If val is NULL, the variable is unset. */ ==== //depot/projects/trustedbsd/audit3/bin/sh/var.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)var.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/var.h,v 1.12 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/var.h,v 1.13 2006/02/04 14:41:27 schweikh Exp $ */ /* @@ -40,8 +40,8 @@ /* flags */ #define VEXPORT 0x01 /* variable is exported */ #define VREADONLY 0x02 /* variable cannot be modified */ -#define VSTRFIXED 0x04 /* variable struct is staticly allocated */ -#define VTEXTFIXED 0x08 /* text is staticly allocated */ +#define VSTRFIXED 0x04 /* variable struct is statically allocated */ +#define VTEXTFIXED 0x08 /* text is statically allocated */ #define VSTACK 0x10 /* text is allocated on the stack */ #define VUNSET 0x20 /* the variable is not set */ #define VNOFUNC 0x40 /* don't call the callback function */ ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/main.c#5 (text+ko) ==== @@ -1386,7 +1386,9 @@ if (value == NULL) syslog(LOG_ERR, "no value for 'trace'"); - snmp_trace = strtoul(value, NULL, 0); + else + snmp_trace = + strtoul(value, NULL, 0); break; case -1: ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#7 (text+ko) ==== @@ -82,4 +82,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#6 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#7 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/LICENSE#4 (text+ko) ==== @@ -30,4 +30,4 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/LICENSE#3 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/LICENSE#4 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile#2 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile#3 $ # SUBDIR= bsm \ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/README#7 (text+ko) ==== @@ -85,4 +85,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#6 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#7 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#5 (text+ko) ==== @@ -9,4 +9,4 @@ - The audit.log.5 man page is incomplete, as it does not describe all token types. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#4 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#5 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#5 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile#3 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile#4 $ # SUBDIR= audit \ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile#2 $ # CFLAGS+= -I- -I ../.. -I ../../libbsm -L ../../libbsm -I. ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.8#4 (text+ko) ==== @@ -29,7 +29,7 @@ .\" .\" @APPLE_BSD_LICENSE_HEADER_END@ .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.8#3 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.8#4 $ .\" .Dd January 24, 2004 .Dt AUDIT 8 ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#2 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#3 $ */ /* * Program to trigger the audit daemon with a message that is either: ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile#2 $ # CFLAGS+= -I- -I ../.. -I ../../libbsm -L ../../libbsm -I. ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/audit_warn.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/audit_warn.c#1 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/audit_warn.c#2 $ */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.8#3 (text+ko) ==== @@ -29,7 +29,7 @@ .\" .\" @APPLE_BSD_LICENSE_HEADER_END@ .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.8#2 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.8#3 $ .\" .Dd January 24, 2004 .Dt AUDITD 8 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 6 22:09:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D889416A420; Mon, 6 Feb 2006 22:09:18 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 89E0916A420 for ; Mon, 6 Feb 2006 22:09:18 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 548F143D4C for ; Mon, 6 Feb 2006 22:09:18 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k16M9IUa005093 for ; Mon, 6 Feb 2006 22:09:18 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k16M9IFt005087 for perforce@freebsd.org; Mon, 6 Feb 2006 22:09:18 GMT (envelope-from jhb@freebsd.org) Date: Mon, 6 Feb 2006 22:09:18 GMT Message-Id: <200602062209.k16M9IFt005087@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 91271 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 22:09:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=91271 Change 91271 by jhb@jhb_slimer on 2006/02/06 22:08:36 Sync this file with HEAD. Affected files ... .. //depot/projects/smpng/sys/kern/kern_acct.c#39 integrate Differences ... ==== //depot/projects/smpng/sys/kern/kern_acct.c#39 (text+ko) ==== @@ -42,29 +42,29 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.76 2005/11/12 10:45:13 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.78 2006/02/03 16:37:55 jhb Exp $"); #include "opt_mac.h" #include #include +#include +#include +#include #include +#include +#include #include -#include +#include #include -#include -#include -#include -#include -#include -#include +#include #include +#include #include -#include -#include -#include -#include +#include +#include #include +#include /* * The routines implemented in this file are described in: @@ -143,7 +143,7 @@ * appending and make sure it's a 'normal'. While we could * conditionally acquire Giant here, we're actually interacting with * vnodes from possibly two file systems, making the logic a bit - * complicated. For now, use Giant unconditionally. + * complicated. For now, use Giant unconditionally. */ mtx_lock(&Giant); if (uap->path != NULL) { From owner-p4-projects@FreeBSD.ORG Mon Feb 6 22:11:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEFF416A423; Mon, 6 Feb 2006 22:11:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9908416A420 for ; Mon, 6 Feb 2006 22:11:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B15643D46 for ; Mon, 6 Feb 2006 22:11:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k16MBLu0006836 for ; Mon, 6 Feb 2006 22:11:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k16MBKto006818 for perforce@freebsd.org; Mon, 6 Feb 2006 22:11:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 6 Feb 2006 22:11:20 GMT Message-Id: <200602062211.k16MBKto006818@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91272 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 22:11:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=91272 Change 91272 by rwatson@rwatson_peppercorn on 2006/02/06 22:10:57 Remove sample 'audit' entry from OpenBSM audit_user: most systems don't ship with a user named 'audit'. Affected files ... .. //depot/projects/trustedbsd/openbsm/etc/audit_user#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/etc/audit_user#3 (text+ko) ==== @@ -1,5 +1,4 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_user#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_user#3 $ # root:lo:no -audit:fc:no From owner-p4-projects@FreeBSD.ORG Mon Feb 6 22:15:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20F2F16A423; Mon, 6 Feb 2006 22:15:29 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EF69A16A420 for ; Mon, 6 Feb 2006 22:15:28 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 269EC43D46 for ; Mon, 6 Feb 2006 22:15:28 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k16MFSNH008888 for ; Mon, 6 Feb 2006 22:15:28 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k16MFRDa008885 for perforce@freebsd.org; Mon, 6 Feb 2006 22:15:27 GMT (envelope-from jhb@freebsd.org) Date: Mon, 6 Feb 2006 22:15:27 GMT Message-Id: <200602062215.k16MFRDa008885@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 91276 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 22:15:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=91276 Change 91276 by jhb@jhb_slimer on 2006/02/06 22:14:46 Pullup crash2 changes from jhb_lock. Affected files ... .. //depot/projects/smpng/sys/modules/crash2/crash2.c#2 integrate Differences ... ==== //depot/projects/smpng/sys/modules/crash2/crash2.c#2 (text+ko) ==== @@ -102,12 +102,12 @@ case 1: case 2: rw_wlock(&foo); - DELAY(50); + DELAY(30); rw_wunlock(&foo); break; default: rw_rlock(&foo); - DELAY(250); + DELAY(150); rw_runlock(&foo); } } @@ -117,7 +117,7 @@ { int i; - for (i = 0; i < 10; i++) + for (i = 0; i < 50000; i++) whack_foo(); } From owner-p4-projects@FreeBSD.ORG Mon Feb 6 22:17:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8257316A426; Mon, 6 Feb 2006 22:17:41 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C7AE16A420 for ; Mon, 6 Feb 2006 22:17:41 +0000 (GMT) (envelope-from soc-shteryana@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E2FDE43D4C for ; Mon, 6 Feb 2006 22:17:40 +0000 (GMT) (envelope-from soc-shteryana@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k16MHeXZ009135 for ; Mon, 6 Feb 2006 22:17:40 GMT (envelope-from soc-shteryana@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k16MHeqY009132 for perforce@freebsd.org; Mon, 6 Feb 2006 22:17:40 GMT (envelope-from soc-shteryana@freebsd.org) Date: Mon, 6 Feb 2006 22:17:40 GMT Message-Id: <200602062217.k16MHeqY009132@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-shteryana@freebsd.org using -f From: soc-shteryana To: Perforce Change Reviews Cc: Subject: PERFORCE change 91279 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 22:17:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=91279 Change 91279 by soc-shteryana@prometheus on 2006/02/06 22:17:05 IFC Affected files ... .. //depot/projects/soc2005/bsnmp/lib/Makefile#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon Feb 6 22:34:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EDAE16A424; Mon, 6 Feb 2006 22:34:26 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F11E216A422 for ; Mon, 6 Feb 2006 22:34:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 70CB243D4C for ; Mon, 6 Feb 2006 22:34:20 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k16MYKPC010056 for ; Mon, 6 Feb 2006 22:34:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k16MYJ5D010053 for perforce@freebsd.org; Mon, 6 Feb 2006 22:34:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 6 Feb 2006 22:34:19 GMT Message-Id: <200602062234.k16MYJ5D010053@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91286 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 22:34:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=91286 Change 91286 by rwatson@rwatson_zoo on 2006/02/06 22:33:32 Alphabetize. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/conf/files#15 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/conf/files#15 (text+ko) ==== @@ -1829,14 +1829,14 @@ posix4/p1003_1b.c standard posix4/posix4_mib.c standard rpc/rpcclnt.c optional nfsclient -security/audit/audit_arg.c optional audit -security/audit/audit_syscalls.c standard -security/audit/audit_trigger.c optional audit security/audit/audit.c optional audit security/audit/audit_bsm.c optional audit security/audit/audit_bsm_klib.c optional audit security/audit/audit_bsm_token.c optional audit +security/audit/audit_arg.c optional audit security/audit/audit_pipe.c optional audit +security/audit/audit_syscalls.c standard +security/audit/audit_trigger.c optional audit security/mac/mac_inet.c optional mac inet security/mac/mac_label.c optional mac security/mac/mac_net.c optional mac From owner-p4-projects@FreeBSD.ORG Mon Feb 6 23:08:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A27316A423; Mon, 6 Feb 2006 23:08:46 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 531BD16A422 for ; Mon, 6 Feb 2006 23:08:46 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A99FA43D83 for ; Mon, 6 Feb 2006 23:08:35 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k16N8Z8m011900 for ; Mon, 6 Feb 2006 23:08:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k16N8Yol011897 for perforce@freebsd.org; Mon, 6 Feb 2006 23:08:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 6 Feb 2006 23:08:34 GMT Message-Id: <200602062308.k16N8Yol011897@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91293 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 23:08:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=91293 Change 91293 by rwatson@rwatson_zoo on 2006/02/06 23:07:37 Integrate TrustedBSD base branch from FreeBSD CVS: - Loop back ibcs2 system call table audit identifiers. - Loop back audit pipe support. - Loop back audit UMA allocation for audit records. - kern_eaccess(). Affected files ... .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_machdep.c#14 integrate .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_misc.c#25 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_machdep.c#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_misc.c#17 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_misc.c#29 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#95 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_misc.c#17 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_proto.h#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_syscall.h#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_sysent.c#11 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_xenix.c#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/syscalls.master#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_machdep.c#20 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#56 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#48 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#51 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_kse.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_kthread.c#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#66 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#2 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_pipe.c#1 branch .. //depot/projects/trustedbsd/base/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/imgact.h#12 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscallsubr.h#14 integrate Differences ... ==== //depot/projects/trustedbsd/base/sys/alpha/linux/linux_machdep.c#14 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.36 2005/02/18 18:32:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.37 2006/02/06 22:06:52 jhb Exp $"); #include #include @@ -81,7 +81,6 @@ free(path, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } ==== //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_misc.c#25 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.58 2005/09/28 07:03:01 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.59 2006/02/06 22:06:52 jhb Exp $"); #include #include @@ -1246,7 +1246,6 @@ free(path, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } ==== //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_machdep.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.10 2005/06/24 17:41:27 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.11 2006/02/06 22:06:53 jhb Exp $"); #include #include @@ -205,7 +205,6 @@ free(path, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } ==== //depot/projects/trustedbsd/base/sys/arm/at91/if_ate.c#2 (text) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.1 2006/02/04 23:32:13 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.2 2006/02/06 22:17:42 cognet Exp $"); #include #include @@ -181,13 +181,13 @@ ate_get_mac(sc, eaddr); + sc->ifp = ifp = if_alloc(IFT_ETHER); if (mii_phy_probe(dev, &sc->miibus, ate_ifmedia_upd, ate_ifmedia_sts)) { device_printf(dev, "Cannot find my PHY.\n"); err = ENXIO; goto out; } - sc->ifp = ifp = if_alloc(IFT_ETHER); ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_mtu = ETHERMTU; @@ -611,6 +611,8 @@ BUS_DMASYNC_PREWRITE); continue; } + mb->m_len = sc->rx_descs[i].status & + ETH_LEN_MASK; /* * For the last buffer, set the wrap bit so * the controller restarts from the first @@ -817,7 +819,7 @@ /* * Enable some parts of the MAC that are needed always (like the * MII bus. This turns off the RE and TE bits, which will remain - * off until atestart() is called to turn them on. With RE and TE + * off until ateinit() is called to turn them on. With RE and TE * turned off, there's no DMA to worry about after this write. */ WR4(sc, ETH_CTL, ETH_CTL_MPE); ==== //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_misc.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.49 2006/01/20 16:22:06 ambrisko Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.50 2006/02/06 22:06:53 jhb Exp $"); #include "opt_compat.h" @@ -324,7 +324,6 @@ uap->argv, uap->envv); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } ==== //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_misc.c#29 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.83 2005/10/19 09:33:15 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.84 2006/02/06 22:06:53 jhb Exp $"); #include "opt_mac.h" @@ -175,7 +175,6 @@ free(path, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } @@ -195,7 +194,6 @@ free(path, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } ==== //depot/projects/trustedbsd/base/sys/conf/files#95 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1093 2006/02/03 00:36:19 mjacob Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1095 2006/02/06 22:50:39 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1829,13 +1829,14 @@ posix4/p1003_1b.c standard posix4/posix4_mib.c standard rpc/rpcclnt.c optional nfsclient +security/audit/audit.c optional audit security/audit/audit_arg.c optional audit -security/audit/audit_syscalls.c standard -security/audit/audit_trigger.c optional audit -security/audit/audit.c optional audit security/audit/audit_bsm.c optional audit security/audit/audit_bsm_klib.c optional audit security/audit/audit_bsm_token.c optional audit +security/audit/audit_pipe.c optional audit +security/audit/audit_syscalls.c standard +security/audit/audit_trigger.c optional audit security/mac/mac_inet.c optional mac inet security/mac/mac_label.c optional mac security/mac/mac_net.c optional mac ==== //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_misc.c#17 (text+ko) ==== @@ -47,7 +47,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_misc.c,v 1.61 2005/07/07 19:29:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_misc.c,v 1.62 2006/02/06 22:06:53 jhb Exp $"); /* * IBCS2 compatibility module. @@ -207,7 +207,6 @@ free(path, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } @@ -227,7 +226,6 @@ free(path, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } ==== //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_proto.h#10 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/ibcs2/ibcs2_proto.h,v 1.22 2005/07/13 20:35:08 jhb Exp $ + * $FreeBSD: src/sys/i386/ibcs2/ibcs2_proto.h,v 1.23 2006/02/06 22:15:00 rwatson Exp $ * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.21 2005/07/13 20:32:42 jhb Exp */ ==== //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_syscall.h#9 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/ibcs2/ibcs2_syscall.h,v 1.19 2005/07/13 20:35:08 jhb Exp $ + * $FreeBSD: src/sys/i386/ibcs2/ibcs2_syscall.h,v 1.20 2006/02/06 22:15:00 rwatson Exp $ * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.21 2005/07/13 20:32:42 jhb Exp */ ==== //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_sysent.c#11 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/ibcs2/ibcs2_sysent.c,v 1.24 2005/07/13 20:35:08 jhb Exp $ + * $FreeBSD: src/sys/i386/ibcs2/ibcs2_sysent.c,v 1.25 2006/02/06 22:15:00 rwatson Exp $ * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.21 2005/07/13 20:32:42 jhb Exp */ @@ -19,68 +19,68 @@ /* The casts are bogus but will do for now. */ struct sysent ibcs2_sysent[] = { { SYF_MPSAFE | 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = syscall */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_NULL }, /* 1 = exit */ - { SYF_MPSAFE | 0, (sy_call_t *)fork, AUE_NULL }, /* 2 = fork */ + { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ + { SYF_MPSAFE | 0, (sy_call_t *)fork, AUE_FORK }, /* 2 = fork */ { AS(ibcs2_read_args), (sy_call_t *)ibcs2_read, AUE_NULL }, /* 3 = ibcs2_read */ { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ - { SYF_MPSAFE | AS(ibcs2_open_args), (sy_call_t *)ibcs2_open, AUE_NULL }, /* 5 = ibcs2_open */ - { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_NULL }, /* 6 = close */ - { SYF_MPSAFE | AS(ibcs2_wait_args), (sy_call_t *)ibcs2_wait, AUE_NULL }, /* 7 = ibcs2_wait */ - { SYF_MPSAFE | AS(ibcs2_creat_args), (sy_call_t *)ibcs2_creat, AUE_NULL }, /* 8 = ibcs2_creat */ - { SYF_MPSAFE | AS(link_args), (sy_call_t *)link, AUE_NULL }, /* 9 = link */ - { SYF_MPSAFE | AS(ibcs2_unlink_args), (sy_call_t *)ibcs2_unlink, AUE_NULL }, /* 10 = ibcs2_unlink */ - { SYF_MPSAFE | AS(ibcs2_execv_args), (sy_call_t *)ibcs2_execv, AUE_NULL }, /* 11 = ibcs2_execv */ - { SYF_MPSAFE | AS(ibcs2_chdir_args), (sy_call_t *)ibcs2_chdir, AUE_NULL }, /* 12 = ibcs2_chdir */ + { SYF_MPSAFE | AS(ibcs2_open_args), (sy_call_t *)ibcs2_open, AUE_OPEN_RWTC }, /* 5 = ibcs2_open */ + { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ + { SYF_MPSAFE | AS(ibcs2_wait_args), (sy_call_t *)ibcs2_wait, AUE_WAIT4 }, /* 7 = ibcs2_wait */ + { SYF_MPSAFE | AS(ibcs2_creat_args), (sy_call_t *)ibcs2_creat, AUE_CREAT }, /* 8 = ibcs2_creat */ + { SYF_MPSAFE | AS(link_args), (sy_call_t *)link, AUE_LINK }, /* 9 = link */ + { SYF_MPSAFE | AS(ibcs2_unlink_args), (sy_call_t *)ibcs2_unlink, AUE_UNLINK }, /* 10 = ibcs2_unlink */ + { SYF_MPSAFE | AS(ibcs2_execv_args), (sy_call_t *)ibcs2_execv, AUE_EXECVE }, /* 11 = ibcs2_execv */ + { SYF_MPSAFE | AS(ibcs2_chdir_args), (sy_call_t *)ibcs2_chdir, AUE_CHDIR }, /* 12 = ibcs2_chdir */ { SYF_MPSAFE | AS(ibcs2_time_args), (sy_call_t *)ibcs2_time, AUE_NULL }, /* 13 = ibcs2_time */ - { SYF_MPSAFE | AS(ibcs2_mknod_args), (sy_call_t *)ibcs2_mknod, AUE_NULL }, /* 14 = ibcs2_mknod */ - { SYF_MPSAFE | AS(ibcs2_chmod_args), (sy_call_t *)ibcs2_chmod, AUE_NULL }, /* 15 = ibcs2_chmod */ - { SYF_MPSAFE | AS(ibcs2_chown_args), (sy_call_t *)ibcs2_chown, AUE_NULL }, /* 16 = ibcs2_chown */ + { SYF_MPSAFE | AS(ibcs2_mknod_args), (sy_call_t *)ibcs2_mknod, AUE_MKNOD }, /* 14 = ibcs2_mknod */ + { SYF_MPSAFE | AS(ibcs2_chmod_args), (sy_call_t *)ibcs2_chmod, AUE_CHMOD }, /* 15 = ibcs2_chmod */ + { SYF_MPSAFE | AS(ibcs2_chown_args), (sy_call_t *)ibcs2_chown, AUE_CHOWN }, /* 16 = ibcs2_chown */ { SYF_MPSAFE | AS(obreak_args), (sy_call_t *)obreak, AUE_NULL }, /* 17 = obreak */ - { SYF_MPSAFE | AS(ibcs2_stat_args), (sy_call_t *)ibcs2_stat, AUE_NULL }, /* 18 = ibcs2_stat */ - { SYF_MPSAFE | AS(ibcs2_lseek_args), (sy_call_t *)ibcs2_lseek, AUE_NULL }, /* 19 = ibcs2_lseek */ + { SYF_MPSAFE | AS(ibcs2_stat_args), (sy_call_t *)ibcs2_stat, AUE_STAT }, /* 18 = ibcs2_stat */ + { SYF_MPSAFE | AS(ibcs2_lseek_args), (sy_call_t *)ibcs2_lseek, AUE_LSEEK }, /* 19 = ibcs2_lseek */ { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_NULL }, /* 20 = getpid */ - { AS(ibcs2_mount_args), (sy_call_t *)ibcs2_mount, AUE_NULL }, /* 21 = ibcs2_mount */ - { AS(ibcs2_umount_args), (sy_call_t *)ibcs2_umount, AUE_NULL }, /* 22 = ibcs2_umount */ - { SYF_MPSAFE | AS(ibcs2_setuid_args), (sy_call_t *)ibcs2_setuid, AUE_NULL }, /* 23 = ibcs2_setuid */ - { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_NULL }, /* 24 = getuid */ - { SYF_MPSAFE | AS(ibcs2_stime_args), (sy_call_t *)ibcs2_stime, AUE_NULL }, /* 25 = ibcs2_stime */ - { SYF_MPSAFE | AS(ptrace_args), (sy_call_t *)ptrace, AUE_NULL }, /* 26 = ptrace */ + { AS(ibcs2_mount_args), (sy_call_t *)ibcs2_mount, AUE_MOUNT }, /* 21 = ibcs2_mount */ + { AS(ibcs2_umount_args), (sy_call_t *)ibcs2_umount, AUE_UMOUNT }, /* 22 = ibcs2_umount */ + { SYF_MPSAFE | AS(ibcs2_setuid_args), (sy_call_t *)ibcs2_setuid, AUE_SETUID }, /* 23 = ibcs2_setuid */ + { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_GETUID }, /* 24 = getuid */ + { SYF_MPSAFE | AS(ibcs2_stime_args), (sy_call_t *)ibcs2_stime, AUE_SETTIMEOFDAY }, /* 25 = ibcs2_stime */ + { SYF_MPSAFE | AS(ptrace_args), (sy_call_t *)ptrace, AUE_PTRACE }, /* 26 = ptrace */ { SYF_MPSAFE | AS(ibcs2_alarm_args), (sy_call_t *)ibcs2_alarm, AUE_NULL }, /* 27 = ibcs2_alarm */ - { SYF_MPSAFE | AS(ibcs2_fstat_args), (sy_call_t *)ibcs2_fstat, AUE_NULL }, /* 28 = ibcs2_fstat */ + { SYF_MPSAFE | AS(ibcs2_fstat_args), (sy_call_t *)ibcs2_fstat, AUE_FSTAT }, /* 28 = ibcs2_fstat */ { SYF_MPSAFE | 0, (sy_call_t *)ibcs2_pause, AUE_NULL }, /* 29 = ibcs2_pause */ { SYF_MPSAFE | AS(ibcs2_utime_args), (sy_call_t *)ibcs2_utime, AUE_NULL }, /* 30 = ibcs2_utime */ { SYF_MPSAFE | AS(ibcs2_stty_args), (sy_call_t *)ibcs2_stty, AUE_NULL }, /* 31 = ibcs2_stty */ { SYF_MPSAFE | AS(ibcs2_gtty_args), (sy_call_t *)ibcs2_gtty, AUE_NULL }, /* 32 = ibcs2_gtty */ - { SYF_MPSAFE | AS(ibcs2_access_args), (sy_call_t *)ibcs2_access, AUE_NULL }, /* 33 = ibcs2_access */ - { SYF_MPSAFE | AS(ibcs2_nice_args), (sy_call_t *)ibcs2_nice, AUE_NULL }, /* 34 = ibcs2_nice */ - { SYF_MPSAFE | AS(ibcs2_statfs_args), (sy_call_t *)ibcs2_statfs, AUE_NULL }, /* 35 = ibcs2_statfs */ + { SYF_MPSAFE | AS(ibcs2_access_args), (sy_call_t *)ibcs2_access, AUE_ACCESS }, /* 33 = ibcs2_access */ + { SYF_MPSAFE | AS(ibcs2_nice_args), (sy_call_t *)ibcs2_nice, AUE_NICE }, /* 34 = ibcs2_nice */ + { SYF_MPSAFE | AS(ibcs2_statfs_args), (sy_call_t *)ibcs2_statfs, AUE_STATFS }, /* 35 = ibcs2_statfs */ { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_NULL }, /* 36 = sync */ - { SYF_MPSAFE | AS(ibcs2_kill_args), (sy_call_t *)ibcs2_kill, AUE_NULL }, /* 37 = ibcs2_kill */ - { SYF_MPSAFE | AS(ibcs2_fstatfs_args), (sy_call_t *)ibcs2_fstatfs, AUE_NULL }, /* 38 = ibcs2_fstatfs */ + { SYF_MPSAFE | AS(ibcs2_kill_args), (sy_call_t *)ibcs2_kill, AUE_KILL }, /* 37 = ibcs2_kill */ + { SYF_MPSAFE | AS(ibcs2_fstatfs_args), (sy_call_t *)ibcs2_fstatfs, AUE_FSTATFS }, /* 38 = ibcs2_fstatfs */ { SYF_MPSAFE | AS(ibcs2_pgrpsys_args), (sy_call_t *)ibcs2_pgrpsys, AUE_NULL }, /* 39 = ibcs2_pgrpsys */ { SYF_MPSAFE | AS(ibcs2_xenix_args), (sy_call_t *)ibcs2_xenix, AUE_NULL }, /* 40 = ibcs2_xenix */ { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_NULL }, /* 41 = dup */ - { SYF_MPSAFE | 0, (sy_call_t *)pipe, AUE_NULL }, /* 42 = pipe */ + { SYF_MPSAFE | 0, (sy_call_t *)pipe, AUE_PIPE }, /* 42 = pipe */ { SYF_MPSAFE | AS(ibcs2_times_args), (sy_call_t *)ibcs2_times, AUE_NULL }, /* 43 = ibcs2_times */ - { SYF_MPSAFE | AS(profil_args), (sy_call_t *)profil, AUE_NULL }, /* 44 = profil */ + { SYF_MPSAFE | AS(profil_args), (sy_call_t *)profil, AUE_PROFILE }, /* 44 = profil */ { SYF_MPSAFE | AS(ibcs2_plock_args), (sy_call_t *)ibcs2_plock, AUE_NULL }, /* 45 = ibcs2_plock */ - { SYF_MPSAFE | AS(ibcs2_setgid_args), (sy_call_t *)ibcs2_setgid, AUE_NULL }, /* 46 = ibcs2_setgid */ - { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_NULL }, /* 47 = getgid */ + { SYF_MPSAFE | AS(ibcs2_setgid_args), (sy_call_t *)ibcs2_setgid, AUE_SETGID }, /* 46 = ibcs2_setgid */ + { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_GETGID }, /* 47 = getgid */ { SYF_MPSAFE | AS(ibcs2_sigsys_args), (sy_call_t *)ibcs2_sigsys, AUE_NULL }, /* 48 = ibcs2_sigsys */ - { AS(ibcs2_msgsys_args), (sy_call_t *)ibcs2_msgsys, AUE_NULL }, /* 49 = ibcs2_msgsys */ + { AS(ibcs2_msgsys_args), (sy_call_t *)ibcs2_msgsys, AUE_MSGSYS }, /* 49 = ibcs2_msgsys */ { SYF_MPSAFE | AS(ibcs2_sysi86_args), (sy_call_t *)ibcs2_sysi86, AUE_NULL }, /* 50 = ibcs2_sysi86 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 51 = ibcs2_acct */ - { AS(ibcs2_shmsys_args), (sy_call_t *)ibcs2_shmsys, AUE_NULL }, /* 52 = ibcs2_shmsys */ - { AS(ibcs2_semsys_args), (sy_call_t *)ibcs2_semsys, AUE_NULL }, /* 53 = ibcs2_semsys */ - { AS(ibcs2_ioctl_args), (sy_call_t *)ibcs2_ioctl, AUE_NULL }, /* 54 = ibcs2_ioctl */ + { AS(ibcs2_shmsys_args), (sy_call_t *)ibcs2_shmsys, AUE_SHMSYS }, /* 52 = ibcs2_shmsys */ + { AS(ibcs2_semsys_args), (sy_call_t *)ibcs2_semsys, AUE_SEMSYS }, /* 53 = ibcs2_semsys */ + { AS(ibcs2_ioctl_args), (sy_call_t *)ibcs2_ioctl, AUE_IOCTL }, /* 54 = ibcs2_ioctl */ { SYF_MPSAFE | AS(ibcs2_uadmin_args), (sy_call_t *)ibcs2_uadmin, AUE_NULL }, /* 55 = ibcs2_uadmin */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = nosys */ { SYF_MPSAFE | AS(ibcs2_utssys_args), (sy_call_t *)ibcs2_utssys, AUE_NULL }, /* 57 = ibcs2_utssys */ - { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_NULL }, /* 58 = fsync */ - { SYF_MPSAFE | AS(ibcs2_execve_args), (sy_call_t *)ibcs2_execve, AUE_NULL }, /* 59 = ibcs2_execve */ - { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_NULL }, /* 60 = umask */ - { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_NULL }, /* 61 = chroot */ - { SYF_MPSAFE | AS(ibcs2_fcntl_args), (sy_call_t *)ibcs2_fcntl, AUE_NULL }, /* 62 = ibcs2_fcntl */ + { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 58 = fsync */ + { SYF_MPSAFE | AS(ibcs2_execve_args), (sy_call_t *)ibcs2_execve, AUE_EXECVE }, /* 59 = ibcs2_execve */ + { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ + { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ + { SYF_MPSAFE | AS(ibcs2_fcntl_args), (sy_call_t *)ibcs2_fcntl, AUE_FCNTL }, /* 62 = ibcs2_fcntl */ { SYF_MPSAFE | AS(ibcs2_ulimit_args), (sy_call_t *)ibcs2_ulimit, AUE_NULL }, /* 63 = ibcs2_ulimit */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 64 = reserved for unix/pc */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 65 = reserved for unix/pc */ @@ -97,20 +97,20 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 76 = obsolete rfs_rdebug */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 77 = obsolete rfs_rfstop */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 78 = rfs_rfsys */ - { SYF_MPSAFE | AS(ibcs2_rmdir_args), (sy_call_t *)ibcs2_rmdir, AUE_NULL }, /* 79 = ibcs2_rmdir */ - { SYF_MPSAFE | AS(ibcs2_mkdir_args), (sy_call_t *)ibcs2_mkdir, AUE_NULL }, /* 80 = ibcs2_mkdir */ - { AS(ibcs2_getdents_args), (sy_call_t *)ibcs2_getdents, AUE_NULL }, /* 81 = ibcs2_getdents */ + { SYF_MPSAFE | AS(ibcs2_rmdir_args), (sy_call_t *)ibcs2_rmdir, AUE_RMDIR }, /* 79 = ibcs2_rmdir */ + { SYF_MPSAFE | AS(ibcs2_mkdir_args), (sy_call_t *)ibcs2_mkdir, AUE_MKDIR }, /* 80 = ibcs2_mkdir */ + { AS(ibcs2_getdents_args), (sy_call_t *)ibcs2_getdents, AUE_GETDIRENTRIES }, /* 81 = ibcs2_getdents */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 82 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 83 = nosys */ { SYF_MPSAFE | AS(ibcs2_sysfs_args), (sy_call_t *)ibcs2_sysfs, AUE_NULL }, /* 84 = ibcs2_sysfs */ - { SYF_MPSAFE | AS(ibcs2_getmsg_args), (sy_call_t *)ibcs2_getmsg, AUE_NULL }, /* 85 = ibcs2_getmsg */ - { SYF_MPSAFE | AS(ibcs2_putmsg_args), (sy_call_t *)ibcs2_putmsg, AUE_NULL }, /* 86 = ibcs2_putmsg */ - { AS(ibcs2_poll_args), (sy_call_t *)ibcs2_poll, AUE_NULL }, /* 87 = ibcs2_poll */ + { SYF_MPSAFE | AS(ibcs2_getmsg_args), (sy_call_t *)ibcs2_getmsg, AUE_GETMSG }, /* 85 = ibcs2_getmsg */ + { SYF_MPSAFE | AS(ibcs2_putmsg_args), (sy_call_t *)ibcs2_putmsg, AUE_PUTMSG }, /* 86 = ibcs2_putmsg */ + { AS(ibcs2_poll_args), (sy_call_t *)ibcs2_poll, AUE_POLL }, /* 87 = ibcs2_poll */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 88 = nosys */ { SYF_MPSAFE | AS(ibcs2_secure_args), (sy_call_t *)ibcs2_secure, AUE_NULL }, /* 89 = ibcs2_secure */ - { SYF_MPSAFE | AS(ibcs2_symlink_args), (sy_call_t *)ibcs2_symlink, AUE_NULL }, /* 90 = ibcs2_symlink */ - { SYF_MPSAFE | AS(ibcs2_lstat_args), (sy_call_t *)ibcs2_lstat, AUE_NULL }, /* 91 = ibcs2_lstat */ - { SYF_MPSAFE | AS(ibcs2_readlink_args), (sy_call_t *)ibcs2_readlink, AUE_NULL }, /* 92 = ibcs2_readlink */ + { SYF_MPSAFE | AS(ibcs2_symlink_args), (sy_call_t *)ibcs2_symlink, AUE_SYMLINK }, /* 90 = ibcs2_symlink */ + { SYF_MPSAFE | AS(ibcs2_lstat_args), (sy_call_t *)ibcs2_lstat, AUE_LSTAT }, /* 91 = ibcs2_lstat */ + { SYF_MPSAFE | AS(ibcs2_readlink_args), (sy_call_t *)ibcs2_readlink, AUE_READLINK }, /* 92 = ibcs2_readlink */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 93 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 94 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 95 = nosys */ ==== //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_xenix.c#10 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_xenix.c,v 1.35 2005/07/07 19:28:55 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_xenix.c,v 1.36 2006/02/06 22:00:52 jhb Exp $"); #include #include @@ -216,7 +216,7 @@ bsd_flags |= X_OK; CHECKALTEXIST(td, uap->path, &path); - error = kern_access(td, path, UIO_SYSSPACE, bsd_flags); + error = kern_eaccess(td, path, UIO_SYSSPACE, bsd_flags); free(path, M_TEMP); return (error); } ==== //depot/projects/trustedbsd/base/sys/i386/ibcs2/syscalls.master#9 (text+ko) ==== @@ -1,10 +1,10 @@ - $FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.21 2005/07/13 20:32:42 jhb Exp $ + $FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.22 2006/02/06 22:14:50 rwatson Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from IBCS2). ; Processed to created ibcs2_sysent.c, ibcs2_syscalls.c and ibcs2_syscall.h. -; Columns: number type nargs name alt{name,tag,rtyp}/comments +; Columns: number audit type nargs name alt{name,tag,rtyp}/comments ; number system call number, must be in order ; audit the audit event associated with the system call ; A value of AUE_NULL means no auditing, but it also means that @@ -36,45 +36,45 @@ ; #ifdef's, etc. may be included, and are copied to the output files. 0 AUE_NULL MNOPROTO { int nosys(void); } syscall nosys_args int -1 AUE_NULL MNOPROTO { void sys_exit(int rval); } exit \ +1 AUE_EXIT MNOPROTO { void sys_exit(int rval); } exit \ sys_exit_args void -2 AUE_NULL MNOPROTO { int fork(void); } +2 AUE_FORK MNOPROTO { int fork(void); } 3 AUE_NULL STD { int ibcs2_read(int fd, char *buf, \ u_int nbytes); } 4 AUE_NULL MNOPROTO { int write(int fd, char *buf, \ u_int nbytes); } -5 AUE_NULL MSTD { int ibcs2_open(char *path, int flags, \ +5 AUE_OPEN_RWTC MSTD { int ibcs2_open(char *path, int flags, \ int mode); } -6 AUE_NULL MNOPROTO { int close(int fd); } -7 AUE_NULL MSTD { int ibcs2_wait(int a1, int a2, int a3); } -8 AUE_NULL MSTD { int ibcs2_creat(char *path, int mode); } -9 AUE_NULL MNOPROTO { int link(char *path, char *link); } -10 AUE_NULL MSTD { int ibcs2_unlink(char *path); } -11 AUE_NULL MSTD { int ibcs2_execv(char *path, char **argp); } -12 AUE_NULL MSTD { int ibcs2_chdir(char *path); } +6 AUE_CLOSE MNOPROTO { int close(int fd); } +7 AUE_WAIT4 MSTD { int ibcs2_wait(int a1, int a2, int a3); } +8 AUE_CREAT MSTD { int ibcs2_creat(char *path, int mode); } +9 AUE_LINK MNOPROTO { int link(char *path, char *link); } +10 AUE_UNLINK MSTD { int ibcs2_unlink(char *path); } +11 AUE_EXECVE MSTD { int ibcs2_execv(char *path, char **argp); } +12 AUE_CHDIR MSTD { int ibcs2_chdir(char *path); } 13 AUE_NULL MSTD { int ibcs2_time(ibcs2_time_t *tp); } -14 AUE_NULL MSTD { int ibcs2_mknod(char* path, int mode, \ +14 AUE_MKNOD MSTD { int ibcs2_mknod(char* path, int mode, \ int dev); } -15 AUE_NULL MSTD { int ibcs2_chmod(char *path, int mode); } -16 AUE_NULL MSTD { int ibcs2_chown(char *path, int uid, \ +15 AUE_CHMOD MSTD { int ibcs2_chmod(char *path, int mode); } +16 AUE_CHOWN MSTD { int ibcs2_chown(char *path, int uid, \ int gid); } 17 AUE_NULL MNOPROTO { int obreak(caddr_t nsize); } -18 AUE_NULL MSTD { int ibcs2_stat(char* path, \ +18 AUE_STAT MSTD { int ibcs2_stat(char* path, \ struct ibcs2_stat *st); } -19 AUE_NULL MSTD { long ibcs2_lseek(int fd, long offset, \ +19 AUE_LSEEK MSTD { long ibcs2_lseek(int fd, long offset, \ int whence); } 20 AUE_NULL MNOPROTO { pid_t getpid(void); } -21 AUE_NULL STD { int ibcs2_mount(char *special, char *dir, \ +21 AUE_MOUNT STD { int ibcs2_mount(char *special, char *dir, \ int flags, int fstype, char *data, \ int len); } -22 AUE_NULL STD { int ibcs2_umount(char *name); } -23 AUE_NULL MSTD { int ibcs2_setuid(int uid); } -24 AUE_NULL MNOPROTO { uid_t getuid(void); } -25 AUE_NULL MSTD { int ibcs2_stime(long *timep); } -26 AUE_NULL MNOPROTO { int ptrace(int req, pid_t pid, \ +22 AUE_UMOUNT STD { int ibcs2_umount(char *name); } +23 AUE_SETUID MSTD { int ibcs2_setuid(int uid); } +24 AUE_GETUID MNOPROTO { uid_t getuid(void); } +25 AUE_SETTIMEOFDAY MSTD { int ibcs2_stime(long *timep); } +26 AUE_PTRACE MNOPROTO { int ptrace(int req, pid_t pid, \ caddr_t addr, int data); } 27 AUE_NULL MSTD { int ibcs2_alarm(unsigned sec); } -28 AUE_NULL MSTD { int ibcs2_fstat(int fd, \ +28 AUE_FSTAT MSTD { int ibcs2_fstat(int fd, \ struct ibcs2_stat *st); } 29 AUE_NULL MSTD { int ibcs2_pause(void); } 30 AUE_NULL MSTD { int ibcs2_utime(char *path, \ @@ -83,14 +83,14 @@ struct sgttyb *buf); } 32 AUE_NULL MSTD { int ibcs2_gtty(int fd, \ struct sgttyb *buf); } -33 AUE_NULL MSTD { int ibcs2_access(char *path, int flags); } -34 AUE_NULL MSTD { int ibcs2_nice(int incr); } -35 AUE_NULL MSTD { int ibcs2_statfs(char *path, \ +33 AUE_ACCESS MSTD { int ibcs2_access(char *path, int flags); } +34 AUE_NICE MSTD { int ibcs2_nice(int incr); } +35 AUE_STATFS MSTD { int ibcs2_statfs(char *path, \ struct ibcs2_statfs *buf, int len, \ int fstype); } 36 AUE_NULL MNOPROTO { int sync(void); } -37 AUE_NULL MSTD { int ibcs2_kill(int pid, int signo); } -38 AUE_NULL MSTD { int ibcs2_fstatfs(int fd, \ +37 AUE_KILL MSTD { int ibcs2_kill(int pid, int signo); } +38 AUE_FSTATFS MSTD { int ibcs2_fstatfs(int fd, \ struct ibcs2_statfs *buf, int len, \ int fstype); } 39 AUE_NULL MSTD { int ibcs2_pgrpsys(int type, caddr_t dummy, \ @@ -98,35 +98,35 @@ 40 AUE_NULL MSTD { int ibcs2_xenix(int a1, int a2, int a3, \ int a4, int a5); } 41 AUE_NULL MNOPROTO { int dup(u_int fd); } -42 AUE_NULL MNOPROTO { int pipe(void); } +42 AUE_PIPE MNOPROTO { int pipe(void); } 43 AUE_NULL MSTD { int ibcs2_times(struct tms *tp); } -44 AUE_NULL MNOPROTO { int profil(caddr_t samples, u_int size, \ +44 AUE_PROFILE MNOPROTO { int profil(caddr_t samples, u_int size, \ u_int offset, u_int scale); } 45 AUE_NULL MSTD { int ibcs2_plock(int cmd); } -46 AUE_NULL MSTD { int ibcs2_setgid(int gid); } -47 AUE_NULL MNOPROTO { gid_t getgid(void); } +46 AUE_SETGID MSTD { int ibcs2_setgid(int gid); } +47 AUE_GETGID MNOPROTO { gid_t getgid(void); } 48 AUE_NULL MSTD { int ibcs2_sigsys(int sig, ibcs2_sig_t fp); } -49 AUE_NULL STD { int ibcs2_msgsys(int which, int a2, \ +49 AUE_MSGSYS STD { int ibcs2_msgsys(int which, int a2, \ int a3, int a4, int a5, int a6); } 50 AUE_NULL MSTD { int ibcs2_sysi86(int cmd, int *arg); } 51 AUE_NULL UNIMPL ibcs2_acct -52 AUE_NULL STD { int ibcs2_shmsys(int which, int a2, \ +52 AUE_SHMSYS STD { int ibcs2_shmsys(int which, int a2, \ int a3, int a4); } -53 AUE_NULL STD { int ibcs2_semsys(int which, int a2, \ +53 AUE_SEMSYS STD { int ibcs2_semsys(int which, int a2, \ int a3, int a4, int a5); } -54 AUE_NULL STD { int ibcs2_ioctl(int fd, int cmd, \ +54 AUE_IOCTL STD { int ibcs2_ioctl(int fd, int cmd, \ caddr_t data); } 55 AUE_NULL MSTD { int ibcs2_uadmin(int cmd, int func, \ caddr_t data); } 56 AUE_NULL UNIMPL nosys 57 AUE_NULL MSTD { int ibcs2_utssys(int a1, int a2, \ int flag); } -58 AUE_NULL MNOPROTO { int fsync(int fd); } -59 AUE_NULL MSTD { int ibcs2_execve(char *path, char **argp, \ +58 AUE_FSYNC MNOPROTO { int fsync(int fd); } +59 AUE_EXECVE MSTD { int ibcs2_execve(char *path, char **argp, \ char **envp); } -60 AUE_NULL MNOPROTO { int umask(int newmask); } -61 AUE_NULL MNOPROTO { int chroot(char *path); } -62 AUE_NULL MSTD { int ibcs2_fcntl(int fd, int cmd, \ +60 AUE_UMASK MNOPROTO { int umask(int newmask); } +61 AUE_CHROOT MNOPROTO { int chroot(char *path); } +62 AUE_FCNTL MSTD { int ibcs2_fcntl(int fd, int cmd, \ char *arg); } 63 AUE_NULL MSTD { long ibcs2_ulimit(int cmd, int newlimit); } 64 AUE_NULL UNIMPL reserved for unix/pc @@ -144,30 +144,30 @@ 76 AUE_NULL OBSOL rfs_rdebug 77 AUE_NULL OBSOL rfs_rfstop 78 AUE_NULL UNIMPL rfs_rfsys -79 AUE_NULL MSTD { int ibcs2_rmdir(char *path); } -80 AUE_NULL MSTD { int ibcs2_mkdir(char *path, int mode); } -81 AUE_NULL STD { int ibcs2_getdents(int fd, char *buf, \ +79 AUE_RMDIR MSTD { int ibcs2_rmdir(char *path); } +80 AUE_MKDIR MSTD { int ibcs2_mkdir(char *path, int mode); } +81 AUE_GETDIRENTRIES STD { int ibcs2_getdents(int fd, char *buf, \ int nbytes); } 82 AUE_NULL UNIMPL nosys 83 AUE_NULL UNIMPL nosys 84 AUE_NULL MSTD { int ibcs2_sysfs(int cmd, caddr_t d1, \ char *buf); } -85 AUE_NULL MSTD { int ibcs2_getmsg(int fd, \ +85 AUE_GETMSG MSTD { int ibcs2_getmsg(int fd, \ struct ibcs2_stropts *ctl, \ struct ibcs2_stropts *dat, int *flags); } -86 AUE_NULL MSTD { int ibcs2_putmsg(int fd, \ +86 AUE_PUTMSG MSTD { int ibcs2_putmsg(int fd, \ struct ibcs2_stropts *ctl, \ struct ibcs2_stropts *dat, int flags); } -87 AUE_NULL STD { int ibcs2_poll(struct ibcs2_poll *fds, \ +87 AUE_POLL STD { int ibcs2_poll(struct ibcs2_poll *fds, \ long nfds, int timeout); } 88 AUE_NULL UNIMPL nosys 89 AUE_NULL MSTD { int ibcs2_secure(int cmd, int a1, int a2, \ int a3, int a4, int a5); } -90 AUE_NULL MSTD { int ibcs2_symlink(char *path, \ +90 AUE_SYMLINK MSTD { int ibcs2_symlink(char *path, \ char *link); } -91 AUE_NULL MSTD { int ibcs2_lstat(char *path, \ +91 AUE_LSTAT MSTD { int ibcs2_lstat(char *path, \ struct ibcs2_stat *st); } -92 AUE_NULL MSTD { int ibcs2_readlink(char *path, char *buf, \ +92 AUE_READLINK MSTD { int ibcs2_readlink(char *path, char *buf, \ int count); } 93 AUE_NULL UNIMPL nosys 94 AUE_NULL UNIMPL nosys ==== //depot/projects/trustedbsd/base/sys/i386/linux/linux_machdep.c#20 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.49 2005/08/01 17:35:48 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.50 2006/02/06 22:06:53 jhb Exp $"); #include #include @@ -122,7 +122,6 @@ free(newpath, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } ==== //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#56 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.288 2006/02/02 08:39:39 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.289 2006/02/06 22:06:54 jhb Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_ktrace.h" @@ -86,6 +86,7 @@ static int sysctl_kern_stackprot(SYSCTL_HANDLER_ARGS); static int do_execve(struct thread *td, struct image_args *args, struct mac *mac_p); +static void exec_free_args(struct image_args *); /* XXX This should be vm_size_t. */ SYSCTL_PROC(_kern, KERN_PS_STRINGS, ps_strings, CTLTYPE_ULONG|CTLFLAG_RD, @@ -181,12 +182,8 @@ error = exec_copyin_args(&args, uap->fname, UIO_USERSPACE, uap->argv, uap->envv); - if (error == 0) error = kern_execve(td, &args, NULL); - - exec_free_args(&args); - return (error); } @@ -218,12 +215,8 @@ error = exec_copyin_args(&args, uap->fname, UIO_USERSPACE, uap->argv, uap->envv); - if (error == 0) error = kern_execve(td, &args, uap->mac_p); - - exec_free_args(&args); - return (error); #else return (ENOSYS); @@ -776,19 +769,6 @@ p->p_flag &= ~P_INEXEC; PROC_UNLOCK(p); - if (imgp->vmspace_destroyed) { - /* sorry, no more process anymore. exit gracefully */ -#ifdef MAC - mac_execve_exit(imgp); - if (interplabel != NULL) - mac_vnode_label_free(interplabel); -#endif - VFS_UNLOCK_GIANT(vfslocked); - exec_free_args(args); - exit1(td, W_EXITCODE(0, SIGABRT)); - /* NOT REACHED */ - error = 0; - } done2: #ifdef MAC mac_execve_exit(imgp); @@ -796,6 +776,13 @@ mac_vnode_label_free(interplabel); #endif VFS_UNLOCK_GIANT(vfslocked); + exec_free_args(args); + + if (error && imgp->vmspace_destroyed) { + /* sorry, no more process anymore. exit gracefully */ + exit1(td, W_EXITCODE(0, SIGABRT)); + /* NOT REACHED */ + } return (error); } @@ -1036,7 +1023,7 @@ return (0); } -void +static void exec_free_args(struct image_args *args) { ==== //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#48 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.280 2006/02/06 00:19:09 wsalamon Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.281 2006/02/06 21:56:13 jhb Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -508,12 +508,6 @@ psignal(p->p_pptr, p->p_sigparent); } PROC_UNLOCK(p->p_pptr); - - /* - * If this is a kthread, then wakeup anyone waiting for it to exit. - */ - if (p->p_flag & P_KTHREAD) - wakeup(p); PROC_UNLOCK(p); /* ==== //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#51 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.255 2006/02/06 00:28:50 wsalamon Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.256 2006/02/06 21:54:47 jhb Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -805,14 +805,11 @@ * Check if a kernel thread misbehaved and returned from its main * function. */ - PROC_LOCK(p); if (p->p_flag & P_KTHREAD) { - PROC_UNLOCK(p); printf("Kernel thread \"%s\" (pid %d) exited prematurely.\n", p->p_comm, p->p_pid); kthread_exit(0); } - PROC_UNLOCK(p); mtx_assert(&Giant, MA_NOTOWNED); } ==== //depot/projects/trustedbsd/base/sys/kern/kern_kse.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_kse.c,v 1.220 2005/11/03 04:49:16 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_kse.c,v 1.221 2006/02/06 22:06:54 jhb Exp $"); #include #include @@ -266,7 +266,6 @@ args.argv, args.envp); if (error == 0) error = kern_execve(td, &iargs, NULL); - exec_free_args(&iargs); if (error == 0) { PROC_LOCK(p); SIGSETOR(td->td_siglist, args.sigpend); ==== //depot/projects/trustedbsd/base/sys/kern/kern_kthread.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_kthread.c,v 1.34 2005/01/06 23:35:39 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_kthread.c,v 1.35 2006/02/06 21:56:13 jhb Exp $"); #include #include @@ -129,11 +129,23 @@ td = curthread; p = td->td_proc; + + /* + * Reparent curthread from proc0 to init so that the zombie + * is harvested. + */ sx_xlock(&proctree_lock); PROC_LOCK(p); proc_reparent(p, initproc); PROC_UNLOCK(p); sx_xunlock(&proctree_lock); + + /* + * Wakeup anyone waiting for us to exit. + */ + wakeup(p); + + /* Buh-bye! */ exit1(td, W_EXITCODE(ecode, 0)); } ==== //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#66 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.404 2006/02/06 10:15:27 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.405 2006/02/06 22:00:52 jhb Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -1915,18 +1915,24 @@ int flags; } */ *uap; { + + return (kern_eaccess(td, uap->path, UIO_USERSPACE, uap->flags)); +} + +int +kern_eaccess(struct thread *td, char *path, enum uio_seg pathseg, int flags) +{ struct nameidata nd; struct vnode *vp; int vfslocked; int error; - NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE, UIO_USERSPACE, - uap->path, td); + NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE, pathseg, path, td); if ((error = namei(&nd)) != 0) return (error); vp = nd.ni_vp; vfslocked = NDHASGIANT(&nd); - error = vn_access(vp, uap->flags, td->td_ucred, td); + error = vn_access(vp, flags, td->td_ucred, td); NDFREE(&nd, NDF_ONLY_PNBUF); vput(vp); VFS_UNLOCK_GIANT(vfslocked); ==== //depot/projects/trustedbsd/base/sys/security/audit/audit.c#2 (text) ==== @@ -1,5 +1,6 @@ /* * Copyright (c) 1999-2005 Apple Computer, Inc. + * Copyright (c) 2006 Robert N. M. Watson * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit.c,v 1.3 2006/02/05 21:06:09 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit.c,v 1.5 2006/02/06 22:50:39 rwatson Exp $ */ #include @@ -56,14 +57,17 @@ #include #include +#include +#include + #include #include -#include -#include #include #include +#include + /* * The AUDIT_EXCESSIVELY_VERBOSE define enables a number of * gratuitously noisy printf's to the console. Due to the @@ -77,8 +81,8 @@ #define AUDIT_PRINTF(X) #endif +static uma_zone_t audit_record_zone; static MALLOC_DEFINE(M_AUDITPROC, "audit_proc", "Audit process storage"); -static MALLOC_DEFINE(M_AUDITREC, "audit_rec", "Audit event records"); MALLOC_DEFINE(M_AUDITDATA, "audit_data", "Audit data storage"); MALLOC_DEFINE(M_AUDITPATH, "audit_path", "Audit path storage"); MALLOC_DEFINE(M_AUDITTEXT, "audit_text", "Audit text storage"); @@ -193,25 +197,58 @@ static int audit_file_rotate_wait; /* - * Perform a deep free of an audit record (core record and referenced objects) + * Construct an audit record for the passed thread. */ +static int +audit_record_ctor(void *mem, int size, void *arg, int flags) +{ + struct kaudit_record *ar; + struct thread *td; + + KASSERT(sizeof(*ar) == size, ("audit_record_ctor: wrong size")); + + td = arg; + ar = mem; + bzero(ar, sizeof(*ar)); + ar->k_ar.ar_magic = AUDIT_RECORD_MAGIC; + nanotime(&ar->k_ar.ar_starttime); + + /* + * Export the subject credential. + * + * XXXAUDIT: td_ucred access is OK without proc lock, but some other + * fields here may require the proc lock. + */ + cru2x(td->td_ucred, &ar->k_ar.ar_subj_cred); + ar->k_ar.ar_subj_ruid = td->td_ucred->cr_ruid; + ar->k_ar.ar_subj_rgid = td->td_ucred->cr_rgid; + ar->k_ar.ar_subj_egid = td->td_ucred->cr_groups[0]; + ar->k_ar.ar_subj_auid = td->td_proc->p_au->ai_auid; + ar->k_ar.ar_subj_asid = td->td_proc->p_au->ai_asid; + ar->k_ar.ar_subj_pid = td->td_proc->p_pid; + ar->k_ar.ar_subj_amask = td->td_proc->p_au->ai_mask; + ar->k_ar.ar_subj_term = td->td_proc->p_au->ai_termid; + bcopy(td->td_proc->p_comm, ar->k_ar.ar_subj_comm, MAXCOMLEN); + + return (0); +} + static void -audit_record_free(struct kaudit_record *ar) +audit_record_dtor(void *mem, int size, void *arg) { + struct kaudit_record *ar; + + KASSERT(sizeof(*ar) == size, ("audit_record_dtor: wrong size")); - if (ar->k_ar.ar_arg_upath1 != NULL) { + ar = mem; + if (ar->k_ar.ar_arg_upath1 != NULL) free(ar->k_ar.ar_arg_upath1, M_AUDITPATH); - } - if (ar->k_ar.ar_arg_upath2 != NULL) { + if (ar->k_ar.ar_arg_upath2 != NULL) free(ar->k_ar.ar_arg_upath2, M_AUDITPATH); - } - if (ar->k_ar.ar_arg_text != NULL) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 6 23:12:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A46016A424; Mon, 6 Feb 2006 23:12:41 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1F06516A420 for ; Mon, 6 Feb 2006 23:12:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B875143D46 for ; Mon, 6 Feb 2006 23:12:40 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k16NCeLZ012346 for ; Mon, 6 Feb 2006 23:12:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k16NCeoE012343 for perforce@freebsd.org; Mon, 6 Feb 2006 23:12:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 6 Feb 2006 23:12:40 GMT Message-Id: <200602062312.k16NCeoE012343@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91294 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 23:12:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=91294 Change 91294 by rwatson@rwatson_zoo on 2006/02/06 23:11:54 Integrate TrustedBSD audit3 branch from TrustedBSD base branch: - Loop back ibcs2 system call table audit identifiers. - Loop back audit pipe support. - Loop back audit UMA allocation for audit records. - kern_eaccess(). Affected files ... .. //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_machdep.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/osf1/osf1_misc.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_machdep.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_misc.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_misc.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files#16 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_misc.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_proto.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_syscall.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_sysent.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_xenix.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/syscalls.master#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_machdep.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_exec.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_exit.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_fork.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_kse.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_kthread.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#25 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#17 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/imgact.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/syscallsubr.h#6 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_machdep.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.36 2005/02/18 18:32:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.37 2006/02/06 22:06:52 jhb Exp $"); #include #include @@ -81,7 +81,6 @@ free(path, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } ==== //depot/projects/trustedbsd/audit3/sys/alpha/osf1/osf1_misc.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.58 2005/09/28 07:03:01 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.59 2006/02/06 22:06:52 jhb Exp $"); #include #include @@ -1246,7 +1246,6 @@ free(path, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } ==== //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_machdep.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.10 2005/06/24 17:41:27 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.11 2006/02/06 22:06:53 jhb Exp $"); #include #include @@ -205,7 +205,6 @@ free(path, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } ==== //depot/projects/trustedbsd/audit3/sys/arm/at91/if_ate.c#2 (text) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.1 2006/02/04 23:32:13 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.2 2006/02/06 22:17:42 cognet Exp $"); #include #include @@ -181,13 +181,13 @@ ate_get_mac(sc, eaddr); + sc->ifp = ifp = if_alloc(IFT_ETHER); if (mii_phy_probe(dev, &sc->miibus, ate_ifmedia_upd, ate_ifmedia_sts)) { device_printf(dev, "Cannot find my PHY.\n"); err = ENXIO; goto out; } - sc->ifp = ifp = if_alloc(IFT_ETHER); ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_mtu = ETHERMTU; @@ -611,6 +611,8 @@ BUS_DMASYNC_PREWRITE); continue; } + mb->m_len = sc->rx_descs[i].status & + ETH_LEN_MASK; /* * For the last buffer, set the wrap bit so * the controller restarts from the first @@ -817,7 +819,7 @@ /* * Enable some parts of the MAC that are needed always (like the * MII bus. This turns off the RE and TE bits, which will remain - * off until atestart() is called to turn them on. With RE and TE + * off until ateinit() is called to turn them on. With RE and TE * turned off, there's no DMA to worry about after this write. */ WR4(sc, ETH_CTL, ETH_CTL_MPE); ==== //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_misc.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.49 2006/01/20 16:22:06 ambrisko Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.50 2006/02/06 22:06:53 jhb Exp $"); #include "opt_compat.h" @@ -324,7 +324,6 @@ uap->argv, uap->envv); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } ==== //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_misc.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.83 2005/10/19 09:33:15 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.84 2006/02/06 22:06:53 jhb Exp $"); #include "opt_mac.h" @@ -175,7 +175,6 @@ free(path, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } @@ -195,7 +194,6 @@ free(path, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } ==== //depot/projects/trustedbsd/audit3/sys/conf/files#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1093 2006/02/03 00:36:19 mjacob Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1095 2006/02/06 22:50:39 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1830,10 +1830,11 @@ posix4/posix4_mib.c standard rpc/rpcclnt.c optional nfsclient security/audit/audit.c optional audit +security/audit/audit_arg.c optional audit +security/audit/audit_pipe.c optional audit security/audit/audit_bsm.c optional audit security/audit/audit_bsm_klib.c optional audit -security/audit/audit_bsm_token.c optional audit -security/audit/audit_arg.c optional audit +security/audit/audit_bsm_token.c optional audit security/audit/audit_pipe.c optional audit security/audit/audit_syscalls.c standard security/audit/audit_trigger.c optional audit ==== //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_misc.c#5 (text+ko) ==== @@ -47,7 +47,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_misc.c,v 1.61 2005/07/07 19:29:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_misc.c,v 1.62 2006/02/06 22:06:53 jhb Exp $"); /* * IBCS2 compatibility module. @@ -207,7 +207,6 @@ free(path, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } @@ -227,7 +226,6 @@ free(path, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } ==== //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_proto.h#6 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ + * $FreeBSD: src/sys/i386/ibcs2/ibcs2_proto.h,v 1.23 2006/02/06 22:15:00 rwatson Exp $ * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.21 2005/07/13 20:32:42 jhb Exp */ ==== //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_syscall.h#6 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ + * $FreeBSD: src/sys/i386/ibcs2/ibcs2_syscall.h,v 1.20 2006/02/06 22:15:00 rwatson Exp $ * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.21 2005/07/13 20:32:42 jhb Exp */ ==== //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_sysent.c#6 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ + * $FreeBSD: src/sys/i386/ibcs2/ibcs2_sysent.c,v 1.25 2006/02/06 22:15:00 rwatson Exp $ * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.21 2005/07/13 20:32:42 jhb Exp */ ==== //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_xenix.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_xenix.c,v 1.35 2005/07/07 19:28:55 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_xenix.c,v 1.36 2006/02/06 22:00:52 jhb Exp $"); #include #include @@ -219,7 +219,7 @@ * XXXRW: This should probably be kern_eaccess()? */ CHECKALTEXIST(td, uap->path, &path); - error = kern_access(td, path, UIO_SYSSPACE, bsd_flags); + error = kern_eaccess(td, path, UIO_SYSSPACE, bsd_flags); free(path, M_TEMP); return (error); } ==== //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/syscalls.master#6 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.21 2005/07/13 20:32:42 jhb Exp $ + $FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.22 2006/02/06 22:14:50 rwatson Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from IBCS2). ==== //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_machdep.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.49 2005/08/01 17:35:48 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.50 2006/02/06 22:06:53 jhb Exp $"); #include #include @@ -122,7 +122,6 @@ free(newpath, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } ==== //depot/projects/trustedbsd/audit3/sys/kern/kern_exec.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.288 2006/02/02 08:39:39 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.289 2006/02/06 22:06:54 jhb Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_ktrace.h" @@ -86,6 +86,7 @@ static int sysctl_kern_stackprot(SYSCTL_HANDLER_ARGS); static int do_execve(struct thread *td, struct image_args *args, struct mac *mac_p); +static void exec_free_args(struct image_args *); /* XXX This should be vm_size_t. */ SYSCTL_PROC(_kern, KERN_PS_STRINGS, ps_strings, CTLTYPE_ULONG|CTLFLAG_RD, @@ -181,12 +182,8 @@ error = exec_copyin_args(&args, uap->fname, UIO_USERSPACE, uap->argv, uap->envv); - if (error == 0) error = kern_execve(td, &args, NULL); - - exec_free_args(&args); - return (error); } @@ -218,12 +215,8 @@ error = exec_copyin_args(&args, uap->fname, UIO_USERSPACE, uap->argv, uap->envv); - if (error == 0) error = kern_execve(td, &args, uap->mac_p); - - exec_free_args(&args); - return (error); #else return (ENOSYS); @@ -779,19 +772,6 @@ p->p_flag &= ~P_INEXEC; PROC_UNLOCK(p); - if (imgp->vmspace_destroyed) { - /* sorry, no more process anymore. exit gracefully */ -#ifdef MAC - mac_execve_exit(imgp); - if (interplabel != NULL) - mac_vnode_label_free(interplabel); -#endif - VFS_UNLOCK_GIANT(vfslocked); - exec_free_args(args); - exit1(td, W_EXITCODE(0, SIGABRT)); - /* NOT REACHED */ - error = 0; - } done2: #ifdef MAC mac_execve_exit(imgp); @@ -799,6 +779,13 @@ mac_vnode_label_free(interplabel); #endif VFS_UNLOCK_GIANT(vfslocked); + exec_free_args(args); + + if (error && imgp->vmspace_destroyed) { + /* sorry, no more process anymore. exit gracefully */ + exit1(td, W_EXITCODE(0, SIGABRT)); + /* NOT REACHED */ + } return (error); } @@ -1039,7 +1026,7 @@ return (0); } -void +static void exec_free_args(struct image_args *args) { ==== //depot/projects/trustedbsd/audit3/sys/kern/kern_exit.c#13 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.280 2006/02/06 00:19:09 wsalamon Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.281 2006/02/06 21:56:13 jhb Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -508,12 +508,6 @@ psignal(p->p_pptr, p->p_sigparent); } PROC_UNLOCK(p->p_pptr); - - /* - * If this is a kthread, then wakeup anyone waiting for it to exit. - */ - if (p->p_flag & P_KTHREAD) - wakeup(p); PROC_UNLOCK(p); /* ==== //depot/projects/trustedbsd/audit3/sys/kern/kern_fork.c#13 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.255 2006/02/06 00:28:50 wsalamon Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.256 2006/02/06 21:54:47 jhb Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -805,14 +805,11 @@ * Check if a kernel thread misbehaved and returned from its main * function. */ - PROC_LOCK(p); if (p->p_flag & P_KTHREAD) { - PROC_UNLOCK(p); printf("Kernel thread \"%s\" (pid %d) exited prematurely.\n", p->p_comm, p->p_pid); kthread_exit(0); } - PROC_UNLOCK(p); mtx_assert(&Giant, MA_NOTOWNED); } ==== //depot/projects/trustedbsd/audit3/sys/kern/kern_kse.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_kse.c,v 1.220 2005/11/03 04:49:16 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_kse.c,v 1.221 2006/02/06 22:06:54 jhb Exp $"); #include #include @@ -266,7 +266,6 @@ args.argv, args.envp); if (error == 0) error = kern_execve(td, &iargs, NULL); - exec_free_args(&iargs); if (error == 0) { PROC_LOCK(p); SIGSETOR(td->td_siglist, args.sigpend); ==== //depot/projects/trustedbsd/audit3/sys/kern/kern_kthread.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_kthread.c,v 1.34 2005/01/06 23:35:39 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_kthread.c,v 1.35 2006/02/06 21:56:13 jhb Exp $"); #include #include @@ -129,11 +129,23 @@ td = curthread; p = td->td_proc; + + /* + * Reparent curthread from proc0 to init so that the zombie + * is harvested. + */ sx_xlock(&proctree_lock); PROC_LOCK(p); proc_reparent(p, initproc); PROC_UNLOCK(p); sx_xunlock(&proctree_lock); + + /* + * Wakeup anyone waiting for us to exit. + */ + wakeup(p); + + /* Buh-bye! */ exit1(td, W_EXITCODE(ecode, 0)); } ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#25 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.404 2006/02/06 10:15:27 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.405 2006/02/06 22:00:52 jhb Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -1940,18 +1940,25 @@ int flags; } */ *uap; { + + return (kern_eaccess(td, uap->path, UIO_USERSPACE, uap->flags)); +} + +int +kern_eaccess(struct thread *td, char *path, enum uio_seg pathseg, int flags) +{ struct nameidata nd; struct vnode *vp; int vfslocked; int error; NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, - UIO_USERSPACE, uap->path, td); + pathseg, path, td); if ((error = namei(&nd)) != 0) return (error); vp = nd.ni_vp; vfslocked = NDHASGIANT(&nd); - error = vn_access(vp, uap->flags, td->td_ucred, td); + error = vn_access(vp, flags, td->td_ucred, td); NDFREE(&nd, NDF_ONLY_PNBUF); vput(vp); VFS_UNLOCK_GIANT(vfslocked); ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#11 (text+ko) ==== @@ -26,6 +26,8 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD: src/sys/security/audit/audit.c,v 1.5 2006/02/06 22:50:39 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#6 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#17 (text+ko) ==== @@ -25,6 +25,8 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD: src/sys/security/audit/audit_private.h,v 1.2 2006/02/06 22:50:39 rwatson Exp $ */ /* ==== //depot/projects/trustedbsd/audit3/sys/sys/imgact.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/imgact.h,v 1.38 2005/02/25 11:49:42 sobomax Exp $ + * $FreeBSD: src/sys/sys/imgact.h,v 1.39 2006/02/06 22:06:54 jhb Exp $ */ #ifndef _SYS_IMGACT_H_ @@ -76,7 +76,6 @@ int exec_shell_imgact(struct image_params *); int exec_copyin_args(struct image_args *, char *, enum uio_seg, char **, char **); -void exec_free_args(struct image_args *); #endif #endif /* !_SYS_IMGACT_H_ */ ==== //depot/projects/trustedbsd/audit3/sys/sys/syscallsubr.h#6 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/syscallsubr.h,v 1.34 2005/10/31 21:09:55 ps Exp $ + * $FreeBSD: src/sys/sys/syscallsubr.h,v 1.35 2006/02/06 22:00:53 jhb Exp $ */ #ifndef _SYS_SYSCALLSUBR_H_ @@ -67,6 +67,8 @@ int kern_clock_settime(struct thread *td, clockid_t clock_id, struct timespec *ats); int kern_connect(struct thread *td, int fd, struct sockaddr *sa); +int kern_eaccess(struct thread *td, char *path, enum uio_seg pathseg, + int flags); int kern_execve(struct thread *td, struct image_args *args, struct mac *mac_p); int kern_fcntl(struct thread *td, int fd, int cmd, intptr_t arg); From owner-p4-projects@FreeBSD.ORG Mon Feb 6 23:14:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCEA916A423; Mon, 6 Feb 2006 23:14:44 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7CA3016A420 for ; Mon, 6 Feb 2006 23:14:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 04EFA43D45 for ; Mon, 6 Feb 2006 23:14:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k16NEh4n012485 for ; Mon, 6 Feb 2006 23:14:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k16NEhil012482 for perforce@freebsd.org; Mon, 6 Feb 2006 23:14:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 6 Feb 2006 23:14:43 GMT Message-Id: <200602062314.k16NEhil012482@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91296 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2006 23:14:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=91296 Change 91296 by rwatson@rwatson_peppercorn on 2006/02/06 23:14:39 Update changelog. Affected files ... .. //depot/projects/trustedbsd/openbsm/CHANGELOG#11 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/CHANGELOG#11 (text+ko) ==== @@ -1,3 +1,8 @@ +OpenBSM 1.0 alpha 4 + +- Remove "audit" user example from audit_user, as it's not present on most + systems. + OpenBSM 1.0 alpha 3 - Man page formatting, cross reference, mlinks, and accuracy improvements. @@ -82,4 +87,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/CHANGELOG#10 $ +$P4: //depot/projects/trustedbsd/openbsm/CHANGELOG#11 $ From owner-p4-projects@FreeBSD.ORG Tue Feb 7 14:46:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9236E16A423; Tue, 7 Feb 2006 14:46:54 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4431A16A420 for ; Tue, 7 Feb 2006 14:46:54 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D57DF43D4C for ; Tue, 7 Feb 2006 14:46:53 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k17Ekrqp081943 for ; Tue, 7 Feb 2006 14:46:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k17Ekrxj081940 for perforce@freebsd.org; Tue, 7 Feb 2006 14:46:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 7 Feb 2006 14:46:53 GMT Message-Id: <200602071446.k17Ekrxj081940@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91309 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Feb 2006 14:46:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=91309 Change 91309 by rwatson@rwatson_zoo on 2006/02/07 14:46:38 Add eaccess. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#7 (text+ko) ==== @@ -551,6 +551,7 @@ case AUE_ACCESS: case AUE_CHDIR: case AUE_CHROOT: + case AUE_EACCESS: case AUE_EXECVE: case AUE_GETATTRLIST: case AUE_NFS_GETFH: From owner-p4-projects@FreeBSD.ORG Tue Feb 7 17:15:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F27716A423; Tue, 7 Feb 2006 17:15:16 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 67CCE16A420 for ; Tue, 7 Feb 2006 17:15:16 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1206643D4C for ; Tue, 7 Feb 2006 17:15:16 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k17HFGsp095269 for ; Tue, 7 Feb 2006 17:15:16 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k17HFFvG095266 for perforce@freebsd.org; Tue, 7 Feb 2006 17:15:15 GMT (envelope-from imp@freebsd.org) Date: Tue, 7 Feb 2006 17:15:15 GMT Message-Id: <200602071715.k17HFFvG095266@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91318 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Feb 2006 17:15:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=91318 Change 91318 by imp@imp_harmony on 2006/02/07 17:14:34 IFC @91316 Affected files ... .. //depot/projects/arm/src/sys/alpha/linux/linux_machdep.c#2 integrate .. //depot/projects/arm/src/sys/alpha/osf1/osf1_misc.c#3 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/arm/src/sys/arm/include/atomic.h#5 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_misc.c#6 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_stats.c#6 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/arm/src/sys/conf/files#17 integrate .. //depot/projects/arm/src/sys/conf/kern.post.mk#7 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#10 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.c#13 integrate .. //depot/projects/arm/src/sys/fs/nullfs/null_vfsops.c#4 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_misc.c#3 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_proto.h#3 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_syscall.h#3 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_sysent.c#3 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_xenix.c#3 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/syscalls.master#3 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_machdep.c#4 integrate .. //depot/projects/arm/src/sys/ia64/ia64/mca.c#2 integrate .. //depot/projects/arm/src/sys/kern/init_main.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_acct.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_exec.c#6 integrate .. //depot/projects/arm/src/sys/kern/kern_exit.c#9 integrate .. //depot/projects/arm/src/sys/kern/kern_fork.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_kse.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_kthread.c#2 integrate .. //depot/projects/arm/src/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/arm/src/sys/kern/sys_process.c#4 integrate .. //depot/projects/arm/src/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/arm/src/sys/kern/vfs_lookup.c#6 integrate .. //depot/projects/arm/src/sys/kern/vfs_mount.c#10 integrate .. //depot/projects/arm/src/sys/kern/vfs_subr.c#10 integrate .. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#9 integrate .. //depot/projects/arm/src/sys/netgraph/ng_eiface.c#5 integrate .. //depot/projects/arm/src/sys/netinet/ip_input.c#10 integrate .. //depot/projects/arm/src/sys/security/audit/audit.c#3 integrate .. //depot/projects/arm/src/sys/security/audit/audit_pipe.c#1 branch .. //depot/projects/arm/src/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/arm/src/sys/sys/imgact.h#3 integrate .. //depot/projects/arm/src/sys/sys/mount.h#7 integrate .. //depot/projects/arm/src/sys/sys/ptrace.h#3 integrate .. //depot/projects/arm/src/sys/sys/syscallsubr.h#4 integrate .. //depot/projects/arm/src/sys/sys/systm.h#8 integrate .. //depot/projects/arm/src/sys/vm/vnode_pager.c#6 integrate Differences ... ==== //depot/projects/arm/src/sys/alpha/linux/linux_machdep.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.36 2005/02/18 18:32:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.37 2006/02/06 22:06:52 jhb Exp $"); #include #include @@ -81,7 +81,6 @@ free(path, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } ==== //depot/projects/arm/src/sys/alpha/osf1/osf1_misc.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.58 2005/09/28 07:03:01 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.59 2006/02/06 22:06:52 jhb Exp $"); #include #include @@ -1246,7 +1246,6 @@ free(path, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } ==== //depot/projects/arm/src/sys/amd64/linux32/linux32_machdep.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.10 2005/06/24 17:41:27 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.11 2006/02/06 22:06:53 jhb Exp $"); #include #include @@ -205,7 +205,6 @@ free(path, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } ==== //depot/projects/arm/src/sys/arm/include/atomic.h#5 (text+ko) ==== @@ -33,7 +33,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/atomic.h,v 1.16 2006/02/05 22:06:12 cognet Exp $ + * $FreeBSD: src/sys/arm/include/atomic.h,v 1.17 2006/02/06 18:29:05 cognet Exp $ */ #ifndef _MACHINE_ATOMIC_H_ @@ -163,7 +163,7 @@ "moveq %1, #1\n" "movne %1, #0\n" : "=r" (ras_start), "=r" (done) - ,"+r" (p), "+r" (cmpval), "+r" (newval)); + ,"+r" (p), "+r" (cmpval), "+r" (newval) : : "memory"); return (done); } @@ -185,7 +185,8 @@ "2:\n" "mov %1, #0\n" "str %1, [%0]\n" - : "=r" (ras_start), "=r" (start), "+r" (p), "+r" (val)); + : "=r" (ras_start), "=r" (start), "+r" (p), "+r" (val) + : : "memory"); } static __inline void @@ -207,7 +208,8 @@ "mov %1, #0\n" "str %1, [%0]\n" - : "=r" (ras_start), "=r" (start), "+r" (p), "+r" (val)); + : "=r" (ras_start), "=r" (start), "+r" (p), "+r" (val) + : : "memory"); } static __inline void @@ -229,7 +231,8 @@ "mov %1, #0\n" "str %1, [%0]\n" - : "=r" (ras_start), "=r" (start), "+r" (address), "+r" (setmask)); + : "=r" (ras_start), "=r" (start), "+r" (address), "+r" (setmask) + : : "memory"); } static __inline void @@ -250,7 +253,8 @@ "2:\n" "mov %1, #0\n" "str %1, [%0]\n" - : "=r" (ras_start), "=r" (start), "+r" (address), "+r" (clearmask)); + : "=r" (ras_start), "=r" (start), "+r" (address), "+r" (clearmask) + : : "memory"); } @@ -272,7 +276,8 @@ "2:\n" "mov %3, #0\n" "str %3, [%0]\n" - : "=r" (ras_start), "=r" (start), "+r" (p), "+r" (v)); + : "=r" (ras_start), "=r" (start), "+r" (p), "+r" (v) + : : "memory"); return (start); } ==== //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_misc.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.49 2006/01/20 16:22:06 ambrisko Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.50 2006/02/06 22:06:53 jhb Exp $"); #include "opt_compat.h" @@ -324,7 +324,6 @@ uap->argv, uap->envv); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } ==== //depot/projects/arm/src/sys/compat/linux/linux_stats.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.74 2006/01/26 21:48:50 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.75 2006/02/06 10:10:42 jeff Exp $"); #include "opt_mac.h" @@ -311,54 +311,6 @@ #endif return (EOPNOTSUPP); - -#ifdef not_that_way - struct l_ustat lu; - struct cdev *dev; - struct vnode *vp; - struct statfs *stat; - int error; - - - /* - * lu.f_fname and lu.f_fpack are not used. They are always zeroed. - * lu.f_tinode and lu.f_tfree are set from the device's super block. - */ - bzero(&lu, sizeof(lu)); - - /* - * XXX - Don't return an error if we can't find a vnode for the - * device. Our struct cdev *is 32-bits whereas Linux only has a 16-bits - * struct cdev *. The struct cdev *that is used now may as well be a truncated - * struct cdev *returned from previous syscalls. Just return a bzeroed - * ustat in that case. - * - * XXX: findcdev() SHALL not be used this way. Somebody (TM) will - * have to find a better way. It may be that we should stick - * a dev_t into struct mount, and walk the mountlist for a - * perfect match and failing that try again looking for a - * minor-truncated match. - */ - dev = findcdev(makedev(args->dev >> 8, args->dev & 0xFF)); - if (dev != NULL && vfinddev(dev, &vp)) { - if (vp->v_mount == NULL) - return (EINVAL); -#ifdef MAC - error = mac_check_mount_stat(td->td_ucred, vp->v_mount); - if (error) - return (error); -#endif - stat = &(vp->v_mount->mnt_stat); - error = VFS_STATFS(vp->v_mount, stat, td); - if (error) - return (error); - - lu.f_tfree = stat->f_bfree; - lu.f_tinode = stat->f_ffree; - } - - return (copyout(&lu, args->ubuf, sizeof(lu))); -#endif } #if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) ==== //depot/projects/arm/src/sys/compat/svr4/svr4_misc.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.83 2005/10/19 09:33:15 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.84 2006/02/06 22:06:53 jhb Exp $"); #include "opt_mac.h" @@ -175,7 +175,6 @@ free(path, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } @@ -195,7 +194,6 @@ free(path, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } ==== //depot/projects/arm/src/sys/conf/files#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1093 2006/02/03 00:36:19 mjacob Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1095 2006/02/06 22:50:39 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1829,13 +1829,14 @@ posix4/p1003_1b.c standard posix4/posix4_mib.c standard rpc/rpcclnt.c optional nfsclient +security/audit/audit.c optional audit security/audit/audit_arg.c optional audit -security/audit/audit_syscalls.c standard -security/audit/audit_trigger.c optional audit -security/audit/audit.c optional audit security/audit/audit_bsm.c optional audit security/audit/audit_bsm_klib.c optional audit security/audit/audit_bsm_token.c optional audit +security/audit/audit_pipe.c optional audit +security/audit/audit_syscalls.c standard +security/audit/audit_trigger.c optional audit security/mac/mac_inet.c optional mac inet security/mac/mac_label.c optional mac security/mac/mac_net.c optional mac ==== //depot/projects/arm/src/sys/conf/kern.post.mk#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.91 2006/01/16 16:25:17 ru Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.92 2006/02/07 13:37:26 ru Exp $ # Part of a unified Makefile for building kernels. This part includes all # the definitions that need to be after all the % directives except %RULES @@ -44,7 +44,7 @@ kernel-all: ${KERNEL_KO} -kernel-cleandir: kernel-clean +kernel-cleandir: kernel-clean kernel-cleandepend kernel-clobber: find . -maxdepth 1 ! -type d ! -name version -delete ==== //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.155 2006/01/25 23:07:42 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.156 2006/02/06 19:17:48 sos Exp $"); #include "opt_ata.h" #include @@ -1897,7 +1897,7 @@ } /* any drive action to take care of ? */ - return 1; + return ata_pci_status(dev); } static int ==== //depot/projects/arm/src/sys/dev/em/if_em.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.105 2006/01/30 13:45:55 glebius Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.106 2006/02/07 13:11:13 glebius Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -1101,6 +1101,7 @@ struct adapter *adapter = context; struct ifnet *ifp; + NET_LOCK_GIANT(); ifp = adapter->ifp; /* @@ -1120,7 +1121,7 @@ } em_enable_intr(adapter); - return; + NET_UNLOCK_GIANT(); } #endif ==== //depot/projects/arm/src/sys/fs/nullfs/null_vfsops.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ * @(#)null_vfsops.c 8.2 (Berkeley) 1/21/94 * * @(#)lofs_vfsops.c 1.2 (Berkeley) 6/18/92 - * $FreeBSD: src/sys/fs/nullfs/null_vfsops.c,v 1.75 2005/12/14 00:49:50 des Exp $ + * $FreeBSD: src/sys/fs/nullfs/null_vfsops.c,v 1.76 2006/02/07 11:31:32 jeff Exp $ */ /* @@ -112,7 +112,7 @@ /* * Find lower node */ - NDINIT(ndp, LOOKUP, FOLLOW|WANTPARENT|LOCKLEAF, + NDINIT(ndp, LOOKUP, FOLLOW|LOCKLEAF, UIO_SYSSPACE, target, td); error = namei(ndp); /* @@ -130,9 +130,6 @@ */ lowerrootvp = ndp->ni_vp; - vrele(ndp->ni_dvp); - ndp->ni_dvp = NULLVP; - /* * Check multi null mount to avoid `lock against myself' panic. */ ==== //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_misc.c#3 (text+ko) ==== @@ -47,7 +47,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_misc.c,v 1.61 2005/07/07 19:29:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_misc.c,v 1.62 2006/02/06 22:06:53 jhb Exp $"); /* * IBCS2 compatibility module. @@ -207,7 +207,6 @@ free(path, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } @@ -227,7 +226,6 @@ free(path, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } ==== //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_proto.h#3 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/ibcs2/ibcs2_proto.h,v 1.22 2005/07/13 20:35:08 jhb Exp $ + * $FreeBSD: src/sys/i386/ibcs2/ibcs2_proto.h,v 1.23 2006/02/06 22:15:00 rwatson Exp $ * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.21 2005/07/13 20:32:42 jhb Exp */ ==== //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_syscall.h#3 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/ibcs2/ibcs2_syscall.h,v 1.19 2005/07/13 20:35:08 jhb Exp $ + * $FreeBSD: src/sys/i386/ibcs2/ibcs2_syscall.h,v 1.20 2006/02/06 22:15:00 rwatson Exp $ * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.21 2005/07/13 20:32:42 jhb Exp */ ==== //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_sysent.c#3 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/ibcs2/ibcs2_sysent.c,v 1.24 2005/07/13 20:35:08 jhb Exp $ + * $FreeBSD: src/sys/i386/ibcs2/ibcs2_sysent.c,v 1.25 2006/02/06 22:15:00 rwatson Exp $ * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.21 2005/07/13 20:32:42 jhb Exp */ @@ -19,68 +19,68 @@ /* The casts are bogus but will do for now. */ struct sysent ibcs2_sysent[] = { { SYF_MPSAFE | 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = syscall */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_NULL }, /* 1 = exit */ - { SYF_MPSAFE | 0, (sy_call_t *)fork, AUE_NULL }, /* 2 = fork */ + { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ + { SYF_MPSAFE | 0, (sy_call_t *)fork, AUE_FORK }, /* 2 = fork */ { AS(ibcs2_read_args), (sy_call_t *)ibcs2_read, AUE_NULL }, /* 3 = ibcs2_read */ { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ - { SYF_MPSAFE | AS(ibcs2_open_args), (sy_call_t *)ibcs2_open, AUE_NULL }, /* 5 = ibcs2_open */ - { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_NULL }, /* 6 = close */ - { SYF_MPSAFE | AS(ibcs2_wait_args), (sy_call_t *)ibcs2_wait, AUE_NULL }, /* 7 = ibcs2_wait */ - { SYF_MPSAFE | AS(ibcs2_creat_args), (sy_call_t *)ibcs2_creat, AUE_NULL }, /* 8 = ibcs2_creat */ - { SYF_MPSAFE | AS(link_args), (sy_call_t *)link, AUE_NULL }, /* 9 = link */ - { SYF_MPSAFE | AS(ibcs2_unlink_args), (sy_call_t *)ibcs2_unlink, AUE_NULL }, /* 10 = ibcs2_unlink */ - { SYF_MPSAFE | AS(ibcs2_execv_args), (sy_call_t *)ibcs2_execv, AUE_NULL }, /* 11 = ibcs2_execv */ - { SYF_MPSAFE | AS(ibcs2_chdir_args), (sy_call_t *)ibcs2_chdir, AUE_NULL }, /* 12 = ibcs2_chdir */ + { SYF_MPSAFE | AS(ibcs2_open_args), (sy_call_t *)ibcs2_open, AUE_OPEN_RWTC }, /* 5 = ibcs2_open */ + { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ + { SYF_MPSAFE | AS(ibcs2_wait_args), (sy_call_t *)ibcs2_wait, AUE_WAIT4 }, /* 7 = ibcs2_wait */ + { SYF_MPSAFE | AS(ibcs2_creat_args), (sy_call_t *)ibcs2_creat, AUE_CREAT }, /* 8 = ibcs2_creat */ + { SYF_MPSAFE | AS(link_args), (sy_call_t *)link, AUE_LINK }, /* 9 = link */ + { SYF_MPSAFE | AS(ibcs2_unlink_args), (sy_call_t *)ibcs2_unlink, AUE_UNLINK }, /* 10 = ibcs2_unlink */ + { SYF_MPSAFE | AS(ibcs2_execv_args), (sy_call_t *)ibcs2_execv, AUE_EXECVE }, /* 11 = ibcs2_execv */ + { SYF_MPSAFE | AS(ibcs2_chdir_args), (sy_call_t *)ibcs2_chdir, AUE_CHDIR }, /* 12 = ibcs2_chdir */ { SYF_MPSAFE | AS(ibcs2_time_args), (sy_call_t *)ibcs2_time, AUE_NULL }, /* 13 = ibcs2_time */ - { SYF_MPSAFE | AS(ibcs2_mknod_args), (sy_call_t *)ibcs2_mknod, AUE_NULL }, /* 14 = ibcs2_mknod */ - { SYF_MPSAFE | AS(ibcs2_chmod_args), (sy_call_t *)ibcs2_chmod, AUE_NULL }, /* 15 = ibcs2_chmod */ - { SYF_MPSAFE | AS(ibcs2_chown_args), (sy_call_t *)ibcs2_chown, AUE_NULL }, /* 16 = ibcs2_chown */ + { SYF_MPSAFE | AS(ibcs2_mknod_args), (sy_call_t *)ibcs2_mknod, AUE_MKNOD }, /* 14 = ibcs2_mknod */ + { SYF_MPSAFE | AS(ibcs2_chmod_args), (sy_call_t *)ibcs2_chmod, AUE_CHMOD }, /* 15 = ibcs2_chmod */ + { SYF_MPSAFE | AS(ibcs2_chown_args), (sy_call_t *)ibcs2_chown, AUE_CHOWN }, /* 16 = ibcs2_chown */ { SYF_MPSAFE | AS(obreak_args), (sy_call_t *)obreak, AUE_NULL }, /* 17 = obreak */ - { SYF_MPSAFE | AS(ibcs2_stat_args), (sy_call_t *)ibcs2_stat, AUE_NULL }, /* 18 = ibcs2_stat */ - { SYF_MPSAFE | AS(ibcs2_lseek_args), (sy_call_t *)ibcs2_lseek, AUE_NULL }, /* 19 = ibcs2_lseek */ + { SYF_MPSAFE | AS(ibcs2_stat_args), (sy_call_t *)ibcs2_stat, AUE_STAT }, /* 18 = ibcs2_stat */ + { SYF_MPSAFE | AS(ibcs2_lseek_args), (sy_call_t *)ibcs2_lseek, AUE_LSEEK }, /* 19 = ibcs2_lseek */ { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_NULL }, /* 20 = getpid */ - { AS(ibcs2_mount_args), (sy_call_t *)ibcs2_mount, AUE_NULL }, /* 21 = ibcs2_mount */ - { AS(ibcs2_umount_args), (sy_call_t *)ibcs2_umount, AUE_NULL }, /* 22 = ibcs2_umount */ - { SYF_MPSAFE | AS(ibcs2_setuid_args), (sy_call_t *)ibcs2_setuid, AUE_NULL }, /* 23 = ibcs2_setuid */ - { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_NULL }, /* 24 = getuid */ - { SYF_MPSAFE | AS(ibcs2_stime_args), (sy_call_t *)ibcs2_stime, AUE_NULL }, /* 25 = ibcs2_stime */ - { SYF_MPSAFE | AS(ptrace_args), (sy_call_t *)ptrace, AUE_NULL }, /* 26 = ptrace */ + { AS(ibcs2_mount_args), (sy_call_t *)ibcs2_mount, AUE_MOUNT }, /* 21 = ibcs2_mount */ + { AS(ibcs2_umount_args), (sy_call_t *)ibcs2_umount, AUE_UMOUNT }, /* 22 = ibcs2_umount */ + { SYF_MPSAFE | AS(ibcs2_setuid_args), (sy_call_t *)ibcs2_setuid, AUE_SETUID }, /* 23 = ibcs2_setuid */ + { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_GETUID }, /* 24 = getuid */ + { SYF_MPSAFE | AS(ibcs2_stime_args), (sy_call_t *)ibcs2_stime, AUE_SETTIMEOFDAY }, /* 25 = ibcs2_stime */ + { SYF_MPSAFE | AS(ptrace_args), (sy_call_t *)ptrace, AUE_PTRACE }, /* 26 = ptrace */ { SYF_MPSAFE | AS(ibcs2_alarm_args), (sy_call_t *)ibcs2_alarm, AUE_NULL }, /* 27 = ibcs2_alarm */ - { SYF_MPSAFE | AS(ibcs2_fstat_args), (sy_call_t *)ibcs2_fstat, AUE_NULL }, /* 28 = ibcs2_fstat */ + { SYF_MPSAFE | AS(ibcs2_fstat_args), (sy_call_t *)ibcs2_fstat, AUE_FSTAT }, /* 28 = ibcs2_fstat */ { SYF_MPSAFE | 0, (sy_call_t *)ibcs2_pause, AUE_NULL }, /* 29 = ibcs2_pause */ { SYF_MPSAFE | AS(ibcs2_utime_args), (sy_call_t *)ibcs2_utime, AUE_NULL }, /* 30 = ibcs2_utime */ { SYF_MPSAFE | AS(ibcs2_stty_args), (sy_call_t *)ibcs2_stty, AUE_NULL }, /* 31 = ibcs2_stty */ { SYF_MPSAFE | AS(ibcs2_gtty_args), (sy_call_t *)ibcs2_gtty, AUE_NULL }, /* 32 = ibcs2_gtty */ - { SYF_MPSAFE | AS(ibcs2_access_args), (sy_call_t *)ibcs2_access, AUE_NULL }, /* 33 = ibcs2_access */ - { SYF_MPSAFE | AS(ibcs2_nice_args), (sy_call_t *)ibcs2_nice, AUE_NULL }, /* 34 = ibcs2_nice */ - { SYF_MPSAFE | AS(ibcs2_statfs_args), (sy_call_t *)ibcs2_statfs, AUE_NULL }, /* 35 = ibcs2_statfs */ + { SYF_MPSAFE | AS(ibcs2_access_args), (sy_call_t *)ibcs2_access, AUE_ACCESS }, /* 33 = ibcs2_access */ + { SYF_MPSAFE | AS(ibcs2_nice_args), (sy_call_t *)ibcs2_nice, AUE_NICE }, /* 34 = ibcs2_nice */ + { SYF_MPSAFE | AS(ibcs2_statfs_args), (sy_call_t *)ibcs2_statfs, AUE_STATFS }, /* 35 = ibcs2_statfs */ { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_NULL }, /* 36 = sync */ - { SYF_MPSAFE | AS(ibcs2_kill_args), (sy_call_t *)ibcs2_kill, AUE_NULL }, /* 37 = ibcs2_kill */ - { SYF_MPSAFE | AS(ibcs2_fstatfs_args), (sy_call_t *)ibcs2_fstatfs, AUE_NULL }, /* 38 = ibcs2_fstatfs */ + { SYF_MPSAFE | AS(ibcs2_kill_args), (sy_call_t *)ibcs2_kill, AUE_KILL }, /* 37 = ibcs2_kill */ + { SYF_MPSAFE | AS(ibcs2_fstatfs_args), (sy_call_t *)ibcs2_fstatfs, AUE_FSTATFS }, /* 38 = ibcs2_fstatfs */ { SYF_MPSAFE | AS(ibcs2_pgrpsys_args), (sy_call_t *)ibcs2_pgrpsys, AUE_NULL }, /* 39 = ibcs2_pgrpsys */ { SYF_MPSAFE | AS(ibcs2_xenix_args), (sy_call_t *)ibcs2_xenix, AUE_NULL }, /* 40 = ibcs2_xenix */ { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_NULL }, /* 41 = dup */ - { SYF_MPSAFE | 0, (sy_call_t *)pipe, AUE_NULL }, /* 42 = pipe */ + { SYF_MPSAFE | 0, (sy_call_t *)pipe, AUE_PIPE }, /* 42 = pipe */ { SYF_MPSAFE | AS(ibcs2_times_args), (sy_call_t *)ibcs2_times, AUE_NULL }, /* 43 = ibcs2_times */ - { SYF_MPSAFE | AS(profil_args), (sy_call_t *)profil, AUE_NULL }, /* 44 = profil */ + { SYF_MPSAFE | AS(profil_args), (sy_call_t *)profil, AUE_PROFILE }, /* 44 = profil */ { SYF_MPSAFE | AS(ibcs2_plock_args), (sy_call_t *)ibcs2_plock, AUE_NULL }, /* 45 = ibcs2_plock */ - { SYF_MPSAFE | AS(ibcs2_setgid_args), (sy_call_t *)ibcs2_setgid, AUE_NULL }, /* 46 = ibcs2_setgid */ - { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_NULL }, /* 47 = getgid */ + { SYF_MPSAFE | AS(ibcs2_setgid_args), (sy_call_t *)ibcs2_setgid, AUE_SETGID }, /* 46 = ibcs2_setgid */ + { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_GETGID }, /* 47 = getgid */ { SYF_MPSAFE | AS(ibcs2_sigsys_args), (sy_call_t *)ibcs2_sigsys, AUE_NULL }, /* 48 = ibcs2_sigsys */ - { AS(ibcs2_msgsys_args), (sy_call_t *)ibcs2_msgsys, AUE_NULL }, /* 49 = ibcs2_msgsys */ + { AS(ibcs2_msgsys_args), (sy_call_t *)ibcs2_msgsys, AUE_MSGSYS }, /* 49 = ibcs2_msgsys */ { SYF_MPSAFE | AS(ibcs2_sysi86_args), (sy_call_t *)ibcs2_sysi86, AUE_NULL }, /* 50 = ibcs2_sysi86 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 51 = ibcs2_acct */ - { AS(ibcs2_shmsys_args), (sy_call_t *)ibcs2_shmsys, AUE_NULL }, /* 52 = ibcs2_shmsys */ - { AS(ibcs2_semsys_args), (sy_call_t *)ibcs2_semsys, AUE_NULL }, /* 53 = ibcs2_semsys */ - { AS(ibcs2_ioctl_args), (sy_call_t *)ibcs2_ioctl, AUE_NULL }, /* 54 = ibcs2_ioctl */ + { AS(ibcs2_shmsys_args), (sy_call_t *)ibcs2_shmsys, AUE_SHMSYS }, /* 52 = ibcs2_shmsys */ + { AS(ibcs2_semsys_args), (sy_call_t *)ibcs2_semsys, AUE_SEMSYS }, /* 53 = ibcs2_semsys */ + { AS(ibcs2_ioctl_args), (sy_call_t *)ibcs2_ioctl, AUE_IOCTL }, /* 54 = ibcs2_ioctl */ { SYF_MPSAFE | AS(ibcs2_uadmin_args), (sy_call_t *)ibcs2_uadmin, AUE_NULL }, /* 55 = ibcs2_uadmin */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = nosys */ { SYF_MPSAFE | AS(ibcs2_utssys_args), (sy_call_t *)ibcs2_utssys, AUE_NULL }, /* 57 = ibcs2_utssys */ - { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_NULL }, /* 58 = fsync */ - { SYF_MPSAFE | AS(ibcs2_execve_args), (sy_call_t *)ibcs2_execve, AUE_NULL }, /* 59 = ibcs2_execve */ - { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_NULL }, /* 60 = umask */ - { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_NULL }, /* 61 = chroot */ - { SYF_MPSAFE | AS(ibcs2_fcntl_args), (sy_call_t *)ibcs2_fcntl, AUE_NULL }, /* 62 = ibcs2_fcntl */ + { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 58 = fsync */ + { SYF_MPSAFE | AS(ibcs2_execve_args), (sy_call_t *)ibcs2_execve, AUE_EXECVE }, /* 59 = ibcs2_execve */ + { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ + { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ + { SYF_MPSAFE | AS(ibcs2_fcntl_args), (sy_call_t *)ibcs2_fcntl, AUE_FCNTL }, /* 62 = ibcs2_fcntl */ { SYF_MPSAFE | AS(ibcs2_ulimit_args), (sy_call_t *)ibcs2_ulimit, AUE_NULL }, /* 63 = ibcs2_ulimit */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 64 = reserved for unix/pc */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 65 = reserved for unix/pc */ @@ -97,20 +97,20 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 76 = obsolete rfs_rdebug */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 77 = obsolete rfs_rfstop */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 78 = rfs_rfsys */ - { SYF_MPSAFE | AS(ibcs2_rmdir_args), (sy_call_t *)ibcs2_rmdir, AUE_NULL }, /* 79 = ibcs2_rmdir */ - { SYF_MPSAFE | AS(ibcs2_mkdir_args), (sy_call_t *)ibcs2_mkdir, AUE_NULL }, /* 80 = ibcs2_mkdir */ - { AS(ibcs2_getdents_args), (sy_call_t *)ibcs2_getdents, AUE_NULL }, /* 81 = ibcs2_getdents */ + { SYF_MPSAFE | AS(ibcs2_rmdir_args), (sy_call_t *)ibcs2_rmdir, AUE_RMDIR }, /* 79 = ibcs2_rmdir */ + { SYF_MPSAFE | AS(ibcs2_mkdir_args), (sy_call_t *)ibcs2_mkdir, AUE_MKDIR }, /* 80 = ibcs2_mkdir */ + { AS(ibcs2_getdents_args), (sy_call_t *)ibcs2_getdents, AUE_GETDIRENTRIES }, /* 81 = ibcs2_getdents */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 82 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 83 = nosys */ { SYF_MPSAFE | AS(ibcs2_sysfs_args), (sy_call_t *)ibcs2_sysfs, AUE_NULL }, /* 84 = ibcs2_sysfs */ - { SYF_MPSAFE | AS(ibcs2_getmsg_args), (sy_call_t *)ibcs2_getmsg, AUE_NULL }, /* 85 = ibcs2_getmsg */ - { SYF_MPSAFE | AS(ibcs2_putmsg_args), (sy_call_t *)ibcs2_putmsg, AUE_NULL }, /* 86 = ibcs2_putmsg */ - { AS(ibcs2_poll_args), (sy_call_t *)ibcs2_poll, AUE_NULL }, /* 87 = ibcs2_poll */ + { SYF_MPSAFE | AS(ibcs2_getmsg_args), (sy_call_t *)ibcs2_getmsg, AUE_GETMSG }, /* 85 = ibcs2_getmsg */ + { SYF_MPSAFE | AS(ibcs2_putmsg_args), (sy_call_t *)ibcs2_putmsg, AUE_PUTMSG }, /* 86 = ibcs2_putmsg */ + { AS(ibcs2_poll_args), (sy_call_t *)ibcs2_poll, AUE_POLL }, /* 87 = ibcs2_poll */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 88 = nosys */ { SYF_MPSAFE | AS(ibcs2_secure_args), (sy_call_t *)ibcs2_secure, AUE_NULL }, /* 89 = ibcs2_secure */ - { SYF_MPSAFE | AS(ibcs2_symlink_args), (sy_call_t *)ibcs2_symlink, AUE_NULL }, /* 90 = ibcs2_symlink */ - { SYF_MPSAFE | AS(ibcs2_lstat_args), (sy_call_t *)ibcs2_lstat, AUE_NULL }, /* 91 = ibcs2_lstat */ - { SYF_MPSAFE | AS(ibcs2_readlink_args), (sy_call_t *)ibcs2_readlink, AUE_NULL }, /* 92 = ibcs2_readlink */ + { SYF_MPSAFE | AS(ibcs2_symlink_args), (sy_call_t *)ibcs2_symlink, AUE_SYMLINK }, /* 90 = ibcs2_symlink */ + { SYF_MPSAFE | AS(ibcs2_lstat_args), (sy_call_t *)ibcs2_lstat, AUE_LSTAT }, /* 91 = ibcs2_lstat */ + { SYF_MPSAFE | AS(ibcs2_readlink_args), (sy_call_t *)ibcs2_readlink, AUE_READLINK }, /* 92 = ibcs2_readlink */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 93 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 94 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 95 = nosys */ ==== //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_xenix.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_xenix.c,v 1.35 2005/07/07 19:28:55 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_xenix.c,v 1.36 2006/02/06 22:00:52 jhb Exp $"); #include #include @@ -216,7 +216,7 @@ bsd_flags |= X_OK; CHECKALTEXIST(td, uap->path, &path); - error = kern_access(td, path, UIO_SYSSPACE, bsd_flags); + error = kern_eaccess(td, path, UIO_SYSSPACE, bsd_flags); free(path, M_TEMP); return (error); } ==== //depot/projects/arm/src/sys/i386/ibcs2/syscalls.master#3 (text+ko) ==== @@ -1,10 +1,10 @@ - $FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.21 2005/07/13 20:32:42 jhb Exp $ + $FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.22 2006/02/06 22:14:50 rwatson Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from IBCS2). ; Processed to created ibcs2_sysent.c, ibcs2_syscalls.c and ibcs2_syscall.h. -; Columns: number type nargs name alt{name,tag,rtyp}/comments +; Columns: number audit type nargs name alt{name,tag,rtyp}/comments ; number system call number, must be in order ; audit the audit event associated with the system call ; A value of AUE_NULL means no auditing, but it also means that @@ -36,45 +36,45 @@ ; #ifdef's, etc. may be included, and are copied to the output files. 0 AUE_NULL MNOPROTO { int nosys(void); } syscall nosys_args int -1 AUE_NULL MNOPROTO { void sys_exit(int rval); } exit \ +1 AUE_EXIT MNOPROTO { void sys_exit(int rval); } exit \ sys_exit_args void -2 AUE_NULL MNOPROTO { int fork(void); } +2 AUE_FORK MNOPROTO { int fork(void); } 3 AUE_NULL STD { int ibcs2_read(int fd, char *buf, \ u_int nbytes); } 4 AUE_NULL MNOPROTO { int write(int fd, char *buf, \ u_int nbytes); } -5 AUE_NULL MSTD { int ibcs2_open(char *path, int flags, \ +5 AUE_OPEN_RWTC MSTD { int ibcs2_open(char *path, int flags, \ int mode); } -6 AUE_NULL MNOPROTO { int close(int fd); } -7 AUE_NULL MSTD { int ibcs2_wait(int a1, int a2, int a3); } -8 AUE_NULL MSTD { int ibcs2_creat(char *path, int mode); } -9 AUE_NULL MNOPROTO { int link(char *path, char *link); } -10 AUE_NULL MSTD { int ibcs2_unlink(char *path); } -11 AUE_NULL MSTD { int ibcs2_execv(char *path, char **argp); } -12 AUE_NULL MSTD { int ibcs2_chdir(char *path); } +6 AUE_CLOSE MNOPROTO { int close(int fd); } +7 AUE_WAIT4 MSTD { int ibcs2_wait(int a1, int a2, int a3); } +8 AUE_CREAT MSTD { int ibcs2_creat(char *path, int mode); } +9 AUE_LINK MNOPROTO { int link(char *path, char *link); } +10 AUE_UNLINK MSTD { int ibcs2_unlink(char *path); } +11 AUE_EXECVE MSTD { int ibcs2_execv(char *path, char **argp); } +12 AUE_CHDIR MSTD { int ibcs2_chdir(char *path); } 13 AUE_NULL MSTD { int ibcs2_time(ibcs2_time_t *tp); } -14 AUE_NULL MSTD { int ibcs2_mknod(char* path, int mode, \ +14 AUE_MKNOD MSTD { int ibcs2_mknod(char* path, int mode, \ int dev); } -15 AUE_NULL MSTD { int ibcs2_chmod(char *path, int mode); } -16 AUE_NULL MSTD { int ibcs2_chown(char *path, int uid, \ +15 AUE_CHMOD MSTD { int ibcs2_chmod(char *path, int mode); } +16 AUE_CHOWN MSTD { int ibcs2_chown(char *path, int uid, \ int gid); } 17 AUE_NULL MNOPROTO { int obreak(caddr_t nsize); } -18 AUE_NULL MSTD { int ibcs2_stat(char* path, \ +18 AUE_STAT MSTD { int ibcs2_stat(char* path, \ struct ibcs2_stat *st); } -19 AUE_NULL MSTD { long ibcs2_lseek(int fd, long offset, \ +19 AUE_LSEEK MSTD { long ibcs2_lseek(int fd, long offset, \ int whence); } 20 AUE_NULL MNOPROTO { pid_t getpid(void); } -21 AUE_NULL STD { int ibcs2_mount(char *special, char *dir, \ +21 AUE_MOUNT STD { int ibcs2_mount(char *special, char *dir, \ int flags, int fstype, char *data, \ int len); } -22 AUE_NULL STD { int ibcs2_umount(char *name); } -23 AUE_NULL MSTD { int ibcs2_setuid(int uid); } -24 AUE_NULL MNOPROTO { uid_t getuid(void); } -25 AUE_NULL MSTD { int ibcs2_stime(long *timep); } -26 AUE_NULL MNOPROTO { int ptrace(int req, pid_t pid, \ +22 AUE_UMOUNT STD { int ibcs2_umount(char *name); } +23 AUE_SETUID MSTD { int ibcs2_setuid(int uid); } +24 AUE_GETUID MNOPROTO { uid_t getuid(void); } +25 AUE_SETTIMEOFDAY MSTD { int ibcs2_stime(long *timep); } +26 AUE_PTRACE MNOPROTO { int ptrace(int req, pid_t pid, \ caddr_t addr, int data); } 27 AUE_NULL MSTD { int ibcs2_alarm(unsigned sec); } -28 AUE_NULL MSTD { int ibcs2_fstat(int fd, \ +28 AUE_FSTAT MSTD { int ibcs2_fstat(int fd, \ struct ibcs2_stat *st); } 29 AUE_NULL MSTD { int ibcs2_pause(void); } 30 AUE_NULL MSTD { int ibcs2_utime(char *path, \ @@ -83,14 +83,14 @@ struct sgttyb *buf); } 32 AUE_NULL MSTD { int ibcs2_gtty(int fd, \ struct sgttyb *buf); } -33 AUE_NULL MSTD { int ibcs2_access(char *path, int flags); } -34 AUE_NULL MSTD { int ibcs2_nice(int incr); } -35 AUE_NULL MSTD { int ibcs2_statfs(char *path, \ +33 AUE_ACCESS MSTD { int ibcs2_access(char *path, int flags); } +34 AUE_NICE MSTD { int ibcs2_nice(int incr); } +35 AUE_STATFS MSTD { int ibcs2_statfs(char *path, \ struct ibcs2_statfs *buf, int len, \ int fstype); } 36 AUE_NULL MNOPROTO { int sync(void); } -37 AUE_NULL MSTD { int ibcs2_kill(int pid, int signo); } -38 AUE_NULL MSTD { int ibcs2_fstatfs(int fd, \ +37 AUE_KILL MSTD { int ibcs2_kill(int pid, int signo); } +38 AUE_FSTATFS MSTD { int ibcs2_fstatfs(int fd, \ struct ibcs2_statfs *buf, int len, \ int fstype); } 39 AUE_NULL MSTD { int ibcs2_pgrpsys(int type, caddr_t dummy, \ @@ -98,35 +98,35 @@ 40 AUE_NULL MSTD { int ibcs2_xenix(int a1, int a2, int a3, \ int a4, int a5); } 41 AUE_NULL MNOPROTO { int dup(u_int fd); } -42 AUE_NULL MNOPROTO { int pipe(void); } +42 AUE_PIPE MNOPROTO { int pipe(void); } 43 AUE_NULL MSTD { int ibcs2_times(struct tms *tp); } -44 AUE_NULL MNOPROTO { int profil(caddr_t samples, u_int size, \ +44 AUE_PROFILE MNOPROTO { int profil(caddr_t samples, u_int size, \ u_int offset, u_int scale); } 45 AUE_NULL MSTD { int ibcs2_plock(int cmd); } -46 AUE_NULL MSTD { int ibcs2_setgid(int gid); } -47 AUE_NULL MNOPROTO { gid_t getgid(void); } +46 AUE_SETGID MSTD { int ibcs2_setgid(int gid); } +47 AUE_GETGID MNOPROTO { gid_t getgid(void); } 48 AUE_NULL MSTD { int ibcs2_sigsys(int sig, ibcs2_sig_t fp); } -49 AUE_NULL STD { int ibcs2_msgsys(int which, int a2, \ +49 AUE_MSGSYS STD { int ibcs2_msgsys(int which, int a2, \ int a3, int a4, int a5, int a6); } 50 AUE_NULL MSTD { int ibcs2_sysi86(int cmd, int *arg); } 51 AUE_NULL UNIMPL ibcs2_acct -52 AUE_NULL STD { int ibcs2_shmsys(int which, int a2, \ +52 AUE_SHMSYS STD { int ibcs2_shmsys(int which, int a2, \ int a3, int a4); } -53 AUE_NULL STD { int ibcs2_semsys(int which, int a2, \ +53 AUE_SEMSYS STD { int ibcs2_semsys(int which, int a2, \ int a3, int a4, int a5); } -54 AUE_NULL STD { int ibcs2_ioctl(int fd, int cmd, \ +54 AUE_IOCTL STD { int ibcs2_ioctl(int fd, int cmd, \ caddr_t data); } 55 AUE_NULL MSTD { int ibcs2_uadmin(int cmd, int func, \ caddr_t data); } 56 AUE_NULL UNIMPL nosys 57 AUE_NULL MSTD { int ibcs2_utssys(int a1, int a2, \ int flag); } -58 AUE_NULL MNOPROTO { int fsync(int fd); } -59 AUE_NULL MSTD { int ibcs2_execve(char *path, char **argp, \ +58 AUE_FSYNC MNOPROTO { int fsync(int fd); } +59 AUE_EXECVE MSTD { int ibcs2_execve(char *path, char **argp, \ char **envp); } -60 AUE_NULL MNOPROTO { int umask(int newmask); } -61 AUE_NULL MNOPROTO { int chroot(char *path); } -62 AUE_NULL MSTD { int ibcs2_fcntl(int fd, int cmd, \ +60 AUE_UMASK MNOPROTO { int umask(int newmask); } +61 AUE_CHROOT MNOPROTO { int chroot(char *path); } +62 AUE_FCNTL MSTD { int ibcs2_fcntl(int fd, int cmd, \ char *arg); } 63 AUE_NULL MSTD { long ibcs2_ulimit(int cmd, int newlimit); } 64 AUE_NULL UNIMPL reserved for unix/pc @@ -144,30 +144,30 @@ 76 AUE_NULL OBSOL rfs_rdebug 77 AUE_NULL OBSOL rfs_rfstop 78 AUE_NULL UNIMPL rfs_rfsys -79 AUE_NULL MSTD { int ibcs2_rmdir(char *path); } -80 AUE_NULL MSTD { int ibcs2_mkdir(char *path, int mode); } -81 AUE_NULL STD { int ibcs2_getdents(int fd, char *buf, \ +79 AUE_RMDIR MSTD { int ibcs2_rmdir(char *path); } +80 AUE_MKDIR MSTD { int ibcs2_mkdir(char *path, int mode); } +81 AUE_GETDIRENTRIES STD { int ibcs2_getdents(int fd, char *buf, \ int nbytes); } 82 AUE_NULL UNIMPL nosys 83 AUE_NULL UNIMPL nosys 84 AUE_NULL MSTD { int ibcs2_sysfs(int cmd, caddr_t d1, \ char *buf); } -85 AUE_NULL MSTD { int ibcs2_getmsg(int fd, \ +85 AUE_GETMSG MSTD { int ibcs2_getmsg(int fd, \ struct ibcs2_stropts *ctl, \ struct ibcs2_stropts *dat, int *flags); } -86 AUE_NULL MSTD { int ibcs2_putmsg(int fd, \ +86 AUE_PUTMSG MSTD { int ibcs2_putmsg(int fd, \ struct ibcs2_stropts *ctl, \ struct ibcs2_stropts *dat, int flags); } -87 AUE_NULL STD { int ibcs2_poll(struct ibcs2_poll *fds, \ +87 AUE_POLL STD { int ibcs2_poll(struct ibcs2_poll *fds, \ long nfds, int timeout); } 88 AUE_NULL UNIMPL nosys 89 AUE_NULL MSTD { int ibcs2_secure(int cmd, int a1, int a2, \ int a3, int a4, int a5); } -90 AUE_NULL MSTD { int ibcs2_symlink(char *path, \ +90 AUE_SYMLINK MSTD { int ibcs2_symlink(char *path, \ char *link); } -91 AUE_NULL MSTD { int ibcs2_lstat(char *path, \ +91 AUE_LSTAT MSTD { int ibcs2_lstat(char *path, \ struct ibcs2_stat *st); } -92 AUE_NULL MSTD { int ibcs2_readlink(char *path, char *buf, \ +92 AUE_READLINK MSTD { int ibcs2_readlink(char *path, char *buf, \ int count); } 93 AUE_NULL UNIMPL nosys 94 AUE_NULL UNIMPL nosys ==== //depot/projects/arm/src/sys/i386/linux/linux_machdep.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.49 2005/08/01 17:35:48 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.50 2006/02/06 22:06:53 jhb Exp $"); #include #include @@ -122,7 +122,6 @@ free(newpath, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } ==== //depot/projects/arm/src/sys/ia64/ia64/mca.c#2 (text+ko) ==== @@ -23,7 +23,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/sys/ia64/ia64/mca.c,v 1.10 2005/02/09 04:48:23 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/mca.c,v 1.11 2006/02/07 02:02:14 marcel Exp $ */ #include @@ -109,7 +109,7 @@ mtx_unlock_spin(&mca_info_block_lock); totsz = sizeof(struct sysctl_oid) + recsz + 32; - oidp = malloc(totsz, M_MCA, M_WAITOK|M_ZERO); + oidp = malloc(totsz, M_MCA, M_NOWAIT|M_ZERO); state = (char*)(oidp + 1); name = state + recsz; sprintf(name, "%lld", (long long)seqnr); ==== //depot/projects/arm/src/sys/kern/init_main.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/init_main.c,v 1.260 2006/02/02 01:16:31 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/init_main.c,v 1.261 2006/02/06 16:03:10 cognet Exp $"); #include "opt_init_path.h" #include "opt_mac.h" @@ -90,7 +90,7 @@ static struct session session0; static struct pgrp pgrp0; struct proc proc0; -struct thread thread0; +struct thread thread0 __aligned(8); struct ksegrp ksegrp0; struct vmspace vmspace0; struct proc *initproc; ==== //depot/projects/arm/src/sys/kern/kern_acct.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.78 2006/02/03 16:37:55 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.79 2006/02/07 16:04:03 jhb Exp $"); #include "opt_mac.h" @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -58,6 +59,7 @@ #include #include #include +#include #include #include #include @@ -83,12 +85,9 @@ * was provided by UCB with the 4.4BSD-Lite release */ static comp_t encode_comp_t(u_long, u_long); -static void acctwatch(void *); - -/* - * Accounting callout used for periodic scheduling of acctwatch. - */ -static struct callout acctwatch_callout; +static void acctwatch(void); +static void acct_thread(void *); +static int acct_disable(struct thread *); /* * Accounting vnode pointer, saved vnode pointer, and flags for each. @@ -104,6 +103,14 @@ SX_SYSINIT(acct, &acct_sx, "acct_sx"); /* + * State of the accounting kthread. + */ +static int acct_state; + +#define ACCT_RUNNING 1 /* Accounting kthread is running. */ +#define ACCT_EXITREQ 2 /* Accounting kthread should exit. */ + +/* * Values associated with enabling and disabling accounting */ static int acctsuspend = 2; /* stop accounting when < 2% free space left */ @@ -188,16 +195,13 @@ * enabled. */ acct_suspended = 0; - if (acct_vp != NULL) { - callout_stop(&acctwatch_callout); - error = vn_close(acct_vp, acct_flags, acct_cred, td); - crfree(acct_cred); - acct_vp = NULL; - acct_cred = NULL; - acct_flags = 0; - log(LOG_NOTICE, "Accounting disabled\n"); - } + if (acct_vp != NULL) + error = acct_disable(td); if (uap->path == NULL) { + if (acct_state & ACCT_RUNNING) { + acct_state |= ACCT_EXITREQ; + wakeup(&acct_state); + } sx_xunlock(&acct_sx); goto done; } @@ -209,16 +213,54 @@ acct_vp = nd.ni_vp; acct_cred = crhold(td->td_ucred); acct_flags = flags; - callout_init(&acctwatch_callout, CALLOUT_MPSAFE); + if (acct_state & ACCT_RUNNING) + acct_state &= ~ACCT_EXITREQ; + else { + /* + * Try to start up an accounting kthread. We may start more + * than one, but if so the extras will commit suicide as + * soon as they start up. + */ + error = kthread_create(acct_thread, NULL, NULL, 0, 0, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Feb 7 17:59:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7545816A423; Tue, 7 Feb 2006 17:59:13 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1942B16A420 for ; Tue, 7 Feb 2006 17:59:13 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC60443D48 for ; Tue, 7 Feb 2006 17:59:12 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k17HxCqv097375 for ; Tue, 7 Feb 2006 17:59:12 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k17HxC8M097372 for perforce@freebsd.org; Tue, 7 Feb 2006 17:59:12 GMT (envelope-from imp@freebsd.org) Date: Tue, 7 Feb 2006 17:59:12 GMT Message-Id: <200602071759.k17HxC8M097372@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91323 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Feb 2006 17:59:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=91323 Change 91323 by imp@imp_Speedy on 2006/02/07 17:59:08 Allow subsetting of phy devices. Saves 56k in the uncompressed kernel. Affected files ... .. //depot/projects/arm/src/sys/arm/conf/KB920X#14 edit .. //depot/projects/arm/src/sys/conf/files#18 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/KB920X#14 (text+ko) ==== @@ -69,7 +69,8 @@ device nexus device uart device ate -device miibus +device mii +device lxtphy # Debugging for use in -current #options INVARIANTS #Enable calls of extra sanity checking ==== //depot/projects/arm/src/sys/conf/files#18 (text+ko) ==== @@ -55,7 +55,7 @@ compile-with "CC=${CC} AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h emu10k1-alsa%diked.h" \ no-obj no-implicit-rule before-depend \ clean "emu10k1-alsa%diked.h" -miidevs.h optional miibus \ +miidevs.h optional miibus | mii \ dependency "$S/tools/miidevs2h.awk $S/dev/mii/miidevs" \ compile-with "${AWK} -f $S/tools/miidevs2h.awk $S/dev/mii/miidevs" \ no-obj no-implicit-rule before-depend \ @@ -695,31 +695,35 @@ dev/mcd/mcd_isa.c optional mcd isa nowerror dev/md/md.c optional md dev/mem/memdev.c optional mem -dev/mii/acphy.c optional miibus -dev/mii/amphy.c optional miibus -dev/mii/bmtphy.c optional miibus -dev/mii/brgphy.c optional miibus -dev/mii/ciphy.c optional miibus -dev/mii/e1000phy.c optional miibus -dev/mii/exphy.c optional miibus -dev/mii/inphy.c optional miibus -dev/mii/lxtphy.c optional miibus -dev/mii/mii.c optional miibus -dev/mii/mii_physubr.c optional miibus -dev/mii/miibus_if.m optional miibus -dev/mii/mlphy.c optional miibus -dev/mii/nsgphy.c optional miibus -dev/mii/nsphy.c optional miibus -dev/mii/pnaphy.c optional miibus -dev/mii/qsphy.c optional miibus -dev/mii/rgephy.c optional miibus -dev/mii/rlphy.c optional miibus -dev/mii/ruephy.c optional miibus -dev/mii/tdkphy.c optional miibus -dev/mii/tlphy.c optional miibus -dev/mii/ukphy.c optional miibus -dev/mii/ukphy_subr.c optional miibus -dev/mii/xmphy.c optional miibus +dev/mii/acphy.c optional miibus | acphy +dev/mii/amphy.c optional miibus | amphy +dev/mii/bmtphy.c optional miibus | bmtphy +dev/mii/brgphy.c optional miibus | brgphy +dev/mii/ciphy.c optional miibus | ciphy +dev/mii/e1000phy.c optional miibus | e1000phy +# XXX only xl cards? +dev/mii/exphy.c optional miibus | exphy +# XXX only fxp cards? +dev/mii/inphy.c optional miibus | inphy +dev/mii/lxtphy.c optional miibus | lxtphy +dev/mii/mii.c optional miibus | mii +dev/mii/mii_physubr.c optional miibus | mii +dev/mii/miibus_if.m optional miibus | mii +dev/mii/mlphy.c optional miibus | mlphy +dev/mii/nsgphy.c optional miibus | nsgphy +dev/mii/nsphy.c optional miibus | nsphy +dev/mii/pnaphy.c optional miibus | pnaphy +dev/mii/qsphy.c optional miibus | qsphy +dev/mii/rgephy.c optional miibus | rgephy +# XXX rl and re only? +dev/mii/rlphy.c optional miibus | rlphy +# XXX rue only? +dev/mii/ruephy.c optional miibus | ruephy +dev/mii/tdkphy.c optional miibus | tdkphy +dev/mii/tlphy.c optional miibus | tlphy +dev/mii/ukphy.c optional miibus | mii +dev/mii/ukphy_subr.c optional miibus | mii +dev/mii/xmphy.c optional miibus | xmphy dev/mk48txx/mk48txx.c optional mk48txx dev/mlx/mlx.c optional mlx dev/mlx/mlx_disk.c optional mlx From owner-p4-projects@FreeBSD.ORG Tue Feb 7 18:36:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3359516A424; Tue, 7 Feb 2006 18:36:00 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E5FCD16A422 for ; Tue, 7 Feb 2006 18:35:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC3DD43D66 for ; Tue, 7 Feb 2006 18:35:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k17IZxws098892 for ; Tue, 7 Feb 2006 18:35:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k17IZx6l098889 for perforce@freebsd.org; Tue, 7 Feb 2006 18:35:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 7 Feb 2006 18:35:59 GMT Message-Id: <200602071835.k17IZx6l098889@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91328 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Feb 2006 18:36:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=91328 Change 91328 by rwatson@rwatson_zoo on 2006/02/07 18:35:56 When queue overflows and a record is removed, remember to update the queue length. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#7 (text+ko) ==== @@ -198,6 +198,7 @@ ape_remove = TAILQ_FIRST(&ap->ap_queue); TAILQ_REMOVE(&ap->ap_queue, ape_remove, ape_queue); audit_pipe_entry_free(ape_remove); + ap->ap_qlen--; ap->ap_drops++; audit_pipe_drops++; } From owner-p4-projects@FreeBSD.ORG Tue Feb 7 18:51:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B75D116A423; Tue, 7 Feb 2006 18:51:20 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8F7DC16A420 for ; Tue, 7 Feb 2006 18:51:20 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3912C43D45 for ; Tue, 7 Feb 2006 18:51:20 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k17IpKAv099822 for ; Tue, 7 Feb 2006 18:51:20 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k17IpJL1099819 for perforce@freebsd.org; Tue, 7 Feb 2006 18:51:19 GMT (envelope-from jhb@freebsd.org) Date: Tue, 7 Feb 2006 18:51:19 GMT Message-Id: <200602071851.k17IpJL1099819@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 91332 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Feb 2006 18:51:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=91332 Change 91332 by jhb@jhb_slimer on 2006/02/07 18:51:00 Loopback. Affected files ... .. //depot/projects/smpng/sys/kern/kern_acct.c#40 integrate Differences ... ==== //depot/projects/smpng/sys/kern/kern_acct.c#40 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.78 2006/02/03 16:37:55 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.79 2006/02/07 16:04:03 jhb Exp $"); #include "opt_mac.h" @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -58,6 +59,7 @@ #include #include #include +#include #include #include #include @@ -83,12 +85,9 @@ * was provided by UCB with the 4.4BSD-Lite release */ static comp_t encode_comp_t(u_long, u_long); -static void acctwatch(void *); - -/* - * Accounting callout used for periodic scheduling of acctwatch. - */ -static struct callout acctwatch_callout; +static void acctwatch(void); +static void acct_thread(void *); +static int acct_disable(struct thread *); /* * Accounting vnode pointer, saved vnode pointer, and flags for each. @@ -104,6 +103,14 @@ SX_SYSINIT(acct, &acct_sx, "acct_sx"); /* + * State of the accounting kthread. + */ +static int acct_state; + +#define ACCT_RUNNING 1 /* Accounting kthread is running. */ +#define ACCT_EXITREQ 2 /* Accounting kthread should exit. */ + +/* * Values associated with enabling and disabling accounting */ static int acctsuspend = 2; /* stop accounting when < 2% free space left */ @@ -188,16 +195,13 @@ * enabled. */ acct_suspended = 0; - if (acct_vp != NULL) { - callout_stop(&acctwatch_callout); - error = vn_close(acct_vp, acct_flags, acct_cred, td); - crfree(acct_cred); - acct_vp = NULL; - acct_cred = NULL; - acct_flags = 0; - log(LOG_NOTICE, "Accounting disabled\n"); - } + if (acct_vp != NULL) + error = acct_disable(td); if (uap->path == NULL) { + if (acct_state & ACCT_RUNNING) { + acct_state |= ACCT_EXITREQ; + wakeup(&acct_state); + } sx_xunlock(&acct_sx); goto done; } @@ -209,16 +213,54 @@ acct_vp = nd.ni_vp; acct_cred = crhold(td->td_ucred); acct_flags = flags; - callout_init(&acctwatch_callout, CALLOUT_MPSAFE); + if (acct_state & ACCT_RUNNING) + acct_state &= ~ACCT_EXITREQ; + else { + /* + * Try to start up an accounting kthread. We may start more + * than one, but if so the extras will commit suicide as + * soon as they start up. + */ + error = kthread_create(acct_thread, NULL, NULL, 0, 0, + "accounting"); + if (error) { + (void) vn_close(acct_vp, acct_flags, acct_cred, td); + crfree(acct_cred); + acct_vp = NULL; + acct_cred = NULL; + acct_flags = 0; + sx_xunlock(&acct_sx); + log(LOG_NOTICE, "Unable to start accounting thread\n"); + goto done; + } + } sx_xunlock(&acct_sx); log(LOG_NOTICE, "Accounting enabled\n"); - acctwatch(NULL); done: mtx_unlock(&Giant); return (error); } /* + * Disable currently in-progress accounting by closing the vnode, dropping + * our reference to the credential, and clearing the vnode's flags. + */ +static int +acct_disable(struct thread *td) +{ + int error; + + sx_assert(&acct_sx, SX_XLOCKED); + error = vn_close(acct_vp, acct_flags, acct_cred, td); + crfree(acct_cred); + acct_vp = NULL; + acct_cred = NULL; + acct_flags = 0; + log(LOG_NOTICE, "Accounting disabled\n"); + return (error); +} + +/* * Write out process accounting information, on process exit. * Data to be written out is specified in Leffler, et al. * and are enumerated below. (They're also noted in the system @@ -376,31 +418,41 @@ */ /* ARGSUSED */ static void -acctwatch(void *a) +acctwatch(void) { struct statfs sb; int vfslocked; - sx_xlock(&acct_sx); + sx_assert(&acct_sx, SX_XLOCKED); + + /* + * If accounting was disabled before our kthread was scheduled, + * then acct_vp might be NULL. If so, just ask our kthread to + * exit and return. + */ + if (acct_vp == NULL) { + acct_state |= ACCT_EXITREQ; + return; + } + + /* + * If our vnode is no longer valid, tear it down and signal the + * accounting thread to die. + */ vfslocked = VFS_LOCK_GIANT(acct_vp->v_mount); if (acct_vp->v_type == VBAD) { - (void) vn_close(acct_vp, acct_flags, acct_cred, NULL); + (void) acct_disable(NULL); VFS_UNLOCK_GIANT(vfslocked); - crfree(acct_cred); - acct_vp = NULL; - acct_cred = NULL; - acct_flags = 0; - sx_xunlock(&acct_sx); - log(LOG_NOTICE, "Accounting disabled\n"); + acct_state |= ACCT_EXITREQ; return; } + /* * Stopping here is better than continuing, maybe it will be VBAD * next time around. */ if (VFS_STATFS(acct_vp->v_mount, &sb, curthread) < 0) { VFS_UNLOCK_GIANT(vfslocked); - sx_xunlock(&acct_sx); return; } VFS_UNLOCK_GIANT(vfslocked); @@ -417,6 +469,54 @@ log(LOG_NOTICE, "Accounting suspended\n"); } } - callout_reset(&acctwatch_callout, acctchkfreq * hz, acctwatch, NULL); +} + +/* + * The main loop for the dedicated kernel thread that periodically calls + * acctwatch(). + */ +static void +acct_thread(void *dummy) +{ + u_char pri; + + /* This is a low-priority kernel thread. */ + pri = PRI_MAX_KERN; + mtx_lock_spin(&sched_lock); + sched_prio(curthread, pri); + mtx_unlock_spin(&sched_lock); + + /* If another accounting kthread is already running, just die. */ + sx_xlock(&acct_sx); + if (acct_state & ACCT_RUNNING) { + sx_xunlock(&acct_sx); + kthread_exit(0); + } + acct_state |= ACCT_RUNNING; + + /* Loop until we are asked to exit. */ + while (!(acct_state & ACCT_EXITREQ)) { + + /* Perform our periodic checks. */ + acctwatch(); + + /* + * We check this flag again before sleeping since the + * acctwatch() might have shut down accounting and asked us + * to exit. + */ + if (!(acct_state & ACCT_EXITREQ)) { + sx_xunlock(&acct_sx); + tsleep(&acct_state, pri, "-", acctchkfreq * hz); + sx_xlock(&acct_sx); + } + } + + /* + * Acknowledge the exit request and shutdown. We clear both the + * exit request and running flags. + */ + acct_state = 0; sx_xunlock(&acct_sx); + kthread_exit(0); } From owner-p4-projects@FreeBSD.ORG Tue Feb 7 23:43:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14A6116A423; Tue, 7 Feb 2006 23:43:49 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C8A8616A420 for ; Tue, 7 Feb 2006 23:43:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D40443D46 for ; Tue, 7 Feb 2006 23:43:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k17NhmTD024326 for ; Tue, 7 Feb 2006 23:43:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k17Nhmqv024323 for perforce@freebsd.org; Tue, 7 Feb 2006 23:43:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 7 Feb 2006 23:43:48 GMT Message-Id: <200602072343.k17Nhmqv024323@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91350 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Feb 2006 23:43:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=91350 Change 91350 by rwatson@rwatson_zoo on 2006/02/07 23:42:58 Acquire vnode lock around VOP_GETATTR(), as required by VFS locking protocol. We might simply want to acquire the vnode lock early in the record write routine, and hold it throughout, as it's also acquired later as part of vn_rdwr(). Found by: kris (bugmagnet) Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#12 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#12 (text+ko) ==== @@ -284,7 +284,9 @@ if (ret) goto out; + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); ret = VOP_GETATTR(vp, &vattr, cred, td); + VOP_UNLOCK(vp, 0, td); if (ret) goto out; From owner-p4-projects@FreeBSD.ORG Wed Feb 8 00:18:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FABB16A423; Wed, 8 Feb 2006 00:18:34 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3561516A420 for ; Wed, 8 Feb 2006 00:18:34 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D061E43D46 for ; Wed, 8 Feb 2006 00:18:33 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k180IX5Z025712 for ; Wed, 8 Feb 2006 00:18:33 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k180IXBY025709 for perforce@freebsd.org; Wed, 8 Feb 2006 00:18:33 GMT (envelope-from soc-andrew@freebsd.org) Date: Wed, 8 Feb 2006 00:18:33 GMT Message-Id: <200602080018.k180IXBY025709@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 91352 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2006 00:18:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=91352 Change 91352 by soc-andrew@soc-andrew_serv on 2006/02/08 00:18:26 Catch up with HEAD Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/lib/Makefile#8 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#26 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#5 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#9 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#4 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#4 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#8 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#4 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/picobsd/bridge/config#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/picobsd/bridge/crunch.conf#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/picobsd/build/picobsd#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/usr.bin/Makefile#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#12 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/lib/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.209 2005/12/29 14:40:20 dfr Exp $ +# $FreeBSD: src/lib/Makefile,v 1.211 2006/02/02 10:05:39 rwatson Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -22,11 +22,11 @@ # # Otherwise, the SUBDIR list should be in alphabetical order. -SUBDIR= ${_csu} libcom_err libcrypt libkvm msun libmd libncurses \ +SUBDIR= ${_csu} libbsm libcom_err libcrypt libkvm msun libmd libncurses \ libnetgraph libradius librpcsvc libsbuf libtacplus libutil \ ${_libypclnt} libalias libarchive ${_libatm} \ libbegemot ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \ - libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \ + libcalendar libcam libcompat libdevinfo libdevstat libdisk \ libedit libexpat libfetch libform libftpio libgeom ${_libgpib} \ libgssapi ${_libio} libipsec \ libipx libkiconv libmagic libmemstat libmenu ${_libmilter} ${_libmp} \ @@ -69,10 +69,6 @@ _libc_r= .endif -.if ${MACHINE_ARCH} != "arm" -_libdisk= libdisk -.endif - .if ${MACHINE_ARCH} == "alpha" _libio= libio .endif ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#26 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.896 2006/01/04 18:02:56 jhb Exp $ +# $FreeBSD: src/release/Makefile,v 1.898 2006/01/30 14:24:31 kensmith Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -228,6 +228,7 @@ MFSSIZE= 4096 MFSINODE= 8192 MFSLABEL= auto +SPLIT_MFSROOT= .elif ${TARGET_ARCH} == "powerpc" DISKLABEL= "" MFSSIZE= 4096 @@ -1032,11 +1033,11 @@ @mv ${CD_DISC1}/INSTALLATION.TXT ${CD_DISC1}/INSTALL.TXT @mv ${CD_DISC1}/INSTALLATION.HTM ${CD_DISC1}/INSTALL.HTM .endif - @echo "CD_VOLUME = 1" >> ${CD_DISC1}/cdrom.inf .if defined(SEPARATE_LIVEFS) @cp -Rp ${CD_LIVEFS}/boot ${CD_DISC1} @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC1}/cdrom.inf .endif + @echo "CD_VOLUME = 1" >> ${CD_DISC1}/cdrom.inf @echo "Building CDROM disc2 filesystem image" @mkdir -p ${CD_DISC2} @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC2}/cdrom.inf ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#5 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.292 2005/12/01 17:36:39 jhb Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.295 2006/02/07 03:32:22 marcel Exp $ Supported Devices @@ -356,6 +356,8 @@ Miscellaneous Networks + &hwlist.ce; + &hwlist.cx; &hwlist.cp; @@ -470,14 +472,10 @@ Serial Interfaces - PC standard 8250, 16450, and 16550-based serial ports (&man.sio.4; driver) + PC standard 8250, 16450, and 16550-based serial ports (&man.sio.4; driver) - Serial ports based on the SAB82532 serial - chip, console only (&man.sab.4; driver) + &hwlist.uart; - Serial ports based on the Zilog 8530 dual uart, - console only (zs driver) - AST 4 port serial card using shared IRQ ARNET serial cards (&man.ar.4; driver) @@ -535,7 +533,7 @@ Decision Computers PCCOM 4-port serial and dual port RS232/422/485 - Diva Serial (GSP) Multiport UART (development branch only) + Diva Serial (GSP) Multiport UART Dolphin Peripherals 4025/4035/4036 @@ -660,8 +658,6 @@ Sound Devices - &hwlist.sound; - &hwlist.snd.ad1816; &hwlist.snd.als4000; @@ -748,18 +744,18 @@ USB Devices - A range of USB peripherals are supported; devices known to + A range of USB peripherals are supported; devices known to work are listed in this section. Owing to the generic nature of most USB devices, with some exceptions any device of a given class will be supported, even if not explicitly listed here. - + USB Ethernet adapters can be found in the section listing Ethernet interfaces. - + USB Bluetooth adapters can be found in Bluetooth section. @@ -771,9 +767,9 @@ USB 2.0 controllers using the EHCI interface (&man.ehci.4; driver) - Hubs + Hubs - Keyboards (&man.ukbd.4; driver) + Keyboards (&man.ukbd.4; driver) Miscellaneous @@ -799,7 +795,7 @@ &hwlist.umodem; - Mice (&man.ums.4; driver) + Mice (&man.ums.4; driver) &hwlist.ulpt; @@ -870,7 +866,7 @@ Floppy drives (&man.fdc.4; driver) - VGA-compatible video cards + VGA-compatible video cards (&man.vga.4; driver) @@ -887,13 +883,13 @@ AT-style keyboards (&man.atkbd.4; driver) - + PS/2 keyboards (&man.atkbd.4; driver) Standard keyboards - + USB keyboards (&man.ukbd.4; driver) @@ -904,14 +900,14 @@ Bus mice and compatible devices (&man.mse.4; driver) - + PS/2 mice and compatible devices, including many laptop pointing devices (&man.psm.4; driver) Serial mice and compatible devices - + USB mice (&man.ums.4; driver) ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#2 (text+ko) ==== @@ -1,23 +1,21 @@ Supported Processors and Motherboards - Currently supported processors are the - Itanium - and the Itanium 2. + Currently supported processors are the + + Itanium and the + + Itanium 2. Supported chipsets include: - HP zx1 (only on development branch, see the - Perforce repository) + HP zx1 - HP i2000 - - Intel 460GX @@ -26,58 +24,17 @@ Both Uniprocessor (UP) and Symmetric Multi-processor (SMP) - configurations are under active development. At this time, - SMP-enabled systems are considered less stable. The current - priorities are UP fixes to improve stability. + configurations are supported. Supported Devices Overview - This section contains additional information about what - devices may or may not be supported by &os;/&arch;. - - Except for the PC chipset embedded &man.ata.4; controllers, - most should work out of the box. Eventually, all - &arch;-compatible ATA controllers are expected to be fully - supported. Refer to the following sections for various disk - controllers and their current status. - - In general, PC standard serial ports - supported by the &man.sio.4; driver are expected to work on - Intel legacy machines, but not PA legacy machines. The reason - is that all devices on HP machines are memory-mapped and there - is no ISA device support other than the PCI - dictated VGA legacy. - - In addition to &man.sio.4; devices, the following devices - fail on non-Intel legacy machines (but should work on boxes with - an Intel legacy) because their drivers make ISA-specific - assumptions that do not hold: - - - - - - &man.sio.4; - No support for memory-mapped I/O - - - - &man.syscons.4; - Expect BIOS, VGA probes, etc. - - - - &man.pcm.4; - Probes MSS ISA ports ad nauseum - - - - &man.atkbd.4;, &man.psm.4; - Fixed ISA port locations - - - - + Most devices that can be found in or are compatible with + &arch; machines are fully supported. The notable exception + is the VGA console. The &os; support for VGA consoles is at + this time too much based on PC hardware and not all &arch; + machines have chipsets that provide sufficient PC legacy + support. As such &man.syscons.4; can not be enabled and the + use of a serial console is required. ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#9 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.897 2005/10/31 16:52:11 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.898 2006/02/05 20:54:53 bmah Exp $ 2000 @@ -12,6 +12,7 @@ 2003 2004 2005 + 2006 The &os; Documentation Project @@ -113,7 +114,43 @@ Security Advisories - + A temporary file vulnerability in &man.texindex.1;, which + 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 FreeBSD-SA-06:01.texindex. &merged + + 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 FreeBSD-SA-06:02.ee. &merged + + Several vulnerabilities in the &man.cpio.1; utility have + been corrected. For more + details see security advisory FreeBSD-SA-06:03.cpio. &merged + + An error in &man.ipfw.4; IP fragment handling, which could + cause a crash, has been fixed. For more + details see security advisory FreeBSD-SA-06:04.ipfw. &merged + + A potential buffer overflow in the IEEE 802.11 scanning code + has been corrected. For more + details see security advisory FreeBSD-SA-06:05.80211. &merged + + Two instances in which portions of kernel memory could be + disclosed to users have been fixed. For more details see + security advisory FreeBSD-SA-06:06.kmem. &merged + + 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 FreeBSD-SA-06:07.pf. &merged + ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#4 (text+ko) ==== @@ -26,13 +26,13 @@ this file to fix "missed" conversions are likely to break the build. - $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.30 2005/08/28 08:20:41 simon Exp $ + $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.31 2006/01/26 09:37:24 brd Exp $ Original revision: 1.282 --> - $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.30 2005/08/28 08:20:41 simon Exp $ + $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.31 2006/01/26 09:37:24 brd Exp $ Âбþ¥Ï¡¼¥É¥¦¥§¥¢ @@ -668,8 +668,6 @@ ¥µ¥¦¥ó¥É¥Ç¥Ð¥¤¥¹ - &hwlist.sound; - &hwlist.snd.ad1816; &hwlist.snd.als4000; ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ fail: Error <${errno}> error code <${errcode}> in <${where}>" case ${errcode} in - no_vnconfig) - echo "Error in vnconfig on /dev/${l_vndev}..." - echo "Either you are not running as root or your running kernel" - echo "does not have the ${l_vn}(4) device." - ;; - mfs_disklabel) - echo "Error while labeling ${c_fs} size ${MFS_SIZE}" - ;; - no_mount) - echo "Error while mounting ${c_fs} (/dev/${l_vndev}c) on ${c_mnt}" - ;; mtree) echo "Error while making hierarchy in ${c_mnt}" ;; crunch) echo "Error while building ${name}." ;; - floppy_disklabel) - echo "Error while doing disklabel on of floppy.img size $fd_size" - ;; missing_kernel) echo "Error: you must build PICOBSD${suffix} kernel first" ;; @@ -762,90 +695,91 @@ exit 2 } -# -# Create a zero-filled disk image with a boot sector, and vnconfig it. -# - -init_fs_image() { # filename size_in_kbytes - local imgname imgsize - - log "init_fs_image() $1 $2" - imgname=$1 ; imgsize=$2 - dd if=/dev/zero of=${imgname} count=${imgsize} bs=1k 2> /dev/null - dd if=${c_boot1} of=${imgname} conv=notrunc 2> /dev/null - - if [ "${l_vn}" = "vn" ] ; then - vnconfig -c -s labels ${l_vndev} ${imgname} || fail $? no_vnconfig - else - mdconfig -a -t vnode -u ${l_vnum} -f ${imgname} || fail $? no_vnconfig - fi -} - - fill_floppy_image() { - local blocks sectors dst + local blocks dst mfs_start mfs_end mfs_size img_size log "fill_floppy_image()" dst=${c_mnt} # where to create the image log "Preparing ${fd_size}kB floppy filesystem..." - # correct block and number of sectors according to size. - blocks=${fd_size}; sectors=18 + # correct blocks according to size. + blocks=${fd_size}; if [ "${blocks}" = "1720" ]; then - blocks=1722 ; sectors=21 + blocks=1722 elif [ "${blocks}" = "1480" ]; then - blocks=1476 ; + blocks=1476 fi - init_fs_image ${BUILDDIR}/${c_img} ${blocks} - log "Labeling floppy image" + log "patch ${c_boot2} to boot /kernel right away" b2=${BUILDDIR}/boot2 # modified boot2 - cp ${c_boot2} ${b2} + cp -f ${c_boot2} ${b2} chmod 0644 ${b2} + set `strings -at d ${b2} | grep "/boot/loader"` - echo -e "/kernel\0\0\0\0\0" | dd of=${b2} obs=$1 oseek=1 conv=notrunc + echo -e "/kernel\0\0\0\0\0" | \ + dd of=${b2} obs=$1 oseek=1 conv=notrunc 2>/dev/null chmod 0444 ${b2} - # create a disklabel ... - disklabel -Brw -b ${c_boot1} -s ${b2} ${l_vndev} auto || \ - fail $? floppy_disklabel - - # and copy partition c: into partition a: using some sed magic - disklabel ${l_vndev} | sed -e '/ c:/{p;s/c:/a:/;}' | \ - disklabel -R ${l_vndev} /dev/stdin - - log "Newfs floppy image" - newfs -i ${fd_inodes} ${l_newfs} /dev/${l_vndev}a > /dev/null - - log "Mounting floppy image" - mount /dev/${l_vndev}a ${dst} - + dst=${BUILDDIR}/image.tree + rm -rf ${dst} + mkdir -p ${dst} ( cd ${BUILDDIR} + set 0 0 # reset variables # $1 takes the offset of the MFS filesystem set `strings -at d kernel | grep "MFS Filesystem goes here"` - mfs_ofs=$(($1 + 8192)) - log "Preload kernel with file ${c_fs} at ${mfs_ofs}" - dd if=${c_fs} ibs=8192 iseek=1 of=kernel obs=${mfs_ofs} \ - oseek=1 conv=notrunc + mfs_start=$1 + set 0 0 # reset variables + set `strings -at d kernel | grep "MFS Filesystem had better"` + mfs_end=$1 + mfs_size="$((${mfs_end} - ${mfs_start}))" + set -- `ls -l ${c_fs}`; imgsize="$5" + if [ ${mfs_start} -gt 0 -a ${mfs_size} -ge ${imgsize} ] ; then + mfs_ofs=$((${mfs_start} + 8192)) + log "Preload kernel with file ${c_fs} at ${mfs_ofs}" + dd if=${c_fs} ibs=8192 iseek=1 of=kernel obs=${mfs_ofs} \ + oseek=1 conv=notrunc 2> /dev/null + else + log "not loading mfs, size ${mfs_size} img ${imgsize}" + fi log "Compress with kgzip and copy to floppy image" kgzip -o kernel.gz kernel cp -p kernel.gz ${dst}/kernel || fail $? no_space "copying kernel" - log "now transfer floppy tree if needed" + log "Now transfer floppy tree if not already in MFS image" # now transfer the floppy tree. If it is already in mfs, dont bother. if [ "${o_all_in_mfs}" != "yes" ] ; then cp -Rp floppy.tree/* ${dst} || \ fail $? no_space "copying floppy tree" fi ) - (log "Fixing permissions"; cd ${dst}; chown -R root *) - # rm -rf ${BUILDDIR}/floppy.tree || true # cleanup + (cd ${BUILDDIR} + makefs -t ffs -o bsize=4096 -o fsize=512 \ + -s ${blocks}k -f 50 ${c_img} ${dst} + # ${l_label} -f `pwd`/${c_img} + ${l_label} -w -f `pwd`/${c_img} auto # write in a label + # copy partition c: into a: with some sed magic + ${l_label} -f `pwd`/${c_img} | sed -e '/ c:/{p;s/c:/a:/;}' | \ + ${l_label} -R -f `pwd`/${c_img} /dev/stdin + ${l_label} -f `pwd`/${c_img} + ls -l ${c_img} + logverbose "after disklabel" + ) + # dump the primary and secondary boot + # XXX primary is 512 bytes + dd if=${c_boot1} of=${BUILDDIR}/${c_img} conv=notrunc 2>/dev/null + # XXX secondary starts after the 0x114 = dec 276 bytes of the label + # so we skip 276 from the source, and 276+512=788 from dst + # the old style blocks used 512 and 1024 respectively - df -ik ${dst} | colrm 70 > .build.reply - free_vnode + dd if=${b2} iseek=1 ibs=276 2> /dev/null | \ + dd of=${BUILDDIR}/${c_img} oseek=1 obs=788 conv=notrunc 2>/dev/null + logverbose "done floppy image" + # XXX (log "Fixing permissions"; cd ${dst}; chown -R root *) + rm -rf ${BUILDDIR}/floppy.tree || true # cleanup + # df -ik ${dst} | colrm 70 > .build.reply rm -rf ${dst} rm ${BUILDDIR}/kernel.gz ${BUILDDIR}/${c_fs} } ==== //depot/projects/soc2005/bsdinstaller/src/usr.bin/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 -# $FreeBSD: src/usr.bin/Makefile,v 1.285 2005/09/19 08:13:43 imura Exp $ +# $FreeBSD: src/usr.bin/Makefile,v 1.287 2006/01/05 05:58:16 grehan Exp $ # XXX MISSING: deroff diction graph learn plot # spell spline struct xsend @@ -228,8 +228,7 @@ ${_ypmatch} \ ${_ypwhich} -.if ${MACHINE_ARCH} != "arm" && \ - ${MACHINE_ARCH} != "powerpc" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Feb 8 01:11:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DC9C16A423; Wed, 8 Feb 2006 01:11:39 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F046A16A420 for ; Wed, 8 Feb 2006 01:11:38 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B3C2043D45 for ; Wed, 8 Feb 2006 01:11:38 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k181BcRs035087 for ; Wed, 8 Feb 2006 01:11:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k181Bckc035084 for perforce@freebsd.org; Wed, 8 Feb 2006 01:11:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Feb 2006 01:11:38 GMT Message-Id: <200602080111.k181Bckc035084@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91354 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2006 01:11:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=91354 Change 91354 by rwatson@rwatson_peppercorn on 2006/02/08 01:10:56 Sort types.h before other include files, as Darwin's dirrent.h depends on types.h. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#5 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#12 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#4 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#5 $ */ /* * Program to trigger the audit daemon with a message that is either: @@ -40,8 +40,8 @@ * */ +#include #include -#include #include #include ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#12 (text+ko) ==== @@ -30,14 +30,14 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#11 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#12 $ */ +#include #include #include #include #include -#include #include #include From owner-p4-projects@FreeBSD.ORG Wed Feb 8 01:53:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F44416A423; Wed, 8 Feb 2006 01:53:30 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED2B616A422 for ; Wed, 8 Feb 2006 01:53:29 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9BAFA43D46 for ; Wed, 8 Feb 2006 01:53:29 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k181rTs4036763 for ; Wed, 8 Feb 2006 01:53:29 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k181rTpa036760 for perforce@freebsd.org; Wed, 8 Feb 2006 01:53:29 GMT (envelope-from wsalamon@computer.org) Date: Wed, 8 Feb 2006 01:53:29 GMT Message-Id: <200602080153.k181rTpa036760@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 91355 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2006 01:53:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=91355 Change 91355 by wsalamon@gretsch on 2006/02/08 01:53:04 When generating the process token, need to check whether the process was sucessfully audited. Otherwise, generate the PID token. This change covers the pid < 0 cases, and pid lookup failure cases. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#13 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#8 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#13 (text+ko) ==== @@ -369,8 +369,9 @@ ar->k_ar.ar_arg_rgid = p->p_ucred->cr_rgid; ar->k_ar.ar_arg_asid = p->p_au->ai_asid; ar->k_ar.ar_arg_termid = p->p_au->ai_termid; + ar->k_ar.ar_arg_pid = p->p_pid; ARG_SET_VALID(ar, ARG_AUID | ARG_EUID | ARG_EGID | ARG_RUID | - ARG_RGID | ARG_ASID | ARG_TERMID | ARG_PROCESS); + ARG_RGID | ARG_ASID | ARG_TERMID | ARG_PID | ARG_PROCESS); } void ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#8 (text+ko) ==== @@ -223,20 +223,17 @@ } while (0) #define PROCESS_PID_TOKENS(argn) do { \ - if (ARG_IS_VALID(kar, ARG_PID)) { \ - if ((ar->ar_arg_pid > 0) /* Kill a single process */ \ - && (ARG_IS_VALID(kar, ARG_PROCESS))) { \ - tok = au_to_process(ar->ar_arg_auid, \ - ar->ar_arg_euid, ar->ar_arg_egid, \ - ar->ar_arg_ruid, ar->ar_arg_rgid, \ - ar->ar_arg_pid, ar->ar_arg_asid, \ - &ar->ar_arg_termid); \ - kau_write(rec, tok); \ - } else { \ - tok = au_to_arg32(argn, "process", \ - ar->ar_arg_pid); \ - kau_write(rec, tok); \ - } \ + if ((ar->ar_arg_pid > 0) /* Reference a single process */ \ + && (ARG_IS_VALID(kar, ARG_PROCESS))) { \ + tok = au_to_process(ar->ar_arg_auid, \ + ar->ar_arg_euid, ar->ar_arg_egid, \ + ar->ar_arg_ruid, ar->ar_arg_rgid, \ + ar->ar_arg_pid, ar->ar_arg_asid, \ + &ar->ar_arg_termid); \ + kau_write(rec, tok); \ + } else if (ARG_IS_VALID(kar, ARG_PID)) { \ + tok = au_to_arg32(argn, "process", ar->ar_arg_pid); \ + kau_write(rec, tok); \ } \ } while (0) \ From owner-p4-projects@FreeBSD.ORG Wed Feb 8 02:06:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 992B616A423; Wed, 8 Feb 2006 02:06:46 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D1EB16A420 for ; Wed, 8 Feb 2006 02:06:46 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0102043D45 for ; Wed, 8 Feb 2006 02:06:46 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1826j0O037362 for ; Wed, 8 Feb 2006 02:06:45 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1826jsr037359 for perforce@freebsd.org; Wed, 8 Feb 2006 02:06:45 GMT (envelope-from wsalamon@computer.org) Date: Wed, 8 Feb 2006 02:06:45 GMT Message-Id: <200602080206.k1826jsr037359@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 91356 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2006 02:06:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=91356 Change 91356 by wsalamon@gretsch on 2006/02/08 02:05:52 Audit the arguments to ptrace(2). Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/sys_process.c#8 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/sys_process.c#8 (text+ko) ==== @@ -406,6 +406,11 @@ if (td->td_proc->p_sysent == &ia32_freebsd_sysvec) wrap32 = 1; #endif + AUDIT_ARG(pid, uap->pid); + AUDIT_ARG(cmd, uap->req); + AUDIT_ARG(addr, uap->addr); + AUDIT_ARG(value, uap->data); + addr = &r; switch (uap->req) { case PT_GETREGS: From owner-p4-projects@FreeBSD.ORG Wed Feb 8 02:12:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE4E416A437; Wed, 8 Feb 2006 02:12:55 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 74A7116A422 for ; Wed, 8 Feb 2006 02:12:55 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A32E43D48 for ; Wed, 8 Feb 2006 02:12:55 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k182Ct5Z037639 for ; Wed, 8 Feb 2006 02:12:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k182CsH2037636 for perforce@freebsd.org; Wed, 8 Feb 2006 02:12:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Feb 2006 02:12:54 GMT Message-Id: <200602080212.k182CsH2037636@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91358 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2006 02:12:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=91358 Change 91358 by rwatson@rwatson_peppercorn on 2006/02/08 02:12:47 Include before , as audit.h depends on types defined in stdint.h. Required for Darwin build. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#15 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#15 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#15 $ */ #ifndef _LIBBSM_H_ @@ -44,11 +44,12 @@ #include #include +#include /* Required for audit.h. */ + #include #include #include -#include #ifdef __APPLE__ #include /* audit_token_t */ From owner-p4-projects@FreeBSD.ORG Wed Feb 8 02:17:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2807916A423; Wed, 8 Feb 2006 02:17:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DD0F516A420 for ; Wed, 8 Feb 2006 02:17:00 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A264343D45 for ; Wed, 8 Feb 2006 02:17:00 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k182H0d1037906 for ; Wed, 8 Feb 2006 02:17:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k182H0x5037901 for perforce@freebsd.org; Wed, 8 Feb 2006 02:17:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Feb 2006 02:17:00 GMT Message-Id: <200602080217.k182H0x5037901@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91360 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2006 02:17:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=91360 Change 91360 by rwatson@rwatson_peppercorn on 2006/02/08 02:16:41 Darwin's sys/sysctl.h causes a nested include of the host sys/audit.h, which contains duplicate type definitions to bsm/libbsm.h. We need our own definitions, so for now, use a #define to tell the compiler we already have all the necessary bits from sys/audit.h on Apple platforms. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#15 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#15 (text+ko) ==== @@ -26,9 +26,13 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#15 $ */ +#ifdef __APPLE__ +#define _SYS_AUDIT_H /* Prevent include of sys/audit.h. */ +#endf + #include #include #include From owner-p4-projects@FreeBSD.ORG Wed Feb 8 02:25:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1847A16A423; Wed, 8 Feb 2006 02:25:13 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E2EAD16A420 for ; Wed, 8 Feb 2006 02:25:12 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 84AA443D49 for ; Wed, 8 Feb 2006 02:25:12 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k182PCEI038599 for ; Wed, 8 Feb 2006 02:25:12 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k182PC1h038596 for perforce@freebsd.org; Wed, 8 Feb 2006 02:25:12 GMT (envelope-from imp@freebsd.org) Date: Wed, 8 Feb 2006 02:25:12 GMT Message-Id: <200602080225.k182PC1h038596@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91364 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2006 02:25:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=91364 Change 91364 by imp@imp_harmony on 2006/02/08 02:24:50 IFC @91362 Affected files ... .. //depot/projects/arm/src/sys/alpha/alpha/mp_machdep.c#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/arm/src/sys/conf/files#19 integrate .. //depot/projects/arm/src/sys/dev/pccbb/pccbb.c#6 integrate .. //depot/projects/arm/src/sys/geom/eli/g_eli.c#5 integrate .. //depot/projects/arm/src/sys/i386/i386/mp_machdep.c#6 integrate .. //depot/projects/arm/src/sys/ia64/ia64/mp_machdep.c#3 integrate .. //depot/projects/arm/src/sys/kern/init_main.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_acct.c#6 integrate .. //depot/projects/arm/src/sys/kern/kern_exit.c#10 integrate .. //depot/projects/arm/src/sys/kern/kern_proc.c#6 integrate .. //depot/projects/arm/src/sys/kern/kern_resource.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_synch.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_tc.c#3 integrate .. //depot/projects/arm/src/sys/kern/subr_trap.c#3 integrate .. //depot/projects/arm/src/sys/modules/arcnet/Makefile#3 integrate .. //depot/projects/arm/src/sys/net/if_gre.c#4 integrate .. //depot/projects/arm/src/sys/net/radix.c#2 integrate .. //depot/projects/arm/src/sys/netinet/tcp_syncache.c#6 integrate .. //depot/projects/arm/src/sys/security/audit/audit.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/tick.c#4 integrate .. //depot/projects/arm/src/sys/sys/pcpu.h#3 integrate .. //depot/projects/arm/src/sys/sys/proc.h#7 integrate .. //depot/projects/arm/src/sys/sys/systm.h#9 integrate Differences ... ==== //depot/projects/arm/src/sys/alpha/alpha/mp_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.57 2005/11/03 21:08:19 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.58 2006/02/07 21:22:01 phk Exp $"); #include "opt_kstack_pages.h" @@ -225,7 +225,7 @@ spinlock_exit(); KASSERT(curthread->td_md.md_spinlock_count == 1, ("invalid count")); - binuptime(PCPU_PTR(switchtime)); + PCPU_SET(switchtime, cpu_ticks()); PCPU_SET(switchticks, ticks); cpu_throw(NULL, choosethread()); /* doesn't return */ ==== //depot/projects/arm/src/sys/amd64/amd64/mp_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.267 2005/12/22 22:16:05 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.268 2006/02/07 21:22:01 phk Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -582,7 +582,7 @@ spinlock_exit(); KASSERT(curthread->td_md.md_spinlock_count == 1, ("invalid count")); - binuptime(PCPU_PTR(switchtime)); + PCPU_SET(switchtime, cpu_ticks()); PCPU_SET(switchticks, ticks); cpu_throw(NULL, choosethread()); /* doesn't return */ ==== //depot/projects/arm/src/sys/conf/files#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1095 2006/02/06 22:50:39 rwatson Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1096 2006/02/07 18:41:56 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/arm/src/sys/dev/pccbb/pccbb.c#6 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.138 2006/02/04 21:56:14 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.139 2006/02/07 18:38:51 imp Exp $"); #include #include @@ -287,18 +287,26 @@ int tmp; int error; + /* + * Before we delete the children (which we have to do because + * attach doesn't check for children busses correctly), we have + * to detach the children. Even if we didn't need to delete the + * children, we have to detach them. + */ + error = bus_generic_detach(brdev); + if (error != 0) + return (error); + + /* + * Since the attach routine doesn't search for children before it + * attaches them to this device, we must delete them here in order + * for the kldload/unload case to work. If we failed to do that, then + * we'd get duplicate devices when cbb.ko was reloaded. + */ device_get_children(brdev, &devlist, &numdevs); - - error = 0; - for (tmp = 0; tmp < numdevs; tmp++) { - if (device_detach(devlist[tmp]) == 0) - device_delete_child(brdev, devlist[tmp]); - else - error++; - } + for (tmp = 0; tmp < numdevs; tmp++) + device_delete_child(brdev, devlist[tmp]); free(devlist, M_TEMP); - if (error > 0) - return (ENXIO); /* Turn off the interrupts */ cbb_set(sc, CBB_SOCKET_MASK, 0); ==== //depot/projects/arm/src/sys/geom/eli/g_eli.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/eli/g_eli.c,v 1.17 2006/02/01 12:05:59 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/eli/g_eli.c,v 1.18 2006/02/07 17:23:22 brueffer Exp $"); #include #include @@ -60,15 +60,15 @@ static u_int g_eli_tries = 3; TUNABLE_INT("kern.geom.eli.tries", &g_eli_tries); SYSCTL_UINT(_kern_geom_eli, OID_AUTO, tries, CTLFLAG_RW, &g_eli_tries, 0, - "Number of tries when asking for passphrase"); + "Number of tries for entering the passphrase"); static u_int g_eli_visible_passphrase = 0; TUNABLE_INT("kern.geom.eli.visible_passphrase", &g_eli_visible_passphrase); SYSCTL_UINT(_kern_geom_eli, OID_AUTO, visible_passphrase, CTLFLAG_RW, &g_eli_visible_passphrase, 0, - "Turn on echo when entering passphrase (debug purposes only!!)"); + "Turn on echo when entering the passphrase (for debug purposes only!!)"); u_int g_eli_overwrites = 5; SYSCTL_UINT(_kern_geom_eli, OID_AUTO, overwrites, CTLFLAG_RW, &g_eli_overwrites, - 0, "Number of overwrites on-disk keys when destroying"); + 0, "Number of times on-disk keys should be overwritten when destroying them"); static u_int g_eli_threads = 0; TUNABLE_INT("kern.geom.eli.threads", &g_eli_threads); SYSCTL_UINT(_kern_geom_eli, OID_AUTO, threads, CTLFLAG_RW, &g_eli_threads, 0, @@ -121,7 +121,7 @@ break; } KASSERT(wr != NULL, ("Invalid worker (%u).", bp->bio_pflags)); - G_ELI_DEBUG(1, "Reruning crypto %s request (sid: %ju -> %ju).", + G_ELI_DEBUG(1, "Rerunning crypto %s request (sid: %ju -> %ju).", bp->bio_cmd == BIO_READ ? "READ" : "WRITE", (uintmax_t)wr->w_sid, (uintmax_t)crp->crp_sid); wr->w_sid = crp->crp_sid; @@ -767,10 +767,10 @@ if (error != 0) { free(wr, M_ELI); if (req != NULL) { - gctl_error(req, "Cannot setup crypto session " + gctl_error(req, "Cannot set up crypto session " "for %s (error=%d).", bpp->name, error); } else { - G_ELI_DEBUG(1, "Cannot setup crypto session " + G_ELI_DEBUG(1, "Cannot set up crypto session " "for %s (error=%d).", bpp->name, error); } goto failed; @@ -853,7 +853,7 @@ if (pp != NULL && (pp->acr != 0 || pp->acw != 0 || pp->ace != 0)) { if (force) { G_ELI_DEBUG(1, "Device %s is still open, so it " - "can't be definitely removed.", pp->name); + "cannot be definitely removed.", pp->name); } else { G_ELI_DEBUG(1, "Device %s is still open (r%dw%de%d).", pp->name, ==== //depot/projects/arm/src/sys/i386/i386/mp_machdep.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.261 2005/12/22 22:16:06 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.262 2006/02/07 21:22:01 phk Exp $"); #include "opt_apic.h" #include "opt_cpu.h" @@ -631,7 +631,7 @@ spinlock_exit(); KASSERT(curthread->td_md.md_spinlock_count == 1, ("invalid count")); - binuptime(PCPU_PTR(switchtime)); + PCPU_SET(switchtime, cpu_ticks()); PCPU_SET(switchticks, ticks); cpu_throw(NULL, choosethread()); /* doesn't return */ ==== //depot/projects/arm/src/sys/ia64/ia64/mp_machdep.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/mp_machdep.c,v 1.58 2005/09/03 23:53:49 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/mp_machdep.c,v 1.59 2006/02/07 21:22:01 phk Exp $"); #include "opt_kstack_pages.h" @@ -138,7 +138,7 @@ spinlock_exit(); KASSERT(curthread->td_md.md_spinlock_count == 1, ("invalid count")); - binuptime(PCPU_PTR(switchtime)); + PCPU_SET(switchtime, cpu_ticks()); PCPU_SET(switchticks, ticks); ia64_set_tpr(0); ==== //depot/projects/arm/src/sys/kern/init_main.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/init_main.c,v 1.261 2006/02/06 16:03:10 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/init_main.c,v 1.262 2006/02/07 21:22:01 phk Exp $"); #include "opt_init_path.h" #include "opt_mac.h" @@ -459,11 +459,10 @@ sx_slock(&allproc_lock); LIST_FOREACH(p, &allproc, p_list) { microuptime(&p->p_stats->p_start); - p->p_rux.rux_runtime.sec = 0; - p->p_rux.rux_runtime.frac = 0; + p->p_rux.rux_runtime = 0; } sx_sunlock(&allproc_lock); - binuptime(PCPU_PTR(switchtime)); + PCPU_SET(switchtime, cpu_ticks()); PCPU_SET(switchticks, ticks); /* ==== //depot/projects/arm/src/sys/kern/kern_acct.c#6 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.79 2006/02/07 16:04:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.80 2006/02/07 18:59:47 jhb Exp $"); #include "opt_mac.h" @@ -122,8 +122,29 @@ &acctresume, 0, "percentage of free disk space above which accounting resumes"); static int acctchkfreq = 15; /* frequency (in seconds) to check space */ -SYSCTL_INT(_kern, OID_AUTO, acct_chkfreq, CTLFLAG_RW, - &acctchkfreq, 0, "frequency for checking the free space"); + +static int +sysctl_acct_chkfreq(SYSCTL_HANDLER_ARGS) +{ + int error, value; + + /* Write out the old value. */ + error = SYSCTL_OUT(req, &acctchkfreq, sizeof(int)); + if (error || req->newptr == NULL) + return (error); + + /* Read in and verify the new value. */ + error = SYSCTL_IN(req, &value, sizeof(int)); + if (error) + return (error); + if (value <= 0) + return (EINVAL); + acctchkfreq = value; + return (0); +} +SYSCTL_PROC(_kern, OID_AUTO, acct_chkfreq, CTLTYPE_INT|CTLFLAG_RW, + &acctchkfreq, 0, sysctl_acct_chkfreq, "I", + "frequency for checking the free space"); SYSCTL_INT(_kern, OID_AUTO, acct_suspended, CTLFLAG_RD, &acct_suspended, 0, "Accounting suspended or not"); ==== //depot/projects/arm/src/sys/kern/kern_exit.c#10 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.281 2006/02/06 21:56:13 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.282 2006/02/07 21:22:01 phk Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -110,7 +110,7 @@ void exit1(struct thread *td, int rv) { - struct bintime new_switchtime; + uint64_t new_switchtime; struct proc *p, *nq, *q; struct tty *tp; struct vnode *ttyvp; @@ -543,9 +543,8 @@ ruadd(p->p_ru, &p->p_rux, &p->p_stats->p_cru, &p->p_crux); /* Do the same timestamp bookkeeping that mi_switch() would do. */ - binuptime(&new_switchtime); - bintime_add(&p->p_rux.rux_runtime, &new_switchtime); - bintime_sub(&p->p_rux.rux_runtime, PCPU_PTR(switchtime)); + new_switchtime = cpu_ticks(); + p->p_rux.rux_runtime += (new_switchtime - PCPU_GET(switchtime)); PCPU_SET(switchtime, new_switchtime); PCPU_SET(switchticks, ticks); cnt.v_swtch++; ==== //depot/projects/arm/src/sys/kern/kern_proc.c#6 (text+ko) ==== @@ -27,11 +27,11 @@ * SUCH DAMAGE. * * @(#)kern_proc.c 8.7 (Berkeley) 2/14/95 - * $FreeBSD: src/sys/kern/kern_proc.c,v 1.238 2006/01/18 20:27:43 julian Exp $ + * $FreeBSD: src/sys/kern/kern_proc.c,v 1.239 2006/02/07 21:22:02 phk Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.238 2006/01/18 20:27:43 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.239 2006/02/07 21:22:02 phk Exp $"); #include "opt_ktrace.h" #include "opt_kstack_pages.h" @@ -624,7 +624,6 @@ struct thread *td0; struct tty *tp; struct session *sp; - struct timeval tv; struct ucred *cred; struct sigacts *ps; @@ -695,8 +694,7 @@ kp->ki_swtime = p->p_swtime; kp->ki_pid = p->p_pid; kp->ki_nice = p->p_nice; - bintime2timeval(&p->p_rux.rux_runtime, &tv); - kp->ki_runtime = tv.tv_sec * (u_int64_t)1000000 + tv.tv_usec; + kp->ki_runtime = p->p_rux.rux_runtime * 1000000 / cpu_tickrate(); mtx_unlock_spin(&sched_lock); if ((p->p_sflag & PS_INMEM) && p->p_stats != NULL) { kp->ki_start = p->p_stats->p_start; ==== //depot/projects/arm/src/sys/kern/kern_resource.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_resource.c,v 1.152 2006/01/25 02:05:47 ups Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_resource.c,v 1.153 2006/02/07 21:22:02 phk Exp $"); #include "opt_compat.h" @@ -704,7 +704,7 @@ struct timeval *up; struct timeval *sp; { - struct bintime bt; + uint64_t bt; struct rusage_ext rux; struct thread *td; int bt_valid; @@ -712,6 +712,7 @@ PROC_LOCK_ASSERT(p, MA_OWNED); mtx_assert(&sched_lock, MA_NOTOWNED); bt_valid = 0; + bt = 0; mtx_lock_spin(&sched_lock); rux = p->p_rux; FOREACH_THREAD_IN_PROC(p, td) { @@ -725,12 +726,16 @@ KASSERT(td->td_oncpu != NOCPU, ("%s: running thread has no CPU", __func__)); if (!bt_valid) { - binuptime(&bt); + bt = cpu_ticks(); bt_valid = 1; } - bintime_add(&rux.rux_runtime, &bt); - bintime_sub(&rux.rux_runtime, - &pcpu_find(td->td_oncpu)->pc_switchtime); + /* + * XXX: Doesn't this mean that this quantum will + * XXX: get counted twice if calcru() is called + * XXX: from SIGINFO ? + */ + rux.rux_runtime += + (bt - pcpu_find(td->td_oncpu)->pc_switchtime); } } mtx_unlock_spin(&sched_lock); @@ -758,7 +763,6 @@ struct timeval *up; struct timeval *sp; { - struct timeval tv; /* {user, system, interrupt, total} {ticks, usec}; previous tu: */ u_int64_t ut, uu, st, su, it, iu, tt, tu, ptu; @@ -770,8 +774,7 @@ st = 1; tt = 1; } - bintime2timeval(&ruxp->rux_runtime, &tv); - tu = (u_int64_t)tv.tv_sec * 1000000 + tv.tv_usec; + tu = (ruxp->rux_runtime * 1000000LL) / cpu_tickrate(); ptu = ruxp->rux_uu + ruxp->rux_su + ruxp->rux_iu; if (tu < ptu) { printf( @@ -884,7 +887,7 @@ register long *ip, *ip2; register int i; - bintime_add(&rux->rux_runtime, &rux2->rux_runtime); + rux->rux_runtime += rux2->rux_runtime; rux->rux_uticks += rux2->rux_uticks; rux->rux_sticks += rux2->rux_sticks; rux->rux_iticks += rux2->rux_iticks; ==== //depot/projects/arm/src/sys/kern/kern_synch.c#5 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.273 2005/12/29 21:15:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.274 2006/02/07 21:22:02 phk Exp $"); #include "opt_ktrace.h" @@ -355,7 +355,7 @@ void mi_switch(int flags, struct thread *newtd) { - struct bintime new_switchtime; + uint64_t new_switchtime; struct thread *td; struct proc *p; @@ -384,9 +384,8 @@ * Compute the amount of time during which the current * process was running, and add that to its total so far. */ - binuptime(&new_switchtime); - bintime_add(&p->p_rux.rux_runtime, &new_switchtime); - bintime_sub(&p->p_rux.rux_runtime, PCPU_PTR(switchtime)); + new_switchtime = cpu_ticks(); + p->p_rux.rux_runtime += (new_switchtime - PCPU_GET(switchtime)); td->td_generation++; /* bump preempt-detect counter */ @@ -405,7 +404,7 @@ * it reaches the max, arrange to kill the process in ast(). */ if (p->p_cpulimit != RLIM_INFINITY && - p->p_rux.rux_runtime.sec >= p->p_cpulimit) { + p->p_rux.rux_runtime >= p->p_cpulimit * cpu_tickrate()) { p->p_sflag |= PS_XCPU; td->td_flags |= TDF_ASTPENDING; } ==== //depot/projects/arm/src/sys/kern/kern_tc.c#3 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.166 2005/09/19 22:16:31 andre Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.167 2006/02/07 21:22:02 phk Exp $"); #include "opt_ntp.h" @@ -131,6 +131,7 @@ #endif return SYSCTL_OUT(req, &boottime, sizeof(boottime)); } + /* * Return the difference between the timehands' counter value now and what * was when we copied it to the timehands' offset_count. @@ -782,3 +783,23 @@ } SYSINIT(timecounter, SI_SUB_CLOCKS, SI_ORDER_SECOND, inittimecounter, NULL) + +static +uint64_t +tc_cpu_ticks(void) +{ + static uint64_t base; + static unsigned last; + uint64_t u; + struct timecounter *tc; + + tc = timehands->th_counter; + u = tc->tc_get_timecount(tc) & tc->tc_counter_mask; + if (u < last) + base += tc->tc_counter_mask + 1; + last = u; + return (u + base); +} + +uint64_t (*cpu_ticks)(void) = tc_cpu_ticks; +uint64_t (*cpu_tickrate)(void) = tc_getfrequency; ==== //depot/projects/arm/src/sys/kern/subr_trap.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_trap.c,v 1.283 2005/11/13 13:27:44 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_trap.c,v 1.284 2006/02/07 21:22:02 phk Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -238,7 +238,7 @@ PROC_LOCK(p); lim_rlimit(p, RLIMIT_CPU, &rlim); mtx_lock_spin(&sched_lock); - if (p->p_rux.rux_runtime.sec >= rlim.rlim_max) { + if (p->p_rux.rux_runtime >= rlim.rlim_max * cpu_tickrate()) { mtx_unlock_spin(&sched_lock); killproc(p, "exceeded maximum CPU limit"); } else { ==== //depot/projects/arm/src/sys/modules/arcnet/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/arcnet/Makefile,v 1.4 2005/10/14 23:30:07 yar Exp $ +# $FreeBSD: src/sys/modules/arcnet/Makefile,v 1.5 2006/02/07 18:13:56 yar Exp $ .PATH: ${.CURDIR}/../../net @@ -17,9 +17,12 @@ arc_storelladdr .if !defined(KERNBUILDDIR) -opt_inet.h opt_inet6.h: +opt_inet.h: echo "#define INET 1" > ${.TARGET} +opt_inet6.h: + echo "#define INET6 1" > ${.TARGET} + opt_ipx.h: echo "#define IPX 1" > ${.TARGET} .endif ==== //depot/projects/arm/src/sys/net/if_gre.c#4 (text+ko) ==== @@ -612,9 +612,9 @@ error = EINVAL; break; } - sc->g_src = (satosin((struct sockadrr *)&lifr->addr))->sin_addr; + sc->g_src = (satosin(&lifr->addr))->sin_addr; sc->g_dst = - (satosin((struct sockadrr *)&lifr->dstaddr))->sin_addr; + (satosin(&lifr->dstaddr))->sin_addr; goto recompute; case SIOCDIFPHYADDR: if ((error = suser(curthread)) != 0) ==== //depot/projects/arm/src/sys/net/radix.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)radix.c 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/net/radix.c,v 1.37 2005/01/07 01:45:35 imp Exp $ + * $FreeBSD: src/sys/net/radix.c,v 1.38 2006/02/07 20:25:39 qingli Exp $ */ /* @@ -1006,7 +1006,7 @@ rn = rn->rn_parent; /* if went up beyond last, stop */ - if (rn->rn_bit < lastb) { + if (rn->rn_bit <= lastb) { stopping = 1; /* printf("up too far\n"); */ /* @@ -1018,6 +1018,14 @@ */ } } + + /* + * At the top of the tree, no need to traverse the right + * half, prevent the traversal of the entire tree in the + * case of default route. + */ + if (rn->rn_parent->rn_flags & RNF_ROOT) + stopping = 1; /* Find the next *leaf* since next node might vanish, too */ for (rn = rn->rn_parent->rn_right; rn->rn_bit >= 0;) ==== //depot/projects/arm/src/sys/netinet/tcp_syncache.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.81 2006/01/18 18:25:03 andre Exp $ + * $FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.82 2006/02/07 19:59:46 qingli Exp $ */ #include "opt_inet.h" @@ -1386,6 +1386,7 @@ * Fill in the syncache values. * XXX duplicate code from syncache_add */ + bzero(sc, sizeof(*sc)); sc->sc_ipopts = NULL; sc->sc_inc.inc_fport = inc->inc_fport; sc->sc_inc.inc_lport = inc->inc_lport; ==== //depot/projects/arm/src/sys/security/audit/audit.c#4 (text) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit.c,v 1.5 2006/02/06 22:50:39 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit.c,v 1.6 2006/02/07 23:44:31 rwatson Exp $ */ #include @@ -282,7 +282,9 @@ if (ret) goto out; + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); ret = VOP_GETATTR(vp, &vattr, cred, td); + VOP_UNLOCK(vp, 0, td); if (ret) goto out; ==== //depot/projects/arm/src/sys/sparc64/sparc64/mp_machdep.c#3 (text+ko) ==== @@ -54,7 +54,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/mp_machdep.c,v 1.30 2005/11/03 21:08:20 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/mp_machdep.c,v 1.31 2006/02/07 21:22:02 phk Exp $"); #include #include @@ -361,7 +361,7 @@ /* ok, now grab sched_lock and enter the scheduler */ mtx_lock_spin(&sched_lock); spinlock_exit(); - binuptime(PCPU_PTR(switchtime)); + PCPU_SET(switchtime, cpu_ticks()); PCPU_SET(switchticks, ticks); cpu_throw(NULL, choosethread()); /* doesn't return */ } ==== //depot/projects/arm/src/sys/sparc64/sparc64/tick.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/tick.c,v 1.18 2005/12/22 22:16:09 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/tick.c,v 1.19 2006/02/07 21:22:02 phk Exp $"); #include #include @@ -65,6 +65,20 @@ static void tick_hardclock(struct trapframe *); +static uint64_t +tick_cputicks(void) +{ + + return (rd(tick)); +} + +static uint64_t +tick_cputickrate(void) +{ + + return (tick_freq); +} + void cpu_initclocks(void) { @@ -156,6 +170,9 @@ * handled. */ tick_stop(); + + cpu_ticks = tick_cputicks; + cpu_tickrate = tick_cputickrate; } void ==== //depot/projects/arm/src/sys/sys/pcpu.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/pcpu.h,v 1.16 2005/04/26 17:07:40 jhb Exp $ + * $FreeBSD: src/sys/sys/pcpu.h,v 1.17 2006/02/07 21:22:02 phk Exp $ */ #ifndef _SYS_PCPU_H_ @@ -60,7 +60,7 @@ struct thread *pc_fpcurthread; /* Fp state owner */ struct thread *pc_deadthread; /* Zombie thread or NULL */ struct pcb *pc_curpcb; /* Current pcb */ - struct bintime pc_switchtime; + uint64_t pc_switchtime; int pc_switchticks; u_int pc_cpuid; /* This cpu number */ cpumask_t pc_cpumask; /* This cpu mask */ ==== //depot/projects/arm/src/sys/sys/proc.h#7 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.15 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/sys/proc.h,v 1.449 2006/02/02 00:37:05 rwatson Exp $ + * $FreeBSD: src/sys/sys/proc.h,v 1.450 2006/02/07 21:22:02 phk Exp $ */ #ifndef _SYS_PROC_H_ @@ -505,7 +505,7 @@ * Locking: (cj) means (j) for p_rux and (c) for p_crux. */ struct rusage_ext { - struct bintime rux_runtime; /* (cj) Real time. */ + u_int64_t rux_runtime; /* (cj) Real time. */ u_int64_t rux_uticks; /* (cj) Statclock hits in user mode. */ u_int64_t rux_sticks; /* (cj) Statclock hits in sys mode. */ u_int64_t rux_iticks; /* (cj) Statclock hits in intr mode. */ ==== //depot/projects/arm/src/sys/sys/systm.h#9 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)systm.h 8.7 (Berkeley) 3/29/95 - * $FreeBSD: src/sys/sys/systm.h,v 1.238 2006/02/06 10:11:59 jeff Exp $ + * $FreeBSD: src/sys/sys/systm.h,v 1.239 2006/02/07 21:22:02 phk Exp $ */ #ifndef _SYS_SYSTM_H_ @@ -238,6 +238,9 @@ int unsetenv(const char *name); int testenv(const char *name); +extern uint64_t (*cpu_ticks)(void); +extern uint64_t (*cpu_tickrate)(void); + #ifdef APM_FIXUP_CALLTODO struct timeval; void adjust_timeout_calltodo(struct timeval *time_change); From owner-p4-projects@FreeBSD.ORG Wed Feb 8 02:58:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A8FB16A423; Wed, 8 Feb 2006 02:58:54 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D5EC916A420 for ; Wed, 8 Feb 2006 02:58:53 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8529D43D45 for ; Wed, 8 Feb 2006 02:58:53 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k182wrLV040258 for ; Wed, 8 Feb 2006 02:58:53 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k182wr5k040255 for perforce@freebsd.org; Wed, 8 Feb 2006 02:58:53 GMT (envelope-from csjp@freebsd.org) Date: Wed, 8 Feb 2006 02:58:53 GMT Message-Id: <200602080258.k182wr5k040255@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 91365 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2006 02:58:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=91365 Change 91365 by csjp@csjp_xor on 2006/02/08 02:58:51 Add neccessary bits for OpenSSH support: - Covert the cannot_audit() macro into a function prototype - Re-arrange the ifdefs a bit in bsm_notify so the cannot_audit() can utilize the included header files, too. - make cannot_audit() a function, which will in the Apple case, wrap au_get_state, and for everything else, call auditon(2) system call. This function will log the fact that the audit status check failed, but only if ENOSYS was not returned by the system call. Reviewed by: rwatson Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#16 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#9 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#16 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#15 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#16 $ */ #ifndef _LIBBSM_H_ @@ -872,7 +872,7 @@ __END_DECLS /* OpenSSH compatibility */ -#define cannot_audit(x) (!(au_get_state() == AUC_AUDITING)) +int cannot_audit(int); __BEGIN_DECLS /* ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#9 (text+ko) ==== @@ -26,15 +26,12 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#8 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#9 $ */ -#ifdef __APPLE__ - /* * Based on sample code from Marc Majka. */ -#include #include /* strerror() */ #include /* errno */ #include @@ -42,6 +39,8 @@ #include /* syslog() */ #include /* syslog() */ +#ifdef __APPLE__ +#include /* If 1, assumes a kernel that sends the right notification. */ #define AUDIT_NOTIFICATION_ENABLED 1 @@ -145,5 +144,25 @@ return (AUC_AUDITING); } } +#endif /* !__APPLE__ */ -#endif /* !__APPLE__ */ +int +cannot_audit(int val __unused) +{ +#ifdef __APPLE__ + return (!(au_get_state() == AUC_AUDITING)); +#else + unsigned long au_cond; + + if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { + if (errno != ENOSYS) { + syslog(LOG_ERR, "Audit status check failed (%s)", + strerror(errno)); + } + return (1); + } + if (au_cond == AUC_NOAUDIT || au_cond == AUC_DISABLED) + return (1); + return (0); +#endif /* !__APPLE__ */ +} From owner-p4-projects@FreeBSD.ORG Wed Feb 8 03:02:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B8B916A424; Wed, 8 Feb 2006 03:02:06 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 19A9A16A420 for ; Wed, 8 Feb 2006 03:02:06 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D4BA43D46 for ; Wed, 8 Feb 2006 03:01:57 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1831vm5040628 for ; Wed, 8 Feb 2006 03:01:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1831vpf040625 for perforce@freebsd.org; Wed, 8 Feb 2006 03:01:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Feb 2006 03:01:57 GMT Message-Id: <200602080301.k1831vpf040625@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2006 03:02:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=91366 Change 91366 by rwatson@rwatson_peppercorn on 2006/02/08 03:00:56 Correct typo in previous commit. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#16 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#16 (text+ko) ==== @@ -26,12 +26,12 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#15 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#16 $ */ #ifdef __APPLE__ #define _SYS_AUDIT_H /* Prevent include of sys/audit.h. */ -#endf +#endif #include #include From owner-p4-projects@FreeBSD.ORG Wed Feb 8 03:03:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B39B016A423; Wed, 8 Feb 2006 03:03:03 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 74FF116A420 for ; Wed, 8 Feb 2006 03:03:03 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A16C043D46 for ; Wed, 8 Feb 2006 03:02:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1832xGF040684 for ; Wed, 8 Feb 2006 03:02:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1832xZb040681 for perforce@freebsd.org; Wed, 8 Feb 2006 03:02:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Feb 2006 03:02:59 GMT Message-Id: <200602080302.k1832xZb040681@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91367 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2006 03:03:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=91367 Change 91367 by rwatson@rwatson_peppercorn on 2006/02/08 03:02:41 Update change log. Affected files ... .. //depot/projects/trustedbsd/openbsm/CHANGELOG#12 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/CHANGELOG#12 (text+ko) ==== @@ -2,6 +2,13 @@ - Remove "audit" user example from audit_user, as it's not present on most systems. +- Add cannot_audit() function non-Darwin systems that wraps auditon(); + required by OpenSSH BSM support. Convert Darwin cannot_audit() into a + function rather than a macro. +- Library build fixed on Darwin following include file tweaks. The native + Darwin sys/audit.h conflicts with bsm/audit.h due to duplicate types, so + for now we force bsm_wrappers.c to not perform a nested include of + sys/audit.h. OpenBSM 1.0 alpha 3 @@ -87,4 +94,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/CHANGELOG#11 $ +$P4: //depot/projects/trustedbsd/openbsm/CHANGELOG#12 $ From owner-p4-projects@FreeBSD.ORG Wed Feb 8 03:04:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A4A416A420; Wed, 8 Feb 2006 03:04:02 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9314416A420 for ; Wed, 8 Feb 2006 03:04:02 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7DB7B43D45 for ; Wed, 8 Feb 2006 03:04:01 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k18341X3040728 for ; Wed, 8 Feb 2006 03:04:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k18341ak040725 for perforce@freebsd.org; Wed, 8 Feb 2006 03:04:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Feb 2006 03:04:01 GMT Message-Id: <200602080304.k18341ak040725@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91368 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2006 03:04:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=91368 Change 91368 by rwatson@rwatson_peppercorn on 2006/02/08 03:03:39 Integrate OpenBSM branch into TrustedBSD audit3 branch: - Build fixes for Darwin. - cannot_audit() required by OpenSSH. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_user#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#7 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#8 (text+ko) ==== @@ -1,3 +1,15 @@ +OpenBSM 1.0 alpha 4 + +- Remove "audit" user example from audit_user, as it's not present on most + systems. +- Add cannot_audit() function non-Darwin systems that wraps auditon(); + required by OpenSSH BSM support. Convert Darwin cannot_audit() into a + function rather than a macro. +- Library build fixed on Darwin following include file tweaks. The native + Darwin sys/audit.h conflicts with bsm/audit.h due to duplicate types, so + for now we force bsm_wrappers.c to not perform a nested include of + sys/audit.h. + OpenBSM 1.0 alpha 3 - Man page formatting, cross reference, mlinks, and accuracy improvements. @@ -82,4 +94,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#7 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#8 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#3 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#4 $ */ /* * Program to trigger the audit daemon with a message that is either: @@ -40,8 +40,8 @@ * */ +#include #include -#include #include #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#5 (text+ko) ==== @@ -30,14 +30,14 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#4 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#5 $ */ +#include #include #include #include #include -#include #include #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#6 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#5 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#6 $ */ #ifndef _LIBBSM_H_ @@ -44,11 +44,12 @@ #include #include +#include /* Required for audit.h. */ + #include #include #include -#include #ifdef __APPLE__ #include /* audit_token_t */ @@ -871,7 +872,7 @@ __END_DECLS /* OpenSSH compatibility */ -#define cannot_audit(x) (!(au_get_state() == AUC_AUDITING)) +int cannot_audit(int); __BEGIN_DECLS /* ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_user#4 (text+ko) ==== @@ -1,5 +1,4 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_user#3 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_user#4 $ # root:lo:no -audit:fc:no ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#5 (text+ko) ==== @@ -26,15 +26,12 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#4 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#5 $ */ -#ifdef __APPLE__ - /* * Based on sample code from Marc Majka. */ -#include #include /* strerror() */ #include /* errno */ #include @@ -42,6 +39,8 @@ #include /* syslog() */ #include /* syslog() */ +#ifdef __APPLE__ +#include /* If 1, assumes a kernel that sends the right notification. */ #define AUDIT_NOTIFICATION_ENABLED 1 @@ -145,5 +144,25 @@ return (AUC_AUDITING); } } +#endif /* !__APPLE__ */ -#endif /* !__APPLE__ */ +int +cannot_audit(int val __unused) +{ +#ifdef __APPLE__ + return (!(au_get_state() == AUC_AUDITING)); +#else + unsigned long au_cond; + + if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { + if (errno != ENOSYS) { + syslog(LOG_ERR, "Audit status check failed (%s)", + strerror(errno)); + } + return (1); + } + if (au_cond == AUC_NOAUDIT || au_cond == AUC_DISABLED) + return (1); + return (0); +#endif /* !__APPLE__ */ +} ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#7 (text+ko) ==== @@ -26,9 +26,13 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#6 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#7 $ */ +#ifdef __APPLE__ +#define _SYS_AUDIT_H /* Prevent include of sys/audit.h. */ +#endif + #include #include #include From owner-p4-projects@FreeBSD.ORG Wed Feb 8 03:06:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F415716A423; Wed, 8 Feb 2006 03:06:04 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B617616A420 for ; Wed, 8 Feb 2006 03:06:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B04B43D45 for ; Wed, 8 Feb 2006 03:06:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k183640i040992 for ; Wed, 8 Feb 2006 03:06:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k18364m4040989 for perforce@freebsd.org; Wed, 8 Feb 2006 03:06:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Feb 2006 03:06:04 GMT Message-Id: <200602080306.k18364m4040989@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91369 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2006 03:06:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=91369 Change 91369 by rwatson@rwatson_peppercorn on 2006/02/08 03:05:29 Update credits. Affected files ... .. //depot/projects/trustedbsd/openbsm/README#14 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/README#14 (text+ko) ==== @@ -64,6 +64,7 @@ Poul-Henning Kamp Christian Brueffer Olivier Houchard + Christian Peron In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the @@ -85,4 +86,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#13 $ +$P4: //depot/projects/trustedbsd/openbsm/README#14 $ From owner-p4-projects@FreeBSD.ORG Wed Feb 8 07:56:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B750616A423; Wed, 8 Feb 2006 07:56:04 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A71F16A420 for ; Wed, 8 Feb 2006 07:56:04 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 16D6243D6A for ; Wed, 8 Feb 2006 07:55:58 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k187twrW063382 for ; Wed, 8 Feb 2006 07:55:58 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k187twk4063379 for perforce@freebsd.org; Wed, 8 Feb 2006 07:55:58 GMT (envelope-from imp@freebsd.org) Date: Wed, 8 Feb 2006 07:55:58 GMT Message-Id: <200602080755.k187twk4063379@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91376 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2006 07:56:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=91376 Change 91376 by imp@imp_hammer on 2006/02/08 07:55:53 Kill Affected files ... .. //depot/projects/arm/src/sys/dev/mmc/host.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Feb 8 07:56:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB46216A424; Wed, 8 Feb 2006 07:56:05 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 584B716A431 for ; Wed, 8 Feb 2006 07:56:05 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F8AE43D66 for ; Wed, 8 Feb 2006 07:55:58 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k187tv9J063370 for ; Wed, 8 Feb 2006 07:55:58 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k187tvSj063367 for perforce@freebsd.org; Wed, 8 Feb 2006 07:55:57 GMT (envelope-from imp@freebsd.org) Date: Wed, 8 Feb 2006 07:55:57 GMT Message-Id: <200602080755.k187tvSj063367@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91374 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2006 07:56:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=91374 Change 91374 by imp@imp_hammer on 2006/02/08 07:54:57 first start at mmc driver, committed to sync to a different machine for easier work. Affected files ... .. //depot/projects/arm/src/sys/dev/mmc/host.h#1 add .. //depot/projects/arm/src/sys/dev/mmc/mmcbr_if.m#1 add .. //depot/projects/arm/src/sys/dev/mmc/mmcbus_if.h#1 add .. //depot/projects/arm/src/sys/dev/mmc/mmcreg.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Feb 8 07:56:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD31616A42B; Wed, 8 Feb 2006 07:56:06 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7853A16A4A1 for ; Wed, 8 Feb 2006 07:56:06 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8018B43D68 for ; Wed, 8 Feb 2006 07:55:58 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k187twbT063376 for ; Wed, 8 Feb 2006 07:55:58 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k187tw9J063373 for perforce@freebsd.org; Wed, 8 Feb 2006 07:55:58 GMT (envelope-from imp@freebsd.org) Date: Wed, 8 Feb 2006 07:55:58 GMT Message-Id: <200602080755.k187tw9J063373@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91375 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2006 07:56:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=91375 Change 91375 by imp@imp_hammer on 2006/02/08 07:55:33 Ooops, this was supposed to be called bridge.h Affected files ... .. //depot/projects/arm/src/sys/dev/mmc/bridge.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Feb 8 11:18:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3AA716A423; Wed, 8 Feb 2006 11:18:00 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 61E3616A420 for ; Wed, 8 Feb 2006 11:18:00 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 29B1943D45 for ; Wed, 8 Feb 2006 11:18:00 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k18BHxSO080163 for ; Wed, 8 Feb 2006 11:18:00 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k18BHxRk080160 for perforce@freebsd.org; Wed, 8 Feb 2006 11:17:59 GMT (envelope-from soc-andrew@freebsd.org) Date: Wed, 8 Feb 2006 11:17:59 GMT Message-Id: <200602081117.k18BHxRk080160@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 91389 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2006 11:18:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=91389 Change 91389 by soc-andrew@soc-andrew_serv on 2006/02/08 11:17:59 Reorder the work done by release.9 and cdrom.1 to make building other boot types easier. Eg by duplicating $CHROOTDIR/R/stage/bsdinstaller/root/ to a nfs exported location it is possible to netboot the installer. Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#27 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#27 (text+ko) ==== @@ -783,22 +783,19 @@ .if defined(BSDINSTALLER) rm -rf ${RD}/bsdinstaller mkdir ${RD}/bsdinstaller - ( for dir in root usr var ; do \ - mkdir ${RD}/bsdinstaller/$$dir; \ - done ) + mkdir ${RD}/bsdinstaller/root # Copy the files we need in the root - ( for dir in bin etc libexec lib sbin ; do \ + ( for dir in bin boot etc libexec lib sbin usr ; do \ mkdir ${RD}/bsdinstaller/root/$$dir; \ tar --exclude CVS -cf - -C ${RD}/trees/base/$$dir . | \ tar xf - -C ${RD}/bsdinstaller/root/$$dir; \ done ) # Create the needed mount points - ( for dir in dev mnt proc root tmp usr var ; do \ + ( for dir in dev mnt proc root tmp var ; do \ mkdir ${RD}/bsdinstaller/root/$$dir; \ done ) @touch ${RD}/bsdinstaller/root/etc/fstab - ln -s /usr/boot ${RD}/bsdinstaller/root/boot @echo "sendmail_enable=\"NONE\"" > ${RD}/bsdinstaller/root/etc/rc.conf @echo "cron_enable=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf @echo "devd_enable=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf @@ -822,9 +819,6 @@ @echo "bsdinstaller::0:0::0:0:BSD Installer:/root:/bsdinstaller_shell.sh" >> ${RD}/bsdinstaller/master.passwd pwd_mkdb -p -d ${RD}/bsdinstaller/root/etc \ ${RD}/bsdinstaller/master.passwd - sh -e ${DOFS_SH} ${RD}/bsdinstaller/mfsroot ${RD} ${MNT} \ - 20000 ${RD}/bsdinstaller/root ${MFSINODE} auto - @gzip -9fnv ${RD}/bsdinstaller/mfsroot touch ${.TARGET} .else @true @@ -975,12 +969,31 @@ fi \ done .else - ( tar --exclude CVS -cf - -C ${RD}/trees/base/usr . | \ - tar xf - -C ${CD_LIVEFS} ) + # Setup the CD's contents @rm -fr ${CD_LIVEFS}/boot @mkdir ${CD_LIVEFS}/boot - ( tar --exclude CVS -cf - -C ${RD}/trees/base/boot . | \ + ( tar --exclude CVS -cf - -C ${RD}/bsdinstaller/root/usr . | \ + tar xf - -C ${CD_LIVEFS} ) + ( tar --exclude CVS -cf - -C ${RD}/bsdinstaller/root/boot . | \ tar xf - -C ${CD_LIVEFS}/boot ) + + # Create the mfsroot file + @rm -fr ${RD}/bsdinstaller/mfs_root + @mkdir ${RD}/bsdinstaller/mfs_root + ( for dir in bin etc libexec lib sbin ; do \ + mkdir ${RD}/bsdinstaller/mfs_root/$$dir; \ + tar --exclude CVS -cf - -C ${RD}/bsdinstaller/root/$$dir . | \ + tar xf - -C ${RD}/bsdinstaller/mfs_root/$$dir; \ + done ) + ( for dir in dev mnt proc root tmp usr var ; do \ + mkdir ${RD}/bsdinstaller/mfs_root/$$dir; \ + done ) + cp ${.CURDIR}/bsdinstaller/bsdinstaller_shell.sh ${RD}/bsdinstaller/mfs_root/ + chmod u+x ${RD}/bsdinstaller/mfs_root/bsdinstaller_shell.sh + ln -s /usr/boot ${RD}/bsdinstaller/mfs_root/boot + sh -e ${DOFS_SH} ${RD}/bsdinstaller/mfsroot ${RD} ${MNT} \ + 20000 ${RD}/bsdinstaller/mfs_root ${MFSINODE} auto + @gzip -9fnv ${RD}/bsdinstaller/mfsroot .endif @rm -f ${CD_LIVEFS}/.profile @cp ${.CURDIR}/fixit.profile ${CD_LIVEFS}/.profile From owner-p4-projects@FreeBSD.ORG Wed Feb 8 11:51:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C171E16A423; Wed, 8 Feb 2006 11:51:58 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7E5CB16A420 for ; Wed, 8 Feb 2006 11:51:58 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 493C043D5C for ; Wed, 8 Feb 2006 11:51:58 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k18Bpw9D081725 for ; Wed, 8 Feb 2006 11:51:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k18BpwHa081722 for perforce@freebsd.org; Wed, 8 Feb 2006 11:51:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Feb 2006 11:51:58 GMT Message-Id: <200602081151.k18BpwHa081722@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91391 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2006 11:52:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=91391 Change 91391 by rwatson@rwatson_peppercorn on 2006/02/08 11:50:57 Fix program name in usage string. Submitted by: keramida Affected files ... .. //depot/projects/trustedbsd/openbsm/tools/audump.c#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/tools/audump.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/tools/audump.c#4 $ + * $P4: //depot/projects/trustedbsd/openbsm/tools/audump.c#5 $ */ #include @@ -41,7 +41,7 @@ usage(void) { - fprintf(stderr, "usage: dump [class|class_r|control|event|event_r|" + fprintf(stderr, "usage: audump [class|class_r|control|event|event_r|" "user|user_r]\n"); exit(-1); } From owner-p4-projects@FreeBSD.ORG Wed Feb 8 13:11:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 61CDA16A423; Wed, 8 Feb 2006 13:11:38 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0E54D16A420 for ; Wed, 8 Feb 2006 13:11:38 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CB00943D46 for ; Wed, 8 Feb 2006 13:11:37 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k18DBbCJ092462 for ; Wed, 8 Feb 2006 13:11:37 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k18DBbd9092459 for perforce@freebsd.org; Wed, 8 Feb 2006 13:11:37 GMT (envelope-from wsalamon@computer.org) Date: Wed, 8 Feb 2006 13:11:37 GMT Message-Id: <200602081311.k18DBbd9092459@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 91394 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2006 13:11:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=91394 Change 91394 by wsalamon@gretsch on 2006/02/08 13:11:28 Add items about clarifiying the interaction of naflags, current audit state, and what userspace might need to do. Also add item about kernel's audit state indicators. Affected files ... .. //depot/projects/trustedbsd/audit3/notes/TODO_audit.txt#5 edit Differences ... ==== //depot/projects/trustedbsd/audit3/notes/TODO_audit.txt#5 (text+ko) ==== @@ -75,3 +75,18 @@ kernel event mapping. Make the synchronization code a library function in OpenBSM so that the same code can be used in both auditd and the audit test suite. + +- Determine what the correct behavior should be for processes that +are started before audit is enabled: Should they be audited based +on naflags AFTER audit is enabled, or do they not get audited. + +- For programs that set the audit masks for authenticated users +(login, sshd, etc.) need to consider the audit off vs. audit +disabled (a temporary condition) state. Should the flags for +the process be set in the disabled state but not the off state? + +- Review the kernel audit_enabled and audit_suspended flags, making +sure they are used consistently, and they map to the exposed state +(AUC_DISABLED, AUC_AUDITING, and AUC_NOAUDIT). + +- Clearly document whatever is decided for the three items above. From owner-p4-projects@FreeBSD.ORG Wed Feb 8 16:27:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63E0916A423; Wed, 8 Feb 2006 16:27:33 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0B28816A420 for ; Wed, 8 Feb 2006 16:27:33 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B9DBD43D46 for ; Wed, 8 Feb 2006 16:27:32 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k18GRW6b001824 for ; Wed, 8 Feb 2006 16:27:32 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k18GRWGX001821 for perforce@freebsd.org; Wed, 8 Feb 2006 16:27:32 GMT (envelope-from jhb@freebsd.org) Date: Wed, 8 Feb 2006 16:27:32 GMT Message-Id: <200602081627.k18GRWGX001821@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 91395 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2006 16:27:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=91395 Change 91395 by jhb@jhb_slimer on 2006/02/08 16:26:57 Allow the caller of pfs_visible to pass in a pointer to a proc pointer. If they do and a process is found, return with the process locked. This closes some races. Also, treat processes with P_WEXIT set as being non-visible. Affected files ... .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#40 edit Differences ... ==== //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#40 (text+ko) ==== @@ -81,13 +81,14 @@ #endif /* - * Returns non-zero if given file is visible to given process + * Returns non-zero if given file is visible to given process. If the 'p' + * parameter is non-NULL, then it will hold a pointer to the process the + * given file belongs to on return and the process will be locked. */ static int -pfs_visible(struct thread *td, struct pfs_node *pn, pid_t pid) +pfs_visible(struct thread *td, struct pfs_node *pn, pid_t pid, struct proc **p) { struct proc *proc; - int r; PFS_TRACE(("%s (pid: %d, req: %d)", pn->pn_name, pid, td->td_proc->p_pid)); @@ -95,20 +96,27 @@ if (pn->pn_flags & PFS_DISABLED) PFS_RETURN (0); - r = 1; if (pid != NO_PID) { if ((proc = pfind(pid)) == NULL) PFS_RETURN (0); + if (proc->p_flag & P_WEXIT) { + PROC_UNLOCK(proc); + PFS_RETURN (0); + } if (p_cansee(td, proc) != 0 || - (pn->pn_vis != NULL && !(pn->pn_vis)(td, proc, pn))) - r = 0; - /* - * XXX: We might should return with the proc locked to - * avoid some races. - */ - PROC_UNLOCK(proc); - } - PFS_RETURN (r); + (pn->pn_vis != NULL && !(pn->pn_vis)(td, proc, pn))) { + PROC_UNLOCK(proc); + PFS_RETURN (0); + } + if (p) { + /* We return with the process locked to avoid races. */ + *p = proc; + } else + PROC_UNLOCK(proc); + } else + if (p) + *p = NULL; + PFS_RETURN (1); } /* @@ -180,8 +188,9 @@ PFS_TRACE((pn->pn_name)); - if (!pfs_visible(curthread, pn, pvd->pvd_pid)) + if (!pfs_visible(curthread, pn, pvd->pvd_pid, &proc)) PFS_RETURN (ENOENT); + VATTR_NULL(vap); vap->va_type = vn->v_type; @@ -210,9 +219,7 @@ break; } - if (pvd->pvd_pid != NO_PID) { - if ((proc = pfind(pvd->pvd_pid)) == NULL) - PFS_RETURN (ENOENT); + if (proc != NULL) { vap->va_uid = proc->p_ucred->cr_ruid; vap->va_gid = proc->p_ucred->cr_rgid; if (pn->pn_attr != NULL) @@ -235,7 +242,7 @@ struct vnode *vn = va->a_vp; struct pfs_vdata *pvd = (struct pfs_vdata *)vn->v_data; struct pfs_node *pn = pvd->pvd_pn; - struct proc *proc = NULL; + struct proc *proc; int error; PFS_TRACE(("%s: %lx", pn->pn_name, va->a_command)); @@ -250,13 +257,10 @@ * This is necessary because process' privileges may * have changed since the open() call. */ - if (!pfs_visible(curthread, pn, pvd->pvd_pid)) + if (!pfs_visible(curthread, pn, pvd->pvd_pid, &proc)) PFS_RETURN (EIO); - /* XXX duplicates bits of pfs_visible() */ - if (pvd->pvd_pid != NO_PID) { - if ((proc = pfind(pvd->pvd_pid)) == NULL) - PFS_RETURN (EIO); + if (proc != NULL) { _PHOLD(proc); PROC_UNLOCK(proc); } @@ -278,13 +282,16 @@ struct vnode *vn = va->a_vp; struct pfs_vdata *pvd = (struct pfs_vdata *)vn->v_data; struct pfs_node *pn = pvd->pvd_pn; - struct proc *proc = NULL; + struct proc *proc; int error; PFS_TRACE((pn->pn_name)); +#if 0 + /* Umm, no need to call this twice. */ if (!pfs_visible(curthread, pn, pvd->pvd_pid)) PFS_RETURN (ENOENT); +#endif if (pn->pn_getextattr == NULL) PFS_RETURN (EOPNOTSUPP); @@ -293,13 +300,10 @@ * This is necessary because either process' privileges may * have changed since the open() call. */ - if (!pfs_visible(curthread, pn, pvd->pvd_pid)) + if (!pfs_visible(curthread, pn, pvd->pvd_pid, &proc)) PFS_RETURN (EIO); - /* XXX duplicates bits of pfs_visible() */ - if (pvd->pvd_pid != NO_PID) { - if ((proc = pfind(pvd->pvd_pid)) == NULL) - PFS_RETURN (EIO); + if (proc != NULL) { _PHOLD(proc); PROC_UNLOCK(proc); } @@ -351,8 +355,8 @@ if (cnp->cn_namelen >= PFS_NAMELEN) PFS_RETURN (ENOENT); - /* check that parent directory is visisble... */ - if (!pfs_visible(curthread, pd, pvd->pvd_pid)) + /* check that parent directory is visible... */ + if (!pfs_visible(curthread, pd, pvd->pvd_pid, NULL)) PFS_RETURN (ENOENT); /* self */ @@ -408,7 +412,7 @@ got_pnode: if (pn != pd->pn_parent && !pn->pn_parent) pn->pn_parent = pd; - if (!pfs_visible(curthread, pn, pvd->pvd_pid)) { + if (!pfs_visible(curthread, pn, pvd->pvd_pid, NULL)) { error = ENOENT; goto failed; } @@ -451,7 +455,7 @@ * XXX and the only consequence of that race is an EIO further * XXX down the line. */ - if (!pfs_visible(va->a_td, pn, pvd->pvd_pid)) + if (!pfs_visible(va->a_td, pn, pvd->pvd_pid, NULL)) PFS_RETURN (ENOENT); /* check if the requested mode is permitted */ @@ -476,7 +480,7 @@ struct pfs_vdata *pvd = (struct pfs_vdata *)vn->v_data; struct pfs_node *pn = pvd->pvd_pn; struct uio *uio = va->a_uio; - struct proc *proc = NULL; + struct proc *proc; struct sbuf *sb = NULL; int error; unsigned int buflen, offset, resid; @@ -496,13 +500,10 @@ * This is necessary because either process' privileges may * have changed since the open() call. */ - if (!pfs_visible(curthread, pn, pvd->pvd_pid)) + if (!pfs_visible(curthread, pn, pvd->pvd_pid, &proc)) PFS_RETURN (EIO); - /* XXX duplicates bits of pfs_visible() */ - if (pvd->pvd_pid != NO_PID) { - if ((proc = pfind(pvd->pvd_pid)) == NULL) - PFS_RETURN (EIO); + if (proc != NULL) { _PHOLD(proc); PROC_UNLOCK(proc); } @@ -558,7 +559,7 @@ pfs_iterate(struct thread *td, pid_t pid, struct pfs_node *pd, struct pfs_node **pn, struct proc **p) { - sx_assert(&allproc_lock, SX_LOCKED); + sx_assert(&allproc_lock, SX_SLOCKED); again: if (*pn == NULL) { /* first node */ @@ -581,7 +582,7 @@ if ((*pn) == NULL) return (-1); - if (!pfs_visible(td, *pn, *p ? (*p)->p_pid : pid)) + if (!pfs_visible(td, *pn, *p ? (*p)->p_pid : pid, NULL)) goto again; return (0); @@ -613,7 +614,7 @@ uio = va->a_uio; /* check if the directory is visible to the caller */ - if (!pfs_visible(curthread, pd, pid)) + if (!pfs_visible(curthread, pd, pid, NULL)) PFS_RETURN (ENOENT); /* only allow reading entire entries */ @@ -713,6 +714,10 @@ if (pvd->pvd_pid != NO_PID) { if ((proc = pfind(pvd->pvd_pid)) == NULL) PFS_RETURN (EIO); + if (proc->p_flag & P_WEXIT) { + PROC_UNLOCK(proc); + PFS_RETURN (EIO); + } _PHOLD(proc); PROC_UNLOCK(proc); } @@ -768,7 +773,7 @@ struct pfs_vdata *pvd = (struct pfs_vdata *)vn->v_data; struct pfs_node *pn = pvd->pvd_pn; struct uio *uio = va->a_uio; - struct proc *proc = NULL; + struct proc *proc; struct sbuf sb; int error; @@ -787,13 +792,10 @@ * This is necessary because either process' privileges may * have changed since the open() call. */ - if (!pfs_visible(curthread, pn, pvd->pvd_pid)) + if (!pfs_visible(curthread, pn, pvd->pvd_pid, &proc)) PFS_RETURN (EIO); - /* XXX duplicates bits of pfs_visible() */ - if (pvd->pvd_pid != NO_PID) { - if ((proc = pfind(pvd->pvd_pid)) == NULL) - PFS_RETURN (EIO); + if (proc != NULL) { _PHOLD(proc); PROC_UNLOCK(proc); } From owner-p4-projects@FreeBSD.ORG Wed Feb 8 16:29:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15A9816A423; Wed, 8 Feb 2006 16:29:36 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E49B616A420 for ; Wed, 8 Feb 2006 16:29:35 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AFFE743D45 for ; Wed, 8 Feb 2006 16:29:35 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k18GTZJO001945 for ; Wed, 8 Feb 2006 16:29:35 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k18GTZWF001942 for perforce@freebsd.org; Wed, 8 Feb 2006 16:29:35 GMT (envelope-from jhb@freebsd.org) Date: Wed, 8 Feb 2006 16:29:35 GMT Message-Id: <200602081629.k18GTZWF001942@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 91396 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2006 16:29:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=91396 Change 91396 by jhb@jhb_slimer on 2006/02/08 16:28:49 Don't block waiting on _PRELE's until after we've woken up any procfs waiters. Affected files ... .. //depot/projects/smpng/sys/kern/kern_exit.c#110 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_exit.c#110 (text+ko) ==== @@ -175,13 +175,6 @@ p->p_flag |= P_WEXIT; - /* - * Wait for any processes that have a hold on our vmspace to - * release their reference. - */ - while (p->p_lock > 0) - msleep(&p->p_lock, &p->p_mtx, PWAIT, "exithold", 0); - PROC_LOCK(p->p_pptr); sigqueue_take(p->p_ksi); PROC_UNLOCK(p->p_pptr); @@ -205,7 +198,21 @@ PROC_LOCK(p); _STOPEVENT(p, S_EXIT, rv); - wakeup(&p->p_stype); /* Wakeup anyone in procfs' PIOCWAIT */ + + /* + * Wakeup anyone in procfs' PIOCWAIT. They should have a hold + * on our vmspace, so we should block below until they have + * released their reference to us. + */ + wakeup(&p->p_stype); + + /* + * Wait for any processes that have a hold on our vmspace to + * release their reference. + */ + while (p->p_lock > 0) + msleep(&p->p_lock, &p->p_mtx, PWAIT, "exithold", 0); + PROC_UNLOCK(p); /* From owner-p4-projects@FreeBSD.ORG Wed Feb 8 16:55:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B9EB16A423; Wed, 8 Feb 2006 16:55:08 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B7F7016A420 for ; Wed, 8 Feb 2006 16:55:07 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7CD6543D45 for ; Wed, 8 Feb 2006 16:55:07 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k18Gt76i010337 for ; Wed, 8 Feb 2006 16:55:07 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k18Gt7Hp010334 for perforce@freebsd.org; Wed, 8 Feb 2006 16:55:07 GMT (envelope-from jhb@freebsd.org) Date: Wed, 8 Feb 2006 16:55:07 GMT Message-Id: <200602081655.k18Gt7Hp010334@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 91398 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2006 16:55:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=91398 Change 91398 by jhb@jhb_slimer on 2006/02/08 16:54:49 - Add P_WEXIT checks to ptrace() and act like the process doesn't exist if P_WEXIT is set. - Remove unneeded PHOLD's from PT_SUSPEND, PT_RESUME, and PT_LWPINFO. - Don't drop proc lock around ptrace_single_step for PT_STEP since we don't for PT_SETSTEP. - Add missing PHOLD's for PT_{READ,WRITE}_[ID], PT_IO, and PT_GETLWPLIST. - Don't leak the proc lock if PT_LWPINFO fails with EINVAL. Affected files ... .. //depot/projects/smpng/sys/i386/linux/linux_ptrace.c#13 edit .. //depot/projects/smpng/sys/kern/sys_process.c#48 edit Differences ... ==== //depot/projects/smpng/sys/i386/linux/linux_ptrace.c#13 (text+ko) ==== @@ -356,6 +356,12 @@ break; } + /* Exiting processes can't be debugged. */ + if ((p->p_flag & P_WEXIT) != 0) { + error = ESRCH; + goto fail; + } + if ((error = p_candebug(td, p)) != 0) goto fail; ==== //depot/projects/smpng/sys/kern/sys_process.c#48 (text+ko) ==== @@ -551,6 +551,11 @@ pid = p->p_pid; } } + + if ((p->p_flag & P_WEXIT) != 0) { + error = ESRCH; + goto fail; + } if ((error = p_cansee(td, p)) != 0) goto fail; @@ -712,20 +717,16 @@ return (0); case PT_SUSPEND: - _PHOLD(p); mtx_lock_spin(&sched_lock); td2->td_flags |= TDF_DBSUSPEND; mtx_unlock_spin(&sched_lock); - _PRELE(p); PROC_UNLOCK(p); return (0); case PT_RESUME: - _PHOLD(p); mtx_lock_spin(&sched_lock); td2->td_flags &= ~TDF_DBSUSPEND; mtx_unlock_spin(&sched_lock); - _PRELE(p); PROC_UNLOCK(p); return (0); @@ -745,13 +746,11 @@ switch (req) { case PT_STEP: - PROC_UNLOCK(p); error = ptrace_single_step(td2); if (error) { - PRELE(p); - goto fail_noproc; + _PRELE(p); + goto fail; } - PROC_LOCK(p); break; case PT_TO_SCE: p->p_stops |= S_PT_SCE; @@ -844,6 +843,7 @@ /* FALLTHROUGH */ case PT_READ_I: case PT_READ_D: + _PHOLD(p); PROC_UNLOCK(p); tmp = 0; /* write = 0 set above */ @@ -857,6 +857,7 @@ uio.uio_rw = write ? UIO_WRITE : UIO_READ; uio.uio_td = td; error = proc_rwmem(p, &uio); + PRELE(p); if (uio.uio_resid != 0) { /* * XXX proc_rwmem() doesn't currently return ENOSPC, @@ -875,6 +876,7 @@ return (error); case PT_IO: + _PHOLD(p); PROC_UNLOCK(p); #ifdef COMPAT_IA32 if (wrap32) { @@ -911,9 +913,11 @@ uio.uio_rw = UIO_WRITE; break; default: + PRELE(p); return (EINVAL); } error = proc_rwmem(p, &uio); + PRELE(p); #ifdef COMPAT_IA32 if (wrap32) piod32->piod_len -= uio.uio_resid; @@ -969,10 +973,11 @@ return (error); case PT_LWPINFO: - if (data == 0 || data > sizeof(*pl)) - return (EINVAL); + if (data == 0 || data > sizeof(*pl)) { + error = EINVAL; + goto fail; + } pl = addr; - _PHOLD(p); pl->pl_lwpid = td2->td_tid; if (td2->td_flags & TDF_XSIG) pl->pl_event = PL_EVENT_SIGNAL; @@ -985,7 +990,6 @@ } else { pl->pl_flags = 0; } - _PRELE(p); PROC_UNLOCK(p); return (0); @@ -996,10 +1000,11 @@ case PT_GETLWPLIST: if (data <= 0) { - PROC_UNLOCK(p); - return (EINVAL); + error = EINVAL; + goto fail; } num = imin(p->p_numthreads, data); + _PHOLD(p); PROC_UNLOCK(p); buf = malloc(num * sizeof(lwpid_t), M_TEMP, M_WAITOK); tmp = 0; @@ -1011,6 +1016,7 @@ buf[tmp++] = td2->td_tid; } mtx_unlock_spin(&sched_lock); + _PRELE(p); PROC_UNLOCK(p); error = copyout(buf, addr, tmp * sizeof(lwpid_t)); free(buf, M_TEMP); From owner-p4-projects@FreeBSD.ORG Wed Feb 8 19:23:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 28FE016A420; Wed, 8 Feb 2006 19:23:06 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9994416A420 for ; Wed, 8 Feb 2006 19:23:06 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 63DEC43D49 for ; Wed, 8 Feb 2006 19:23:06 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k18JN6IA016406 for ; Wed, 8 Feb 2006 19:23:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k18JN6s9016403 for perforce@freebsd.org; Wed, 8 Feb 2006 19:23:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Feb 2006 19:23:06 GMT Message-Id: <200602081923.k18JN6s9016403@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91401 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2006 19:23:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=91401 Change 91401 by rwatson@rwatson_peppercorn on 2006/02/08 19:22:46 Initialize user process audit ID to AU_DEFAUDITID so that init and its pre-authentication children are covered by naflags. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#13 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#13 (text+ko) ==== @@ -1061,6 +1061,7 @@ p->p_pid)); //printf("audit_proc_init: pid %d p_au %p\n", p->p_pid, p->p_au); bzero(p->p_au, sizeof(*(p)->p_au)); + p->p_au->ai_auid = AU_DEFAUDITID; } /* From owner-p4-projects@FreeBSD.ORG Wed Feb 8 23:08:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0EBF716A423; Wed, 8 Feb 2006 23:08:40 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DBCA416A420 for ; Wed, 8 Feb 2006 23:08:39 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A60C243D45 for ; Wed, 8 Feb 2006 23:08:39 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k18N8dZh037333 for ; Wed, 8 Feb 2006 23:08:39 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k18N8dvr037330 for perforce@freebsd.org; Wed, 8 Feb 2006 23:08:39 GMT (envelope-from soc-andrew@freebsd.org) Date: Wed, 8 Feb 2006 23:08:39 GMT Message-Id: <200602082308.k18N8dvr037330@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 91406 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2006 23:08:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=91406 Change 91406 by soc-andrew@soc-andrew_serv on 2006/02/08 23:08:37 Update the comment on what release.9 is for Only put /etc/rc.d/bsdinstaller on the CD as it is used to mount /usr from a CD device Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#28 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#28 (text+ko) ==== @@ -778,7 +778,7 @@ @true .endif -# Build the BSD Installer mfs images +# Build the BSD Installer File system release.9: .if defined(BSDINSTALLER) rm -rf ${RD}/bsdinstaller @@ -813,8 +813,6 @@ @mkdir -p ${RD}/bsdinstaller/root/var/tmp cp ${.CURDIR}/bsdinstaller/bsdinstaller_shell.sh ${RD}/bsdinstaller/root/ chmod u+x ${RD}/bsdinstaller/root/bsdinstaller_shell.sh - cp ${.CURDIR}/bsdinstaller/bsdinstaller ${RD}/bsdinstaller/root/etc/rc.d/ - chmod u+x ${RD}/bsdinstaller/root/etc/rc.d/bsdinstaller cp ${RD}/bsdinstaller/root/etc/master.passwd ${RD}/bsdinstaller/master.passwd @echo "bsdinstaller::0:0::0:0:BSD Installer:/root:/bsdinstaller_shell.sh" >> ${RD}/bsdinstaller/master.passwd pwd_mkdb -p -d ${RD}/bsdinstaller/root/etc \ @@ -988,6 +986,8 @@ ( for dir in dev mnt proc root tmp usr var ; do \ mkdir ${RD}/bsdinstaller/mfs_root/$$dir; \ done ) + cp ${.CURDIR}/bsdinstaller/bsdinstaller ${RD}/bsdinstaller/mfs_root/etc/rc.d/ + chmod u+x ${RD}/bsdinstaller/mfs_root/etc/rc.d/bsdinstaller cp ${.CURDIR}/bsdinstaller/bsdinstaller_shell.sh ${RD}/bsdinstaller/mfs_root/ chmod u+x ${RD}/bsdinstaller/mfs_root/bsdinstaller_shell.sh ln -s /usr/boot ${RD}/bsdinstaller/mfs_root/boot From owner-p4-projects@FreeBSD.ORG Thu Feb 9 17:12:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F266216A423; Thu, 9 Feb 2006 17:12:49 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B0A8416A420 for ; Thu, 9 Feb 2006 17:12:49 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B58D43D45 for ; Thu, 9 Feb 2006 17:12:49 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19HCn7E018626 for ; Thu, 9 Feb 2006 17:12:49 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19HCnPU018623 for perforce@freebsd.org; Thu, 9 Feb 2006 17:12:49 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 9 Feb 2006 17:12:49 GMT Message-Id: <200602091712.k19HCnPU018623@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 91425 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 17:12:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=91425 Change 91425 by deker@deker_build1.columbia.sparta.com on 2006/02/09 17:12:13 Addition of MiG sample client/server. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/examples/mig/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/examples/mig/mclient.c#1 add .. //depot/projects/trustedbsd/sedarwin7/examples/mig/mserver.c#1 add .. //depot/projects/trustedbsd/sedarwin7/examples/mig/mtest.defs#1 add .. //depot/projects/trustedbsd/sedarwin7/examples/mig/mtest.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Feb 9 17:13:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8EEE16A423; Thu, 9 Feb 2006 17:13:51 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 68DCA16A420 for ; Thu, 9 Feb 2006 17:13:51 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 25C6643D46 for ; Thu, 9 Feb 2006 17:13:51 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19HDp8G018773 for ; Thu, 9 Feb 2006 17:13:51 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19HDoJ9018770 for perforce@freebsd.org; Thu, 9 Feb 2006 17:13:50 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 9 Feb 2006 17:13:50 GMT Message-Id: <200602091713.k19HDoJ9018770@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 91426 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 17:13:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=91426 Change 91426 by deker@deker_build1.columbia.sparta.com on 2006/02/09 17:13:32 Add README for MiG sample client/server Affected files ... .. //depot/projects/trustedbsd/sedarwin7/docs/README.mtest#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Feb 9 17:26:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 755FF16A423; Thu, 9 Feb 2006 17:26:09 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3084916A422 for ; Thu, 9 Feb 2006 17:26:09 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA34C43D55 for ; Thu, 9 Feb 2006 17:26:06 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19HQ6qv021347 for ; Thu, 9 Feb 2006 17:26:06 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19HQ6CW021334 for perforce@freebsd.org; Thu, 9 Feb 2006 17:26:06 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 9 Feb 2006 17:26:06 GMT Message-Id: <200602091726.k19HQ6CW021334@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 91427 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 17:26:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=91427 Change 91427 by deker@deker_build1.columbia.sparta.com on 2006/02/09 17:25:28 Add sources for darwin netinfo package. This contains modifications to notifyd which make it security aware. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/NetInfo.strings#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/FF/CustomInfo.plist#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/FF/FF.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/FF/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/FF/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/FF/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/FF/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/NI/CustomInfo.plist#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/NI/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/NI/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/NI/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/NI/NI.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/NI/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/NIS/CustomInfo.plist#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/NIS/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/NIS/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/NIS/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/NIS/NIS.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/NIS/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/SI/CustomInfo.plist#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/SI/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/SI/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/SI/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/SI/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/agents/SI/SI.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/CustomInfo.plist#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/DynaAPI.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/_lu_types.x#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/clib.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/config.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dsassertion.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dsassertion.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dsattribute.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dsattribute.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dscache.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dscache.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dsdata.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dsdata.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dsengine.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dsengine.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dsfilter.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dsfilter.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dsindex.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dsindex.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dsrecord.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dsrecord.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dsreference.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dsreference.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dsstatus.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dsstatus.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dsstore.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dsstore.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dsutil.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dsutil.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dsx500.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dsx500.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dsx500dit.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/dsx500dit.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/ffparser.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/ffparser.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/lookup.defs#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/mk_version#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/mm.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/network.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/network.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/ni_prot.x#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/ni_shared.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/ni_shared.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/nibind_prot.x#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/nilib2.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/nilib2.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/nistore.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/nistore.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/os.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/rparent.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/rpc_extra.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/rpc_extra.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/socket_lock.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/socket_lock.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/syslock.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/syslock.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/system.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/system.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/system_log.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/system_log.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/systhread.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/systhread.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/utf-8.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/common/utf-8.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/base64.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/dns.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/dns.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/dns_async.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/dns_private.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/dns_util.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/dns_util.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/dst.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/dst_api.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/dst_hmac_link.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/dst_internal.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/dst_support.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/nameser.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/ns_date.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/ns_name.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/ns_netint.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/ns_parse.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/ns_print.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/ns_samedomain.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/ns_sign.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/ns_ttl.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/ns_verify.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/res_comp.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/res_data.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/res_debug.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/res_debug.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/res_findzonecut.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/res_init.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/res_mkquery.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/res_mkupdate.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/res_private.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/res_query.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/res_send.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/res_sendsigned.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/res_update.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/res_update.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/resolv.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/resolver/resolver.5#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/CacheAgent.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/CacheAgent.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/Config.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/Config.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/Controller.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/Controller.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/DNSAgent.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/DNSAgent.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/Dyna.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/Dyna.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/Interactive.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/LUAgent.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/LUAgent.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/LUArray.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/LUArray.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/LUCache.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/LUCache.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/LUCachedDictionary.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/LUDictionary.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/LUDictionary.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/LUGlobal.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/LUPrivate.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/LUServer.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/LUServer.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/MachRPC.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/MachRPC.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/MemoryWatchdog.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/MemoryWatchdog.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/NILAgent.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/NILAgent.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/Root.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/Root.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/Thread.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/Thread.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/_lu_types.x#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/lookup.defs#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/lookup_proc.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/lookupd.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/lookupd.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/lookupd.plist#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/lu_xdr.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/lu_xdr.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/nettoa.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/sys.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/lookupd/sys.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/alert.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/alert.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/atomicio.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/bsd-base64.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/bsd-base64.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/bufaux.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/bufaux.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/buffer.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/buffer.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/cipher.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/cipher.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/compat.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/dsa.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/dsa.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/entropy.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/entropy.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/event.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/event.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/fake-socket.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/getput.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/getstuff.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/getstuff.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/index.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/index.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/index_manager.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/index_manager.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/kex.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/key.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/key.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/listops.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/listops.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/multi_call.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/multi_call.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/netinfod.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/ni.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/ni_dir.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/ni_dir.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/ni_file.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/ni_file.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/ni_globals.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/ni_globals.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/ni_lookupprop.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/ni_main.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/ni_notify.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/ni_notify.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/ni_prot.x#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/ni_prot_proc.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/ni_server.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/ni_svc_run.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/nibind_prot.x#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/proxy_pids.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/proxy_pids.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/psauth.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/psauth.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/ranstrcmp.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/ranstrcmp.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/readall.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/readconf.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/rpcgen_HACK.sed#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/rsa.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/rsa.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/safe_stdio.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/safe_stdio.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/sanitycheck.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/sanitycheck.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/shauth.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/shauth.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/ssh.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/strstore.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/strstore.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/uuencode.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/uuencode.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/xmalloc.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/netinfod/xmalloc.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/nibindd/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/nibindd/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/nibindd/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/nibindd/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/nibindd/nibind_globals.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/nibindd/nibind_globals.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/nibindd/nibind_main.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/nibindd/nibind_prot.x#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/nibindd/nibind_prot_proc.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/nibindd/nibindd.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/nibindd/rpcgen_HACK.sed#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/notifyd/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/notifyd/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/notifyd/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/notifyd/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/notifyd/common.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/notifyd/daemon.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/notifyd/daemon.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/notifyd/file_watcher.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/notifyd/file_watcher.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/notifyd/notify.conf#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/notifyd/notify_ipc.defs#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/notifyd/notify_ipc_types.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/notifyd/notify_proc.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/notifyd/notifyd.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/notifyd/notifyd.plist#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/notifyd/service.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/notifyd/service.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/notifyd/table.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/notifyd/w_event.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/notifyd/w_event.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/notifyd/watcher.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/servers/notifyd/watcher.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/mkslapdconf/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/mkslapdconf/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/mkslapdconf/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/mkslapdconf/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/mkslapdconf/mkslapdconf.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/mkslapdconf/mkslapdconf.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nicl/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nicl/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nicl/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nicl/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nicl/ni_prot.x#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nicl/nibind_prot.x#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nicl/nicl.1#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nicl/nicl.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nidomain/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nidomain/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nidomain/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nidomain/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nidomain/nibind_glue.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nidomain/nibind_glue.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nidomain/nibind_prot.x#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nidomain/nidomain.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nidomain/nidomain.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nidump/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nidump/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nidump/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nidump/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nidump/nidump.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nidump/nidump.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nifind/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nifind/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nifind/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nifind/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nifind/nifind.1#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nifind/nifind.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nigrep/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nigrep/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nigrep/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nigrep/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nigrep/nigrep.1#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nigrep/nigrep.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/niload/FFParser.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/niload/FFParser.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/niload/LUArray.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/niload/LUArray.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/niload/LUDictionary.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/niload/LUDictionary.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/niload/LUGlobal.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/niload/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/niload/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/niload/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/niload/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/niload/nettoa.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/niload/niload.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/niload/niload.m#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/niload/print.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/niload/print.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/niload/raw_load.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nireport/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nireport/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nireport/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nireport/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nireport/nireport.1#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/nireport/nireport.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/niutil/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/niutil/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/niutil/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/niutil/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/niutil/nibind_prot.x#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/niutil/niutil.1#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/netinfo/tools/niutil/niutil.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Feb 9 17:33:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 61C8316A423; Thu, 9 Feb 2006 17:33:16 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0758B16A420 for ; Thu, 9 Feb 2006 17:33:16 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7AE1143D48 for ; Thu, 9 Feb 2006 17:33:15 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19HXF87023937 for ; Thu, 9 Feb 2006 17:33:15 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19HXFGh023934 for perforce@freebsd.org; Thu, 9 Feb 2006 17:33:15 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 9 Feb 2006 17:33:15 GMT Message-Id: <200602091733.k19HXFGh023934@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 91428 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 17:33:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=91428 Change 91428 by deker@deker_build1.columbia.sparta.com on 2006/02/09 17:32:15 Update to reflect loadpolicy changes. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/docs/apiabi.txt#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/docs/apiabi.txt#4 (text+ko) ==== @@ -385,9 +385,9 @@ Check a policy for correctness and convert to binary format. -loadpolicy(8) +sebsd_loadpolicy(8) -XXX - not yet supported. +Loads or reloads the specified binary format policy. sebsd_newrole(8) From owner-p4-projects@FreeBSD.ORG Thu Feb 9 18:09:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E70C116A423; Thu, 9 Feb 2006 18:09:00 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C0E4216A420 for ; Thu, 9 Feb 2006 18:09:00 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 93DCE43D48 for ; Thu, 9 Feb 2006 18:09:00 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19I90Qt025272 for ; Thu, 9 Feb 2006 18:09:00 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19I90E1025269 for perforce@freebsd.org; Thu, 9 Feb 2006 18:09:00 GMT (envelope-from jhb@freebsd.org) Date: Thu, 9 Feb 2006 18:09:00 GMT Message-Id: <200602091809.k19I90E1025269@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 91432 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 18:09:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=91432 Change 91432 by jhb@jhb_slimer on 2006/02/09 18:08:03 Use the single pfs_visible() call in pfs_getextattr() that des@ prefers. Affected files ... .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#41 edit Differences ... ==== //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#41 (text+ko) ==== @@ -287,15 +287,6 @@ PFS_TRACE((pn->pn_name)); -#if 0 - /* Umm, no need to call this twice. */ - if (!pfs_visible(curthread, pn, pvd->pvd_pid)) - PFS_RETURN (ENOENT); -#endif - - if (pn->pn_getextattr == NULL) - PFS_RETURN (EOPNOTSUPP); - /* * This is necessary because either process' privileges may * have changed since the open() call. @@ -303,6 +294,12 @@ if (!pfs_visible(curthread, pn, pvd->pvd_pid, &proc)) PFS_RETURN (EIO); + if (pn->pn_getextattr == NULL) { + if (proc != NULL) + PROC_UNLOCK(proc); + PFS_RETURN (EOPNOTSUPP); + } + if (proc != NULL) { _PHOLD(proc); PROC_UNLOCK(proc); From owner-p4-projects@FreeBSD.ORG Thu Feb 9 18:09:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C8F416A432; Thu, 9 Feb 2006 18:09:01 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 474F516A449 for ; Thu, 9 Feb 2006 18:09:01 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E3A6B43D49 for ; Thu, 9 Feb 2006 18:09:00 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19I90v4025282 for ; Thu, 9 Feb 2006 18:09:00 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19I90Xd025275 for perforce@freebsd.org; Thu, 9 Feb 2006 18:09:00 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 9 Feb 2006 18:09:00 GMT Message-Id: <200602091809.k19I90Xd025275@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 91433 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 18:09:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=91433 Change 91433 by deker@deker_build1.columbia.sparta.com on 2006/02/09 18:08:06 Incorporate changes to ps to track login context. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/adv_cmds/ps.tproj/keyword.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/adv_cmds/ps.tproj/print.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/adv_cmds/ps.tproj/ps.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/adv_cmds/ps.tproj/keyword.c#3 (text+ko) ==== @@ -1,4 +1,6 @@ /*- + * Copyright (c) 2005 SPARTA, Inc. + * * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. * ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/adv_cmds/ps.tproj/print.c#3 (text+ko) ==== @@ -1,4 +1,6 @@ /*- + * Copyright (c) 2005 SPARTA, Inc. + * * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. * ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/adv_cmds/ps.tproj/ps.c#3 (text+ko) ==== @@ -1,4 +1,6 @@ /*- + * Copyright (c) 2005 SPARTA, Inc. + * * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. * From owner-p4-projects@FreeBSD.ORG Thu Feb 9 18:11:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 70E3E16A424; Thu, 9 Feb 2006 18:11:05 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 45DD816A420 for ; Thu, 9 Feb 2006 18:11:05 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F246F43D48 for ; Thu, 9 Feb 2006 18:11:03 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19IB3xv025454 for ; Thu, 9 Feb 2006 18:11:03 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19IB371025451 for perforce@freebsd.org; Thu, 9 Feb 2006 18:11:03 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 9 Feb 2006 18:11:03 GMT Message-Id: <200602091811.k19IB371025451@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 91434 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 18:11:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=91434 Change 91434 by deker@deker_build1.columbia.sparta.com on 2006/02/09 18:10:49 Updates to build instructions: - McAfee -> SPARTA - updated to reflect policy module name change - updated PAM config info - misc small changes Affected files ... .. //depot/projects/trustedbsd/sedarwin7/docs/build-instructions.txt#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/docs/build-instructions.txt#3 (text+ko) ==== @@ -6,7 +6,7 @@ Install Mac OS X 10.3.8 using the directions found in system-setup.txt. - If working within the McAfee Research development environment, install + If working within the SPARTA ISSO development environment, install Perforce and configure the Perforce client using the directions found in perforce-client.txt. @@ -17,7 +17,7 @@ Step 2: Check out source tree In this step, check the source tree out of Perforce, or untar the - distribution tarball. If working within the McAfee Research development + distribution tarball. If working within the SPARTA ISSO development environment, check out the source code using the directions found in perforce-checkout.txt. @@ -137,7 +137,7 @@ the older modules will be incompatible. Remove the appropriate KEXT bundles from /System/Library/Extensions. For example: - $ sudo rm -rf /System/Library/Extensions/sedarwin.kext + $ sudo rm -rf /System/Library/Extensions/mac_sedarwin.kext $ sudo rm -rf /System/Library/Extensions/mac_test.kext @@ -191,13 +191,13 @@ Step 11: Update PAM configuration - Add the following line: + Copy the SEDarwin versions of the sshd and login pam configuration files + and modify them as necessary for your site. - session required pam_lctx.so + $ sudo cp /etc/pam.d/sshd.sedarwin /etc/pam.d/sshd + $ sudo cp /etc/pam.d/login.sedarwin /etc/pam.d/login - at the end of the /etc/pam.d/login and /etc/pam.d/sshd files. - -Step 12(a): Create Extended Attribute File (SEDarwin only) +Step 12: Create Extended Attribute File The distribution includes a shell script that creates an extended attribute backing file for the SEDarwin policy module. Run the script: @@ -215,15 +215,6 @@ 256 /Volumes/Spare/.attribute/system/sebsd -Step 12(b): Create Extended Attribute File (MLS only) - - Run the following two commands to allocate storage space for MLS - labels on the root file system. - - $ sudo mkdir -p /.attribute/system - $ sudo extattrctl initattr -p / 112 /.attribute/system/mac_mls - - Step 13: Configure Policy path (SEDarwin only) The system boot loader needs to know where the SEDarwin policy file is @@ -253,20 +244,20 @@ user will be unable to login. -Step 14: Reboot in Single User Mode (SEDarwin only) +Step 14: Reboot in Single User Mode At this point, you should now have a new Darwin kernel, support libraries, command line tools, and configuration files installed. Reboot to single-user mode by holding down Command-S during the boot. Check the file system and mount the root file system writable: - $ /sbin/fsck -y - $ /sbin/mount -uw / + # /sbin/fsck -y + # /sbin/mount -uw / Now set the label on various binaries so they can transition during system startup: - $ sudo /etc/sedarwin/sebsd-relabel.sh + # /etc/sedarwin/sebsd-relabel.sh Missing this step will result in the login window failing to start, login attempts failing, or the entire system not working if enforcing @@ -289,12 +280,16 @@ Step 16: Verify System Functionality - When you log in to the system - After booting and logging into the system, verify that you have booted - to the correct kernel by running 'uname -a'. + After rebooting, log in on the graphical console. After you have + entered your password you will be presented with an additional + menu where you may select from your available intial security + contexts. If your username is not listed in the + /etc/sedarwin/policy/users file, the security context listed in + /etc/sedarwin/failsafe_context will be used. + + After you have logged in, you can run 'kextstat' to verify that + the selected security modules have been loaded: - You can run 'kextstat' to verify that the selected security modules - have been loaded: $ kextstat |head Index Refs Address Size Wired Name (Version) 1 1 0x5ec9000 0x19000 0x18000 security.sedarwin (*) From owner-p4-projects@FreeBSD.ORG Thu Feb 9 18:14:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8194016A426; Thu, 9 Feb 2006 18:14:09 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 40C7616A423 for ; Thu, 9 Feb 2006 18:14:09 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E48743D5A for ; Thu, 9 Feb 2006 18:14:08 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19IE8ud025558 for ; Thu, 9 Feb 2006 18:14:08 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19IE8ha025555 for perforce@freebsd.org; Thu, 9 Feb 2006 18:14:08 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 9 Feb 2006 18:14:08 GMT Message-Id: <200602091814.k19IE8ha025555@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 91435 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 18:14:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=91435 Change 91435 by deker@deker_build1.columbia.sparta.com on 2006/02/09 18:13:50 update master Darwin Makefile to support notifyd and pam_lctx Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/Makefile#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/Makefile#7 (text+ko) ==== @@ -19,8 +19,9 @@ cd mach_cmds && gnumake cd top && make cd bsm/bsm/lib && gnumake - cd pam_modules/pam_lctx && gnumake + gnumake -C pam_modules/pam_lctx cd system_cmds/mach_init.tproj && gnumake + cd netinfo/servers/notifyd && gnumake cd OpenSSH && gnumake install: @@ -40,8 +41,9 @@ cd mach_cmds && gnumake install cd top && make install cd bsm/bsm/lib && gnumake install - cd pam_modules/pam_lctx && gnumake DSTROOT=$(DESTDIR) install + gnumake -C pam_modules/pam_lctx DSTROOT=$(DESTDIR) install cd system_cmds/mach_init.tproj && gnumake install + cd netinfo/servers/notifyd && gnumake install cd OpenSSH && gnumake install clean: @@ -61,7 +63,8 @@ cd mach_cmds && gnumake clean cd top && make clean cd bsm/bsm/lib && gnumake clean - cd pam_modules/pam_lctx && gnumake clean + gnumake -C pam_modules/pam_lctx clean cd system_cmds/mach_init.tproj && gnumake clean + cd netinfo/servers/notifyd && gnumake clean cd OpenSSH && gnumake clean rm -rf build/obj From owner-p4-projects@FreeBSD.ORG Thu Feb 9 18:16:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A3A816A423; Thu, 9 Feb 2006 18:16:11 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C6B916A420 for ; Thu, 9 Feb 2006 18:16:11 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F44343D48 for ; Thu, 9 Feb 2006 18:16:11 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19IGBSe025751 for ; Thu, 9 Feb 2006 18:16:11 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19IGAow025748 for perforce@freebsd.org; Thu, 9 Feb 2006 18:16:10 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 9 Feb 2006 18:16:10 GMT Message-Id: <200602091816.k19IGAow025748@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 91436 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 18:16:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=91436 Change 91436 by deker@deker_build1.columbia.sparta.com on 2006/02/09 18:15:09 Update sshd_config to use PAM by default Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/OpenSSH/openssh/sshd_config#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/OpenSSH/openssh/sshd_config#4 (text+ko) ==== @@ -73,7 +73,7 @@ # Set this to 'yes' to enable PAM authentication (via challenge-response) # and session processing. Depending on your PAM configuration, this may # bypass the setting of 'PasswordAuthentication' and 'PermitEmptyPasswords' -#UsePAM no +UsePAM yes #AllowTcpForwarding yes #GatewayPorts no From owner-p4-projects@FreeBSD.ORG Thu Feb 9 18:21:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6DF9416A424; Thu, 9 Feb 2006 18:21:18 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 310F416A422 for ; Thu, 9 Feb 2006 18:21:18 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE92043D45 for ; Thu, 9 Feb 2006 18:21:17 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19ILH9I025966 for ; Thu, 9 Feb 2006 18:21:17 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19ILHdU025963 for perforce@freebsd.org; Thu, 9 Feb 2006 18:21:17 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 9 Feb 2006 18:21:17 GMT Message-Id: <200602091821.k19ILHdU025963@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 91437 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 18:21:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=91437 Change 91437 by deker@deker_build1.columbia.sparta.com on 2006/02/09 18:20:58 update license text in migcom Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/global.c#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/global.h#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/lexxer.l#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/mig.c#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/mig.sh#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/parser.y#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/routine.c#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/routine.h#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/server.c#7 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/type.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/type.h#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/global.c#4 (text+ko) ==== @@ -47,6 +47,12 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 2.0. + */ #include "strdefs.h" #include "global.h" ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/global.h#4 (text+ko) ==== @@ -47,6 +47,12 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 2.0. + */ #ifndef _GLOBAL_H #define _GLOBAL_H ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/lexxer.l#5 (text+ko) ==== @@ -60,6 +60,12 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 2.0. + */ #include "strdefs.h" #include "type.h" ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/mig.c#4 (text+ko) ==== @@ -47,6 +47,12 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 2.0. + */ /* * Switches are; ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/mig.sh#4 (text+ko) ==== @@ -46,6 +46,12 @@ # any improvements or extensions that they make and grant Carnegie Mellon # the rights to redistribute these changes. # +# +# NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce +# support for mandatory and extensible security protections. This notice +# is included in support of clause 2.2 (b) of the Apple Public License, +# Version 2.0. + C=${MIGCC-/usr/bin/cc} M=${MIGCOM-${NEXT_ROOT}/usr/libexec/migcom} ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/parser.y#5 (text+ko) ==== @@ -46,6 +46,12 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 2.0. + */ %token sySkip %token syRoutine ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/routine.c#6 (text+ko) ==== @@ -47,6 +47,12 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 2.0. + */ #include "type.h" ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/routine.h#6 (text+ko) ==== @@ -47,6 +47,12 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 2.0. + */ #include ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/server.c#7 (text+ko) ==== @@ -50,6 +50,12 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 2.0. + */ #include #include ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/type.c#3 (text+ko) ==== @@ -47,6 +47,12 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 2.0. + */ #include "type.h" #include ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/type.h#3 (text+ko) ==== @@ -35,6 +35,12 @@ * Added itPortType * Added itTidType */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 2.0. + */ #ifndef _TYPE_H #define _TYPE_H From owner-p4-projects@FreeBSD.ORG Thu Feb 9 18:27:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E83816A423; Thu, 9 Feb 2006 18:27:26 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E398216A420 for ; Thu, 9 Feb 2006 18:27:25 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B4F4743D4C for ; Thu, 9 Feb 2006 18:27:25 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19IRPQq026189 for ; Thu, 9 Feb 2006 18:27:25 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19IRPIr026186 for perforce@freebsd.org; Thu, 9 Feb 2006 18:27:25 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 9 Feb 2006 18:27:25 GMT Message-Id: <200602091827.k19IRPIr026186@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 91438 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 18:27:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=91438 Change 91438 by deker@deker_build1.columbia.sparta.com on 2006/02/09 18:27:10 Update Makefile to properly install pam configs Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/etc/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/etc/Makefile#3 (text+ko) ==== @@ -8,6 +8,11 @@ install: cd ${CURDIR}; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - $(ETCFILES) ${DESTDIR}/private/etc; + $(ETCFILES) ${DESTDIR}/private/etc; \ + ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 ${DESTDIR}/private/etc/pam.d; \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ../pam/pam.d/login \ + ${DESTDIR}/private/etc/pam.d/login.sedarwin; \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ../pam/pam.d/sshd \ + ${DESTDIR}/private/etc/pam.d/sshd.sedarwin; clean: From owner-p4-projects@FreeBSD.ORG Thu Feb 9 18:37:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4362516A423; Thu, 9 Feb 2006 18:37:39 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 02F3316A420 for ; Thu, 9 Feb 2006 18:37:39 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B9D8243D45 for ; Thu, 9 Feb 2006 18:37:38 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19IbceV026635 for ; Thu, 9 Feb 2006 18:37:38 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19Ibc6V026632 for perforce@freebsd.org; Thu, 9 Feb 2006 18:37:38 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 9 Feb 2006 18:37:38 GMT Message-Id: <200602091837.k19Ibc6V026632@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 91439 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 18:37:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=91439 Change 91439 by deker@deker_build1.columbia.sparta.com on 2006/02/09 18:37:17 per millert: "Allow the user to login even if sedarwin module is not loaded. the MAC login plugin bits could be much better but this probably requires changes to the generic MAC login plugin code." Submitted by: millert Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/MAC.loginPlugin.xcode/project.pbxproj#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/SEDarwin/SEDarwin.h#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/SEDarwin/SEDarwin.m#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/pam_modules/pam_sedarwin/GNUmakefile#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/pam_modules/pam_sedarwin/pam_sedarwin.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/MAC.loginPlugin.xcode/project.pbxproj#2 (text+ko) ==== @@ -81,7 +81,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; INFOPLIST_FILE = plugins/SEDarwin/Info.plist; - OTHER_CFLAGS = "-I../../xnu/BUILD/obj/EXPORT_HDRS/bsd -idirafter ../../xnu/BUILD/obj/EXPORT_HDRS/osfmk -I../../../sedarwin/libselinux/include"; + OTHER_CFLAGS = "-I../../xnu/BUILD/obj/EXPORT_HDRS/bsd -idirafter ../../xnu/BUILD/obj/EXPORT_HDRS/osfmk -I../../../sedarwin/libselinux/include -I../../../sedarwin"; OTHER_LDFLAGS = "-framework Foundation -framework AppKit -L../../libmac -lmac -L../../../sedarwin/libselinux/src -lselinux"; OTHER_REZFLAGS = ""; PRODUCT_NAME = SEDarwin; ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/SEDarwin/SEDarwin.h#2 (text+ko) ==== @@ -7,6 +7,7 @@ #include #include #include +#include @interface SEDarwin : NSObject { ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/SEDarwin/SEDarwin.m#2 (text+ko) ==== @@ -41,6 +41,9 @@ return; } + if (!sebsd_enabled()) + return; + /* * Get an ordered list of possible contexts for the user and * use them to populate the popup button (in the same order). @@ -84,6 +87,10 @@ return (MAC_LOGIN_FAIL); } + /* XXX - use SELINUX_DEFAULTUSER and fill in selector if not enabled? */ + if (!sebsd_enabled()) + return (MAC_LOGIN_OK); + /* * Get the selected context from the popup button and * convert it to a label. @@ -119,6 +126,7 @@ - (void) policyWillLogin { free(username); + if (label != NULL) /* XXX */ mac_free(label); } ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/pam_modules/pam_sedarwin/GNUmakefile#2 (text+ko) ==== @@ -7,7 +7,7 @@ Extra_CC_Flags =-I../../pam/pam/libpam/include/pam/ \ -I../../xnu/BUILD/obj/EXPORT_HDRS/bsd/ \ -idirafter ../../xnu/BUILD/obj/EXPORT_HDRS/osfmk \ - -I../../../sedarwin/libselinux/include/ + -I../../../sedarwin -I../../../sedarwin/libselinux/include Extra_LD_Flags =-L../../../sedarwin/libselinux/src/ -lselinux \ -L../../libmac/ -lmac ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/pam_modules/pam_sedarwin/pam_sedarwin.c#2 (text+ko) ==== @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -113,6 +114,12 @@ const char *user; int ncontexts, retval, which; + /* XXX - use SELINUX_DEFAULTUSER if not enabled? */ + if (!sebsd_enabled()) { + syslog(LOG_ERR, "%s(): SEDarwin not enabled", __func__); + return (PAM_SUCCESS); + } + if ((retval = pam_get_user(pamh, &user, NULL)) != PAM_SUCCESS) { syslog(LOG_ERR, "%s(): unable to get user %s", __func__, user); @@ -164,6 +171,11 @@ mac_t label; int retval; + if (!sebsd_enabled()) { + syslog(LOG_ERR, "%s(): SEDarwin not enabled", __func__); + return (PAM_SUCCESS); + } + /* * If the user didn't specify a label to use in the authentication * function get the default label. @@ -172,8 +184,11 @@ security_context_t con; const char *user; - if ((retval = pam_get_user(pamh, &user, NULL)) != PAM_SUCCESS) + if ((retval = pam_get_user(pamh, &user, NULL)) != PAM_SUCCESS) { + syslog(LOG_ERR, "%s(): unable to get user %s", + __func__, user); return (retval); + } /* * Get user's default context. If we had a way to From owner-p4-projects@FreeBSD.ORG Thu Feb 9 18:39:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5DEC16A423; Thu, 9 Feb 2006 18:39:42 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA8FF16A420 for ; Thu, 9 Feb 2006 18:39:42 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC00543D55 for ; Thu, 9 Feb 2006 18:39:41 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19IdfVK026724 for ; Thu, 9 Feb 2006 18:39:41 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19Idf2t026721 for perforce@freebsd.org; Thu, 9 Feb 2006 18:39:41 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 9 Feb 2006 18:39:41 GMT Message-Id: <200602091839.k19Idf2t026721@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 91440 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 18:39:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=91440 Change 91440 by deker@deker_build1.columbia.sparta.com on 2006/02/09 18:39:15 Update PAM login config to use pam_sedarwin Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/pam/pam.d/login#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/pam/pam.d/login#4 (text+ko) ==== @@ -1,9 +1,11 @@ # login: auth account password session auth required pam_nologin.so -auth sufficient pam_securityserver.so -auth sufficient pam_unix.so +auth success=1default=2 pam_securityserver.so +auth success=okdefault=1 pam_unix.so +auth default=done pam_sedarwin.so auth required pam_deny.so account required pam_permit.so password required pam_deny.so session required pam_uwtmp.so session required pam_lctx.so +session required pam_sedarwin.so From owner-p4-projects@FreeBSD.ORG Thu Feb 9 18:46:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC59516A424; Thu, 9 Feb 2006 18:46:51 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5750316A422 for ; Thu, 9 Feb 2006 18:46:51 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB91143D72 for ; Thu, 9 Feb 2006 18:46:50 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19Ikoee027061 for ; Thu, 9 Feb 2006 18:46:50 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19IkoPj027058 for perforce@freebsd.org; Thu, 9 Feb 2006 18:46:50 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 9 Feb 2006 18:46:50 GMT Message-Id: <200602091846.k19IkoPj027058@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 91441 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 18:46:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=91441 Change 91441 by deker@deker_build1.columbia.sparta.com on 2006/02/09 18:46:02 Turn off checkaccess flag in MiG definition since extended trailers cause the Darwin 7.8 kernel to hang. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/system_cmds/mach_init.tproj/bootstrap.defs#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/system_cmds/mach_init.tproj/bootstrap.defs#4 (text+ko) ==== @@ -135,7 +135,8 @@ * Errors: Returns appropriate kernel errors on rpc failure. * Returns BOOTSTRAP_NOT_PRIVILEGED, bootstrap or uid invalid. */ -routine bootstrap_create_server checkaccess( +/*routine bootstrap_create_server checkaccess (*/ +routine bootstrap_create_server ( bootstrap_port : mach_port_t; server_cmd : cmd_t; server_uid : integer_t; @@ -158,7 +159,8 @@ * children (or any offspring that it does not want to count as part * of the "server" for mach_init registration and re-launch purposes). */ -routine bootstrap_unprivileged checkaccess ( +/*routine bootstrap_unprivileged checkaccess (*/ +routine bootstrap_unprivileged ( bootstrap_port : mach_port_t; out unpriv_port : mach_port_t); @@ -183,7 +185,8 @@ * Returns BOOTSTRAP_SERVICE_ACTIVE, if service has already been * registered or checked-in. */ -routine bootstrap_check_in checkaccess( +/*routine bootstrap_check_in checkaccess (*/ +routine bootstrap_check_in ( bootstrap_port : mach_port_t; service_name : name_t; out service_port : mach_port_move_receive_t); @@ -210,7 +213,8 @@ * Returns BOOTSTRAP_NAME_IN_USE, if service has already been * register or checked-in. */ -routine bootstrap_register checkaccess( +/*routine bootstrap_register checkaccess (*/ +routine bootstrap_register ( bootstrap_port : mach_port_t; service_name : name_t; service_port : mach_port_t); @@ -228,7 +232,8 @@ * Errors: Returns appropriate kernel errors on rpc failure. * Returns BOOTSTRAP_UNKNOWN_SERVICE, if service does not exist. */ -routine bootstrap_look_up checkaccess( +/*routine bootstrap_look_up checkaccess (*/ +routine bootstrap_look_up ( bootstrap_port : mach_port_t; service_name : name_t; out service_port : mach_port_t); @@ -255,7 +260,8 @@ * If all services are known, all_services_known is true on * return, if any service is unknown, it's false. */ -routine bootstrap_look_up_array checkaccess( +/*routine bootstrap_look_up_array checkaccess (*/ +routine bootstrap_look_up_array ( bootstrap_port : mach_port_t; service_names : name_array_t; out service_ports : mach_port_array_t; @@ -275,7 +281,8 @@ * with an effective user id of root (as determined by the security * token in the message trailer). */ -routine bootstrap_parent checkaccess( +/*routine bootstrap_parent checkaccess (*/ +routine bootstrap_parent ( bootstrap_port : mach_port_t; ServerSecToken token : security_token_t; out parent_port : mach_port_make_send_t); @@ -292,7 +299,8 @@ * Errors: Returns appropriate kernel errors on rpc failure. * Returns BOOTSTRAP_UNKNOWN_SERVICE, if service does not exist. */ -routine bootstrap_status checkaccess( +/*routine bootstrap_status checkaccess (*/ +routine bootstrap_status ( bootstrap_port : mach_port_t; service_name : name_t; out service_active : bootstrap_status_t); @@ -309,7 +317,8 @@ * * Errors: Returns appropriate kernel errors on rpc failure. */ -routine bootstrap_info checkaccess( +/* routine bootstrap_info checkaccess (*/ +routine bootstrap_info ( bootstrap_port : mach_port_t; out service_names : name_array_t, dealloc; out server_names : name_array_t, dealloc; @@ -335,7 +344,8 @@ * * Errors: Returns appropriate kernel errors on rpc failure. */ -routine bootstrap_subset checkaccess( +/*routine bootstrap_subset checkaccess (*/ +routine bootstrap_subset ( bootstrap_port : mach_port_t; requestor_port : mach_port_t; out subset_port : mach_port_t); @@ -353,7 +363,8 @@ * Errors: Returns appropriate kernel errors on rpc failure. * Returns BOOTSTRAP_SERVICE_ACTIVE, if service already exists. */ -routine bootstrap_create_service checkaccess( +/*routine bootstrap_create_service checkaccess (*/ +routine bootstrap_create_service ( bootstrap_port : mach_port_t; service_name : name_t; out service_port : mach_port_t); From owner-p4-projects@FreeBSD.ORG Thu Feb 9 18:50:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3542116A423; Thu, 9 Feb 2006 18:50:57 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EC57916A420 for ; Thu, 9 Feb 2006 18:50:56 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 621DD43D69 for ; Thu, 9 Feb 2006 18:50:56 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19Iou0G027239 for ; Thu, 9 Feb 2006 18:50:56 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19IouIc027236 for perforce@freebsd.org; Thu, 9 Feb 2006 18:50:56 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 9 Feb 2006 18:50:56 GMT Message-Id: <200602091850.k19IouIc027236@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 91442 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 18:50:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=91442 Change 91442 by deker@deker_build1.columbia.sparta.com on 2006/02/09 18:50:45 per millert: "Call mac_destroy_proc() after process has been removed from global process list. From DSEP (mdodd)." Submitted by: millert Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/kern_exit.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/kern_exit.c#4 (text+ko) ==== @@ -713,9 +713,6 @@ if (tvp) vrele(tvp); -#ifdef MAC - mac_destroy_proc(p); -#endif /* * Finally finished with old proc entry. * Unlink it from its process group and free it. @@ -725,6 +722,9 @@ LIST_REMOVE(p, p_list); /* off zombproc */ LIST_REMOVE(p, p_sibling); p->p_flag &= ~P_WAITING; +#ifdef MAC + mac_destroy_proc(p); +#endif FREE_ZONE(p, sizeof *p, M_PROC); nprocs--; wakeup(&p->p_stat); From owner-p4-projects@FreeBSD.ORG Thu Feb 9 18:54:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2003316A423; Thu, 9 Feb 2006 18:54:01 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BF77C16A420 for ; Thu, 9 Feb 2006 18:54:00 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E65E43D45 for ; Thu, 9 Feb 2006 18:54:00 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19Is0tJ027336 for ; Thu, 9 Feb 2006 18:54:00 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19Is0nP027333 for perforce@freebsd.org; Thu, 9 Feb 2006 18:54:00 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 9 Feb 2006 18:54:00 GMT Message-Id: <200602091854.k19Is0nP027333@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 91443 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 18:54:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=91443 Change 91443 by deker@deker_build1.columbia.sparta.com on 2006/02/09 18:53:51 update license Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/sysctl_init.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/sysctl_init.c#4 (text+ko) ==== @@ -19,6 +19,13 @@ * * @APPLE_LICENSE_HEADER_END@ */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 2.0. + */ + #include #include From owner-p4-projects@FreeBSD.ORG Thu Feb 9 18:55:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 134BC16A423; Thu, 9 Feb 2006 18:55:03 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CAE9416A420 for ; Thu, 9 Feb 2006 18:55:02 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5113E43D46 for ; Thu, 9 Feb 2006 18:55:02 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19It2Wq027395 for ; Thu, 9 Feb 2006 18:55:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19It20j027391 for perforce@freebsd.org; Thu, 9 Feb 2006 18:55:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 9 Feb 2006 18:55:02 GMT Message-Id: <200602091855.k19It20j027391@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91444 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 18:55:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=91444 Change 91444 by rwatson@rwatson_zoo on 2006/02/09 18:54:12 Count drops when the first of two mallocs fails. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#8 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#8 (text+ko) ==== @@ -180,6 +180,7 @@ ape = malloc(sizeof(*ape), M_AUDIT_PIPE_ENTRY, M_NOWAIT | M_ZERO); if (ape == NULL) { ap->ap_drops++; + audit_pipe_drops++; return; } From owner-p4-projects@FreeBSD.ORG Thu Feb 9 18:58:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E82D016A423; Thu, 9 Feb 2006 18:58:06 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A7F3316A420 for ; Thu, 9 Feb 2006 18:58:06 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6BA0F43D48 for ; Thu, 9 Feb 2006 18:58:06 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19Iw6FC027579 for ; Thu, 9 Feb 2006 18:58:06 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19Iw6va027576 for perforce@freebsd.org; Thu, 9 Feb 2006 18:58:06 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 9 Feb 2006 18:58:06 GMT Message-Id: <200602091858.k19Iw6va027576@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 91445 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 18:58:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=91445 Change 91445 by deker@deker_build1.columbia.sparta.com on 2006/02/09 18:58:00 per millert: "Add mac_check_port_receive() entry point. Not currently implemented by any policy." Submitted by: millert Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/mac_policy.h#12 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/mac_policy.h#12 (text+ko) ==== @@ -1994,6 +1994,25 @@ ); /** + @brief Access control check for receiving Mach messsages + @param task Label of the receiving task + @param port Label of the sending task + + Access control check for receiving messages. The two labels are locked. + + @warning This entry point can be invoked from many places inside the + kernel, with arbitrary other locks held. The implementation of this + entry point must not cause page faults, as those are handled by mach + messages. + + @return Return 0 if access is granted, non-zero otherwise. +*/ +typedef int mpo_check_port_receive_t( + struct label *task, + struct label *sender +); + +/** @brief Access control check for obtaining a receive right @param task Label of the receiving task @param port Label of the affected port @@ -4141,6 +4160,7 @@ mpo_check_port_send_t *mpo_check_port_send; mpo_check_port_make_send_t *mpo_check_port_make_send; mpo_check_port_copy_send_t *mpo_check_port_copy_send; + mpo_check_port_receive_t *mpo_check_port_receive; mpo_check_port_move_receive_t *mpo_check_port_move_receive; mpo_check_port_hold_send_t *mpo_check_port_hold_send; mpo_check_port_hold_receive_t *mpo_check_port_hold_receive; From owner-p4-projects@FreeBSD.ORG Thu Feb 9 19:07:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E695F16A423; Thu, 9 Feb 2006 19:07:18 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A9A2916A422 for ; Thu, 9 Feb 2006 19:07:18 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E317043D5C for ; Thu, 9 Feb 2006 19:07:17 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19J7HHu027936 for ; Thu, 9 Feb 2006 19:07:17 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19J7HU3027933 for perforce@freebsd.org; Thu, 9 Feb 2006 19:07:17 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 9 Feb 2006 19:07:17 GMT Message-Id: <200602091907.k19J7HU3027933@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 91446 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 19:07:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=91446 Change 91446 by deker@deker_build1.columbia.sparta.com on 2006/02/09 19:07:11 Update license Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_mqueue.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_mqueue.c#3 (text+ko) ==== @@ -56,6 +56,13 @@ * * Functions to manipulate IPC message queues. */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 2.0. + */ + #include #include @@ -246,6 +253,9 @@ if (th->ith_msize < kmsg->ikm_header.msgh_size + REQUESTED_TRAILER_SIZE(th->ith_option)) { +#if 0 + printf("ipc_mqueue_add: ith_msize too small (%d vs. %d)\n", th->ith_msize, kmsg->ikm_header.msgh_size + REQUESTED_TRAILER_SIZE(th->ith_option)); +#endif th->ith_state = MACH_RCV_TOO_LARGE; th->ith_msize = kmsg->ikm_header.msgh_size; if (th->ith_option & MACH_RCV_LARGE) { @@ -485,6 +495,9 @@ if (receiver->ith_msize < (kmsg->ikm_header.msgh_size) + REQUESTED_TRAILER_SIZE(receiver->ith_option)) { +#if 0 + printf("ipc_mqueue_post: ith_msize too small (%d vs. %d)\n", receiver->ith_msize, kmsg->ikm_header.msgh_size + REQUESTED_TRAILER_SIZE(receiver->ith_option)); +#endif receiver->ith_msize = kmsg->ikm_header.msgh_size; receiver->ith_state = MACH_RCV_TOO_LARGE; } else { From owner-p4-projects@FreeBSD.ORG Thu Feb 9 19:13:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B054216A423; Thu, 9 Feb 2006 19:13:26 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 57E0C16A420 for ; Thu, 9 Feb 2006 19:13:26 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0CB7143D45 for ; Thu, 9 Feb 2006 19:13:26 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19JDPr4028169 for ; Thu, 9 Feb 2006 19:13:26 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19JDPwA028166 for perforce@freebsd.org; Thu, 9 Feb 2006 19:13:25 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 9 Feb 2006 19:13:25 GMT Message-Id: <200602091913.k19JDPwA028166@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 91447 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 19:13:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=91447 Change 91447 by deker@deker_build1.columbia.sparta.com on 2006/02/09 19:12:59 per millert: "Make kernel-dump-to-server work properly; from plovell" Submitted by: millert Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kdp/kdp_udp.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kdp/kdp_udp.c#3 (text+ko) ==== @@ -23,6 +23,19 @@ * Copyright (c) 1982, 1986, 1993 * The Regents of the University of California. All rights reserved. */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 2.0. + */ +/* + * changes 2005/6 plovell + * ARP for MAC address of panicd server (boot-arg _panicd_ip ) + * ARP for MAC address of router (boot-arg _router_ip ) + * dump name includes minor version (rdar://3735061) + */ + /* * Kernel Debugging Protocol UDP implementation. @@ -46,11 +59,40 @@ #include +/* external-visible prototypes (move to external header sometime) */ +void kdp_set_interface(void *ifp); +void *kdp_get_interface(void); +void kdp_set_ip_and_mac_addresses(struct in_addr *ipaddr, struct ether_addr *macaddr); +void kdp_set_gateway_mac(void *gatewaymac); +int kdp_send_panic_packets(unsigned int request, char *corename, unsigned int length, unsigned int txstart); + +/* local prototypes - keep compiler happy :) */ +static void enaddr_copy(void *src, void *dst); +static unsigned short ip_sum(unsigned char*c, unsigned inthlen); +static void kdp_reply(unsigned short reply_port); +static void kdp_send(unsigned short remote_port); +static int create_arp_request(struct in_addr* ipaddr); +static void kdp_handle_arp(void); +static void kdp_arp_respond(void); +static void kdp_handle_arp_reply(void); +static void kdp_poll(void); +static void kdp_handler(void *saved_state); +static void kdp_connection_wait(void); +static void kdp_send_exception(unsigned intexception, unsigned int code, unsigned int subcode); +static int kdp_arp_request (struct in_addr *ipaddr, struct ether_addr *macaddr); +static int isdigit(char c); +static int kdp_get_xnu_version(char *versionbuf); + + #define DO_ALIGN 1 /* align all packet data accesses */ extern int kdp_getc(void); extern int reattach_wait; +extern void kdp_call(void); +extern unsigned int disableConsoleOutput; +extern boolean_t kdp_call_kdb(void); + static u_short ip_id; /* ip packet ctr, for ids */ /* @(#)udp_usrreq.c 2.2 88/05/23 4.0NFSSRC SMI; from UCB 7.1 6/5/86 */ @@ -101,39 +143,48 @@ static struct ether_addr kdp_current_mac_address = {{0, 0, 0, 0, 0, 0}}; static void *kdp_current_ifp = 0; -static void kdp_handler( void *); - static unsigned int panic_server_ip = 0; static unsigned int parsed_router_ip = 0; static unsigned int router_ip = 0; static unsigned int panicd_specified = 0; static unsigned int router_specified = 0; +static unsigned int arp_ip = 0; +static struct ether_addr arp_mac = {{0, 0, 0 , 0, 0, 0}}; + static struct ether_addr router_mac = {{0, 0, 0 , 0, 0, 0}}; +static struct ether_addr server_mac = {{0, 0, 0 , 0, 0, 0}}; +static struct ether_addr target_mac = {{0, 0, 0 , 0, 0, 0}}; static u_char flag_panic_dump_in_progress = 0; static u_char flag_router_mac_initialized = 0; +static u_char flag_have_arp = 0; static unsigned int panic_timeout = 100000; static unsigned int last_panic_port = CORE_REMOTE_PORT; unsigned int SEGSIZE = 512; -static unsigned int PANIC_PKTSIZE = 518; +/* static unsigned int PANIC_PKTSIZE = 518; */ static char panicd_ip_str[20]; static char router_ip_str[20]; static unsigned int panic_block = 0; static volatile unsigned int kdp_trigger_core_dump = 0; +static volatile unsigned int flag_kdp_trigger_reboot = 0; extern unsigned int not_in_kdp; +extern int kdp_vm_read( caddr_t, caddr_t, unsigned int); +static u_char etherbroadcastaddr[ETHER_ADDR_LEN] = + { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; + void kdp_register_send_receive( kdp_send_t send, kdp_receive_t receive) { - unsigned int debug; + unsigned int debug = 0; kdp_en_send_pkt = send; kdp_en_recv_pkt = receive; @@ -162,7 +213,7 @@ if (PE_parse_boot_arg ("_panicd_ip", panicd_ip_str)) panicd_specified = 1; - /* For the future, currently non-functional */ + /* functional with changes made 20060102 */ if (PE_parse_boot_arg ("_router_ip", router_ip_str)) router_specified = 1; @@ -366,8 +417,6 @@ struct in_addr *ipaddr, struct ether_addr *macaddr) { - unsigned int debug = 0; - kdp_current_ip_address = ipaddr->s_addr; kdp_current_mac_address = *macaddr; } @@ -376,6 +425,8 @@ kdp_set_gateway_mac(void *gatewaymac) { router_mac = *(struct ether_addr *)gatewaymac; + target_mac = *(struct ether_addr *)gatewaymac; + flag_router_mac_initialized = 1; } struct ether_addr @@ -390,13 +441,94 @@ return kdp_current_ip_address; } +/* ARP request builder. Note that this saves the ip address + * we want for the use of kdp_handle_arp_reply +*/ +static int +create_arp_request(struct in_addr* ipaddr) +{ + struct ether_header header; + struct ether_header *eh = &header; + struct ether_arp aligned_ea, *ea = &aligned_ea; + + struct in_addr myaddr; + struct ether_addr my_enaddr; + + unsigned long wk; + wk = ntohl(ipaddr->s_addr); +/* printf("request arp for IP %d.%d.%d.%d\n", + (wk & 0xff000000) >> 24, + (wk & 0x00ff0000) >> 16, + (wk & 0x0000ff00) >> 8, + (wk & 0x000000ff) ); */ + + myaddr.s_addr = kdp_get_ip_address(); + my_enaddr = kdp_get_mac_addr(); + + if (!(myaddr.s_addr) || !(my_enaddr.ether_addr_octet[1])) + return 1; + + /* lay out ether header fields */ + memcpy( eh->ether_dhost, etherbroadcastaddr, sizeof(struct ether_addr)); + memcpy( eh->ether_shost, (void*)&my_enaddr, sizeof(struct ether_addr) ); + eh->ether_type = htons(ETHERTYPE_ARP); + + /* now the arp request header */ + ea->arp_hrd = htons(ARPHRD_ETHER); + ea->arp_pro = htons(ETHERTYPE_IP); + ea->arp_hln = sizeof(ea->arp_sha); + ea->arp_pln = sizeof(ea->arp_spa); + ea->arp_op = htons(ARPOP_REQUEST); + + /* sender addresses (us) */ + memcpy(ea->arp_sha, (void *)&my_enaddr, sizeof(ea->arp_sha)); + memcpy(ea->arp_spa, (void *)&myaddr, sizeof(ea->arp_spa)); + + /* target addresses */ + memcpy(ea->arp_tha, etherbroadcastaddr, sizeof(struct ether_addr)); + memcpy(ea->arp_tpa, (void *)ipaddr, sizeof(ea->arp_tpa)); + + pkt.len = 0; + pkt.off = 0; + memcpy( &pkt.data[pkt.off], eh, sizeof(struct ether_header) ); + pkt.len += sizeof(struct ether_header); + pkt.off += pkt.len; + memcpy( &pkt.data[pkt.off], ea, sizeof(struct ether_arp) ); + pkt.len += sizeof(struct ether_arp); + pkt.off = 0; + + return 0; +} + /* ARP responses are enabled when the DB_ARP bit of the debug boot arg is set. A workaround if you don't want to reboot is to set kdpDEBUGFlag &= DB_ARP when connected (but that certainly isn't a published interface!) */ static void -kdp_arp_reply(void) +kdp_handle_arp(void) +{ + struct ether_arp aligned_ea, *ea = &aligned_ea; + int offset = sizeof(struct ether_header); + + memcpy((void *)ea, (void *)&pkt.data[offset],sizeof(*ea)); + + if( (kdp_flag & KDP_ARP) && (ntohs(ea->arp_op) == ARPOP_REQUEST) ) + kdp_arp_respond(); + else if(ntohs(ea->arp_op) == ARPOP_REPLY) + kdp_handle_arp_reply(); + + return; + +} + +/* ARP responses are enabled when the DB_ARP bit of the debug boot arg + is set. A workaround if you don't want to reboot is to set + kdpDEBUGFlag &= DB_ARP when connected (but that certainly isn't a published + interface!) +*/ +static void +kdp_arp_respond(void) { struct ether_header *eh; struct ether_arp aligned_ea, *ea = &aligned_ea; @@ -440,6 +572,30 @@ } } +/* We have an ARP reply. Maybe we are waiting for one?? + * Handle it if we are, else ignore it. + */ +static void +kdp_handle_arp_reply(void) +{ + struct ether_arp aligned_ea, *ea = &aligned_ea; + + pkt.off = sizeof(struct ether_header); + memcpy((void *)ea, (void *)&pkt.data[pkt.off],sizeof(*ea)); + + if(ntohs(ea->arp_op) != ARPOP_REPLY) + return; + + if( ((struct in_addr *)(ea->arp_spa))->s_addr != arp_ip) /* not the one we want */ + return; + + arp_mac = *(struct ether_addr*)(ea->arp_sha); + flag_have_arp = 1; + /* printf("kdp_handle_arp_reply set flag_have_arp\n"); */ + + return; +} + static void kdp_poll(void) { @@ -470,15 +626,13 @@ { eh = (struct ether_header *)&pkt.data[pkt.off]; - if (kdp_flag & KDP_ARP) - { + /* testing for KDP_ARP now done in kdp_handle_arp() */ if (ntohs(eh->ether_type) == ETHERTYPE_ARP) { - kdp_arp_reply(); + kdp_handle_arp(); return; } } - } if (pkt.len < (sizeof (struct ether_header) + sizeof (struct udpiphdr))) return; @@ -595,10 +749,11 @@ kdp_connection_wait(void) { unsigned short reply_port; - boolean_t kdp_call_kdb(); - struct ether_addr kdp_mac_addr = kdp_get_mac_addr(); - unsigned int ip_addr = ntohl(kdp_get_ip_address()); + struct ether_addr kdp_mac_addr; + unsigned int ip_addr; + kdp_mac_addr = kdp_get_mac_addr(); + ip_addr = ntohl(kdp_get_ip_address()); printf( "ethernet MAC address: %02x:%02x:%02x:%02x:%02x:%02x\n", kdp_mac_addr.ether_addr_octet[0] & 0xff, kdp_mac_addr.ether_addr_octet[1] & 0xff, @@ -751,7 +906,6 @@ int index; extern unsigned int disableDebugOuput; - extern unsigned int disableConsoleOutput; disable_preemption(); @@ -826,6 +980,16 @@ kdp_panic_dump(); } +/* Trigger a reboot if the user has set this flag through the + * debugger.Ideally, this would be done through the HOSTREBOOT packet + * in the protocol,but that will need gdb support,and when it's + * available, it should work automatically. + */ + if (1 == flag_kdp_trigger_reboot) { + kdp_reboot(); + /* If we're still around, reset the flag */ + flag_kdp_trigger_reboot = 0; + } kdp_sync_cache(); if (reattach_wait == 1) @@ -918,7 +1082,7 @@ eh = (struct ether_header *)&pkt.data[pkt.off]; enaddr_copy(&kdp_current_mac_address, eh->ether_shost); - enaddr_copy(&router_mac, eh->ether_dhost); + enaddr_copy(&target_mac, eh->ether_dhost); eh->ether_type = htons(ETHERTYPE_IP); pkt.len += sizeof (struct ether_header); @@ -952,6 +1116,7 @@ kdp_send_panic_pkt(request, corename, (txend - txstart), (caddr_t) txstart); } } + return 0; } int @@ -1054,6 +1219,108 @@ return 1; } +static int +kdp_arp_request ( + struct in_addr *ipaddr, + struct ether_addr *macaddr) +{ + struct corehdr *th = NULL; + int poll_count = 2500; + int err = 0; + + char rretries = 0, tretries = 0; + /* + extern signed long gIODebuggerSemaphore; + */ + pkt.off = pkt.len = 0; + +TRANSMIT_RETRY: + tretries++; + + if (tretries > 2) + printf("TX arp retry #%d ", tretries ); + + if (tretries >=15) { + /* This iokit layer issue can potentially + *cause a hang, uncomment to check if it's happening. + */ + /* + if (gIODebuggerSemaphore) + printf("The gIODebuggerSemaphore is raised, preventing packet transmission (2760413)\n"); + */ + + printf ("Cannot arp panic server, timing out.\n"); + return (-3); + } + + err = create_arp_request(ipaddr); + if ( err != 0 ) { + printf("create arp request failed\n"); + return (-4); + } + + arp_ip = ipaddr->s_addr; + flag_have_arp = 0; + + + + (*kdp_en_send_pkt)(&pkt.data[pkt.off], pkt.len); + + /* Now we have to listen for the ACK */ + RECEIVE_RETRY: + + while (!pkt.input && flag_panic_dump_in_progress && poll_count) { + kdp_poll(); + poll_count--; + if ( flag_have_arp ) { + *macaddr = arp_mac; + return 0; + } + } + + if (pkt.input) { + + pkt.input = FALSE; + + th = (struct corehdr *) &pkt.data[pkt.off]; + /* These will eventually have to be ntoh[ls]'ed as appropriate */ + + if (th->th_opcode == KDP_ACK && th->th_block == panic_block) { + } + else + if (th->th_opcode == KDP_ERROR) { + printf("Panic server returned error %d, retrying\n", th->th_code); + poll_count = 1000; + goto TRANSMIT_RETRY; + } + else + if (th->th_block == (panic_block -1)) { + printf("RX retry "); + if (++rretries > 1) + goto TRANSMIT_RETRY; + else + goto RECEIVE_RETRY; + } + } + else + if (!flag_panic_dump_in_progress) /* we received a debugging packet, bail*/ + { + printf("Received a debugger packet,transferring control to debugger\n"); + /* Configure that if not set ..*/ + kdp_flag |= DBG_POST_CORE; + return (-2); + } + else /* We timed out */ + if (0 == poll_count) { + poll_count = 1000; + kdp_us_spin ((tretries%4) * panic_timeout); /* capped linear backoff */ + goto TRANSMIT_RETRY; + } + + + return 1; +} + /* Since we don't seem to have an isdigit() .. */ static int isdigit (char c) @@ -1090,6 +1357,19 @@ * xnu version into a string or an int somewhere at project submission * time - makes assumptions about sizeof(version), but will not fail if * it changes, but may be incorrect. + * + * Changed 20060102 to allow a more complete version number, including + * minor version. It will now look something like xnu-792.6.22 + * (hopefully fixes radar 3735061) + * + * The only use of this routine provides the packet buffer as the + * data buffer (versionbuf) which is just as well, as there's + * no size checking done. That buffer is >1500 + * The fetched size used to be 90 but that's quite close to the end + * of the name so now it's up to 100. The version string is a system-wide + * global, defined in version.c in each darwin build. The content is + * similar to ... + * "Darwin Kernel Version 8.3.0: Thu Dec 29 06:13:35 PST 2005; root:xnu-792.6.22.obj/RELEASE_PPC" */ static int @@ -1097,20 +1377,30 @@ { extern const char version[]; char *versionpos; - char vstr[10]; + char vstr[20]; int retval = -1; + char* ptr; strcpy(vstr, "custom"); if (version) { - if (kdp_vm_read(version, versionbuf, 90)) { + if (kdp_vm_read(version, versionbuf, 100)) { - versionbuf[89] = '\0'; + versionbuf[99] = '\0'; - versionpos = strnstr(versionbuf, "xnu-", 80); + versionpos = strnstr(versionbuf, "xnu-", 90); if (versionpos) { - strncpy (vstr, versionpos, (isdigit (versionpos[7]) ? 8 : 7)); - vstr[(isdigit (versionpos[7]) ? 8 : 7)] = '\0'; + strncpy(vstr, versionpos, sizeof(vstr)); + vstr[sizeof(vstr)-1] = '\0'; /* terminate */ + + ptr = vstr + 4; /* start after "xnu-" */ + while ( isdigit(*ptr) || (*ptr == '.') ) + ptr++; + + *ptr = '\0'; /* terminate */ + if ( *(--ptr) == '.' ) /* if period is last */ + *ptr = '\0'; /* then remove trailing period */ + retval = 0; } } @@ -1118,20 +1408,19 @@ strcpy(versionbuf, vstr); return retval; } + /* Primary dispatch routine for the system dump */ void kdp_panic_dump() { - char corename[50]; + char corename[64]; char coreprefix[10]; int panic_error; - extern char *debug_buf; + int err = 0; extern vm_map_t kernel_map; extern char *inet_aton(const char *cp, struct in_addr *pin); - extern char *debug_buf; - extern char *debug_buf_ptr; uint64_t abstime; printf ("Entering system dump routine\n"); @@ -1156,7 +1445,7 @@ strncpy(coreprefix, "core", sizeof(coreprefix)); abstime = mach_absolute_time(); - pkt.data[10] = '\0'; + pkt.data[20] = '\0'; /* limit file name length to something reasonable */ snprintf (corename, sizeof(corename), "%s-%s-%d.%d.%d.%d-%x", coreprefix, &pkt.data[0], (kdp_current_ip_address & 0xff000000) >> 24, @@ -1173,32 +1462,57 @@ printf("Attempting connection to panic server configured at IP %s\n", panicd_ip_str); + /* first try to ARP the dump server */ + + err = kdp_arp_request((struct in_addr *) &panic_server_ip, &server_mac); + if ( err >= 0 ) { + target_mac = server_mac; + printf("kdump server MAC address: %02x:%02x:%02x:%02x:%02x:%02x\n", + target_mac.ether_addr_octet[0] & 0xff, + target_mac.ether_addr_octet[1] & 0xff, + target_mac.ether_addr_octet[2] & 0xff, + target_mac.ether_addr_octet[3] & 0xff, + target_mac.ether_addr_octet[4] & 0xff, + target_mac.ether_addr_octet[5] & 0xff); + + } + else + { + if ( err == -3 ) + printf ("No arp response for panic server.\n"); + if (router_specified) { if (0 == inet_aton(router_ip_str, (struct in_addr *) &parsed_router_ip)){ printf("inet_aton() failed interpreting %s as an IP\n", router_ip); } else { router_ip = parsed_router_ip; - printf("Routing through specified router IP %s (%d)\n", router_ip_str, router_ip); - /* We will eventually need to resolve the router's MAC ourselves, - * if one is specified,rather than being set through the BSD callback - * but the _router_ip option does not function currently + printf("Trying specified router IP %s\n", router_ip_str); + /* Resolve the router's MAC, as specified in the _router_ip option. + * If it doesn't resolve, use the one set through the BSD callback + * in kdp_set_gateway_mac */ + err = kdp_arp_request((struct in_addr *) &router_ip, &server_mac); + if ( err >= 0 ) + target_mac = server_mac; + else if ( err == -3 ) + printf ("No arp response for panic server.\n"); } } - /* These & 0xffs aren't necessary,but cut&paste is ever so convenient */ + printf("Routing via router MAC address: %02x:%02x:%02x:%02x:%02x:%02x\n", - router_mac.ether_addr_octet[0] & 0xff, - router_mac.ether_addr_octet[1] & 0xff, - router_mac.ether_addr_octet[2] & 0xff, - router_mac.ether_addr_octet[3] & 0xff, - router_mac.ether_addr_octet[4] & 0xff, - router_mac.ether_addr_octet[5] & 0xff); + target_mac.ether_addr_octet[0] & 0xff, + target_mac.ether_addr_octet[1] & 0xff, + target_mac.ether_addr_octet[2] & 0xff, + target_mac.ether_addr_octet[3] & 0xff, + target_mac.ether_addr_octet[4] & 0xff, + target_mac.ether_addr_octet[5] & 0xff); + } - printf("Kernel map size is %d\n", get_vmmap_size(kernel_map)); + printf("Kernel map size is %ld\n", get_vmmap_size(kernel_map)); printf ("Sending write request for %s\n", corename); - if ((panic_error = kdp_send_panic_pkt (KDP_WRQ, corename, 0 , NULL) < 0)) { + if ((panic_error = kdp_send_panic_pkt (KDP_WRQ, corename, 0 , NULL)) < 0) { printf ("kdp_send_panic_pkt failed with error %d\n", panic_error); goto panic_dump_exit; } From owner-p4-projects@FreeBSD.ORG Thu Feb 9 19:14:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3AFEE16A423; Thu, 9 Feb 2006 19:14:28 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F076116A420 for ; Thu, 9 Feb 2006 19:14:27 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BEB2E43D46 for ; Thu, 9 Feb 2006 19:14:27 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19JERuV028230 for ; Thu, 9 Feb 2006 19:14:27 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19JERKf028227 for perforce@freebsd.org; Thu, 9 Feb 2006 19:14:27 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 9 Feb 2006 19:14:27 GMT Message-Id: <200602091914.k19JERKf028227@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 91448 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 19:14:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=91448 Change 91448 by deker@deker_build1.columbia.sparta.com on 2006/02/09 19:14:06 Update license Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/ipc_kobject.h#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/ipc_kobject.h#4 (text+ko) ==== @@ -56,6 +56,13 @@ * * Declarations for letting a port represent a kernel object. */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 2.0. + */ + #include #include From owner-p4-projects@FreeBSD.ORG Thu Feb 9 19:18:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7050C16A423; Thu, 9 Feb 2006 19:18:34 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 18C1F16A420 for ; Thu, 9 Feb 2006 19:18:34 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3AB6143D64 for ; Thu, 9 Feb 2006 19:18:33 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19JIXE9028438 for ; Thu, 9 Feb 2006 19:18:33 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19JIXRp028435 for perforce@freebsd.org; Thu, 9 Feb 2006 19:18:33 GMT (envelope-from csjp@freebsd.org) Date: Thu, 9 Feb 2006 19:18:33 GMT Message-Id: <200602091918.k19JIXRp028435@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 91449 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 19:18:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=91449 Change 91449 by csjp@csjp_xor on 2006/02/09 19:18:11 Hook audit into the OpenSSH build provided NO_AUDIT is not set. Affected files ... .. //depot/projects/trustedbsd/audit3/secure/usr.sbin/sshd/Makefile#6 edit Differences ... ==== //depot/projects/trustedbsd/audit3/secure/usr.sbin/sshd/Makefile#6 (text+ko) ==== @@ -23,6 +23,12 @@ DPADD= ${LIBSSH} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM} LDADD= -lssh -lutil -lz -lwrap ${MINUSLPAM} +.if !defined(NO_AUDIT) +CFLAGS+= -DUSE_BSM_AUDIT +DPADD+= ${LIBBSM} +LDADD+= -lbsm +.endif + .if !defined(NO_KERBEROS) CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_GSSAPI_H=1 -DKRB5 -DHEIMDAL DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} From owner-p4-projects@FreeBSD.ORG Thu Feb 9 19:22:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 739C716A423; Thu, 9 Feb 2006 19:22:39 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 32E8816A420 for ; Thu, 9 Feb 2006 19:22:39 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF6FF43D49 for ; Thu, 9 Feb 2006 19:22:38 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19JMc3t028660 for ; Thu, 9 Feb 2006 19:22:38 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19JMcF7028657 for perforce@freebsd.org; Thu, 9 Feb 2006 19:22:38 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 9 Feb 2006 19:22:38 GMT Message-Id: <200602091922.k19JMcF7028657@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 91450 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 19:22:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=91450 Change 91450 by deker@deker_build1.columbia.sparta.com on 2006/02/09 19:21:49 This combines 2 2 changes. Both comments from millert included: "Fix the order of the message checks; we need to do the port check before the rights check (it was the other way around). To do this we must Move mac_check_port_send() out of ipc_kmsg_send() and into ipc_kmsg_copyin(). It is too late to deny in ipc_kmsg_send() since the rights have already have been copied at this point." "Move the mac_check_port_send() call down into ipc_kmsg_copyin_header(). This reduces the amount of duplicated setup we have to do. Change an assert into an if() since apparently we can end up with a NULL ipc_port_t when the system is rebooting." Submitted by: millert Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_kmsg.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_kmsg.c#7 (text+ko) ==== @@ -1024,6 +1024,9 @@ ipc_object_t dest_port, reply_port; ipc_port_t dest_soright, reply_soright; ipc_port_t notify_port; +#ifdef MAC + ipc_entry_t entry; +#endif if ((mbits != msg->msgh_bits) || (!MACH_MSG_TYPE_PORT_ANY_SEND(dest_type)) || @@ -1041,6 +1044,33 @@ if (!MACH_PORT_VALID(dest_name)) goto invalid_dest; +#ifdef MAC + /* + * We do the port send check here instead of in ipc_kmsg_send() + * because copying the header involves copying the port rights too + * and we need to do the send check before anything is actually copied. + */ + entry = ipc_entry_lookup(space, dest_name); + if (entry != IE_NULL) { + int error = 0; + ipc_port_t port = (ipc_port_t) entry->ie_object; + // assert(port != IP_NULL); + if (port == IP_NULL) + goto invalid_dest; + ip_lock(port); + if (ip_active(port)) { + task_t self = current_task(); + tasklabel_lock(self); + error = mac_check_port_send(&self->maclabel, + &port->ip_label); + tasklabel_unlock(self); + } + ip_unlock(port); + if (error != 0) + goto invalid_dest; + } +#endif + if (notify != MACH_PORT_NULL) { ipc_entry_t entry; @@ -1718,45 +1748,6 @@ mach_port_name_t notify) { mach_msg_return_t mr; -#ifdef MAC - mach_port_name_t dest_name; - ipc_entry_t entry; - ipc_port_t port; - task_t self; - int error = 0; - - /* - * We do the port send check here instead of in ipc_kmsg_send() - * because copying the header involves copying the port rights too - * and we need to do the send check before anything is actually copied. - * We don't currently try to mediate kernel-resident servers. - */ - self = current_task(); - if (self != kernel_task) { - is_read_lock(space); - if (space->is_active) { - dest_name = (mach_port_name_t) kmsg->ikm_header.msgh_remote_port; - if (MACH_PORT_VALID(dest_name)) { - entry = ipc_entry_lookup(space, dest_name); - if (entry != IE_NULL) { - port = (ipc_port_t) entry->ie_object; - assert(port != IP_NULL); - ip_lock(port); - if (ip_active(port)) { - tasklabel_lock(self); - error = mac_check_port_send(&self->maclabel, - &port->ip_label); - tasklabel_unlock(self); - } - ip_unlock(port); - } - } - } - is_read_unlock(space); - if (error != 0) - return MACH_SEND_INVALID_DEST; - } -#endif mr = ipc_kmsg_copyin_header(&kmsg->ikm_header, space, notify); if (mr != MACH_MSG_SUCCESS) @@ -1993,6 +1984,7 @@ ipc_port_request_index_t request; if (!space->is_active) { + printf("ipc_kmsg_copyout_header: dead space\n"); is_write_unlock(space); return (MACH_RCV_HEADER_ERROR| MACH_MSG_IPC_SPACE); @@ -2002,6 +1994,7 @@ notify_port = ipc_port_lookup_notify(space, notify); if (notify_port == IP_NULL) { + printf("ipc_kmsg_copyout_header: no notify port\n"); is_write_unlock(space); return MACH_RCV_INVALID_NOTIFY; } @@ -2056,13 +2049,16 @@ if (kr != KERN_SUCCESS) { /* space is unlocked */ - if (kr == KERN_RESOURCE_SHORTAGE) + if (kr == KERN_RESOURCE_SHORTAGE) { + printf("ipc_kmsg_copyout_header: can't grow kernel ipc space\n"); return (MACH_RCV_HEADER_ERROR| MACH_MSG_IPC_KERNEL); - else + } else { + printf("ipc_kmsg_copyout_header: can't grow user ipc space\n"); return (MACH_RCV_HEADER_ERROR| MACH_MSG_IPC_SPACE); } + } /* space is locked again; start over */ continue; @@ -2099,9 +2095,11 @@ kr = ipc_port_dngrow(reply, ITS_SIZE_NONE); /* port is unlocked */ - if (kr != KERN_SUCCESS) + if (kr != KERN_SUCCESS) { + printf("ipc_kmsg_copyout_header: can't grow kernel ipc space2\n"); return (MACH_RCV_HEADER_ERROR| MACH_MSG_IPC_KERNEL); + } is_write_lock(space); continue; @@ -2121,6 +2119,7 @@ kr = ipc_right_copyout(space, reply_name, entry, reply_type, TRUE, (ipc_object_t) reply); /* reply port is unlocked */ + /* XXXMAC - ipc_right_copyout() *can* fail due to MAC */ assert(kr == KERN_SUCCESS); if (notify_port != IP_NULL) @@ -2138,6 +2137,7 @@ is_read_lock(space); if (!space->is_active) { + printf("ipc_kmsg_copyout_header: dead space2\n"); is_read_unlock(space); return MACH_RCV_HEADER_ERROR|MACH_MSG_IPC_SPACE; } @@ -2148,11 +2148,13 @@ /* must check notify even though it won't be used */ if ((entry = ipc_entry_lookup(space, notify)) == IE_NULL) { + printf("ipc_kmsg_copyout_header: ipc_entry_lookup failed\n"); is_read_unlock(space); return MACH_RCV_INVALID_NOTIFY; } if ((entry->ie_bits & MACH_PORT_TYPE_RECEIVE) == 0) { + printf("ipc_kmsg_copyout_header: MACH_PORT_TYPE_RECEIVE not set!\n"); is_read_unlock(space); return MACH_RCV_INVALID_NOTIFY; } @@ -2537,8 +2539,10 @@ mach_msg_return_t mr; mr = ipc_kmsg_copyout_header(&kmsg->ikm_header, space, notify); - if (mr != MACH_MSG_SUCCESS) + if (mr != MACH_MSG_SUCCESS) { + printf("ipc_kmsg_copyout: ipc_kmsg_copyout_header failed: %d\n", mr); return mr; + } if (kmsg->ikm_header.msgh_bits & MACH_MSGH_BITS_COMPLEX) { mr = ipc_kmsg_copyout_body(kmsg, space, map, slist); From owner-p4-projects@FreeBSD.ORG Thu Feb 9 19:25:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8071816A423; Thu, 9 Feb 2006 19:25:43 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2C9E316A420 for ; Thu, 9 Feb 2006 19:25:43 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD95B43D46 for ; Thu, 9 Feb 2006 19:25:42 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19JPgnR028801 for ; Thu, 9 Feb 2006 19:25:42 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19JPgos028798 for perforce@freebsd.org; Thu, 9 Feb 2006 19:25:42 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 9 Feb 2006 19:25:42 GMT Message-Id: <200602091925.k19JPgos028798@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 91451 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 19:25:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=91451 Change 91451 by deker@deker_build1.columbia.sparta.com on 2006/02/09 19:25:08 Add support for mac_check_port_receive() entry point. Submitted by: millert Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/security/mac_port.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/security/mac_port.c#7 (text+ko) ==== @@ -128,6 +128,16 @@ } int +mac_check_port_receive(struct label *task, struct label *sender) +{ + int error; + + MAC_CHECK(check_port_receive, task, sender); + + return (error); +} + +int mac_check_port_make_send(struct label *task, struct label *port) { int error; From owner-p4-projects@FreeBSD.ORG Thu Feb 9 19:28:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52CC916A424; Thu, 9 Feb 2006 19:28:51 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 15C5216A420 for ; Thu, 9 Feb 2006 19:28:51 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 24AD143D5C for ; Thu, 9 Feb 2006 19:28:47 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19JSk9b028970 for ; Thu, 9 Feb 2006 19:28:46 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19JSkkO028967 for perforce@freebsd.org; Thu, 9 Feb 2006 19:28:46 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 9 Feb 2006 19:28:46 GMT Message-Id: <200602091928.k19JSkkO028967@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 91452 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 19:28:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=91452 Change 91452 by deker@deker_build1.columbia.sparta.com on 2006/02/09 19:28:42 per millert: "Simpler version of sebsd_enabled()" Submitted by: millert Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/system.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/system.c#3 (text+ko) ==== @@ -35,37 +35,29 @@ */ #include #include -#include +#include #include #include #include -int sebsd_enabled() +int +sebsd_enabled(void) { - int args[2]; - int i; - size_t mibn = sizeof(int) * 64; - int mibs[64]; + int i, error; - args[0] = 0; - args[1] = 3; - - const char *name = "security.mac.sebsd.enforcing"; - i = sysctl (args, 2, mibs, &mibn, name, strlen(name)); - if (i < 0) - return 0; - return 1; + error = sysctlbyname("security.mac.sebsd.enforcing", &i, + sizeof(i), NULL, 0); + return (!error || errno != ENOENT); } int -sebsd_enforcing() +sebsd_enforcing(void) { int i, error; - error = sysctlbyname ("security.mac.sebsd.enforcing", - &i, sizeof (int), NULL, 0); - if (error) - return 0; - return i; + + error = sysctlbyname("security.mac.sebsd.enforcing", &i, + sizeof(i), NULL, 0); + return (error ? 0 : i); } struct lp_args @@ -87,9 +79,31 @@ fseek (fp, 0, SEEK_END); la.len = ftell (fp); fseek (fp, 0, SEEK_SET); - la.data = malloc (la.len); - if (1 != fread (la.data, la.len, 1, fp)) - return EIO; + if ((la.data = malloc (la.len)) == NULL) + return (ENOMEM); + if (fread(la.data, la.len, 1, fp) != 1) + return (EIO); + + return (mac_syscall(SEBSD_ID_STRING, SEBSDCALL_LOAD_POLICY, &la)); +} + +int +sebsd_load_migscs(const char *path) +{ + FILE *fp; + struct lp_args la; + + fp = fopen (path, "rb"); + if (fp == NULL) + return errno; + + fseek(fp, 0, SEEK_END); + la.len = ftell(fp); + fseek(fp, 0, SEEK_SET); + if ((la.data = malloc(la.len)) == NULL) + return (ENOMEM); + if (fread(la.data, la.len, 1, fp) != 1) + return (EIO); - return mac_syscall(SEBSD_ID_STRING, SEBSDCALL_LOAD_POLICY, &la); + return (mac_syscall(SEBSD_ID_STRING, SEBSDCALL_LOAD_MIGSCS, &la)); } From owner-p4-projects@FreeBSD.ORG Thu Feb 9 19:31:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 498FB16A423; Thu, 9 Feb 2006 19:31:52 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EA8DB16A420 for ; Thu, 9 Feb 2006 19:31:51 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B918B43D45 for ; Thu, 9 Feb 2006 19:31:51 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19JVpuf029131 for ; Thu, 9 Feb 2006 19:31:51 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19JVpxF029128 for perforce@freebsd.org; Thu, 9 Feb 2006 19:31:51 GMT (envelope-from millert@freebsd.org) Date: Thu, 9 Feb 2006 19:31:51 GMT Message-Id: <200602091931.k19JVpxF029128@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91453 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 19:31:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=91453 Change 91453 by millert@millert_ibook on 2006/02/09 19:30:51 Less hackish method of disabling the hot path Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_msg.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_msg.c#7 (text+ko) ==== @@ -581,7 +581,11 @@ #endif /* !HOTPATH_DEBUG */ +#ifdef MAC +boolean_t enable_hotpath = FALSE; /* XXX - push MAC into HOTPATH too */ +#else boolean_t enable_hotpath = TRUE; /* Patchable, just in case ... */ +#endif #endif /* HOTPATH_ENABLE */ /* @@ -613,7 +617,7 @@ option & ~(MACH_SEND_TRAILER|MACH_RCV_TRAILER_MASK|MACH_RCV_LARGE); int i; -#if ENABLE_HOTPATH_INSECURE +#if ENABLE_HOTPATH /* BEGINNING OF HOT PATH */ if ((masked_option == (MACH_SEND_MSG|MACH_RCV_MSG)) && enable_hotpath) { register thread_t self = current_thread(); From owner-p4-projects@FreeBSD.ORG Thu Feb 9 19:55:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 70BF416A448; Thu, 9 Feb 2006 19:55:21 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1940016A446 for ; Thu, 9 Feb 2006 19:55:21 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6BE9E43D6A for ; Thu, 9 Feb 2006 19:55:20 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19JtKmQ030031 for ; Thu, 9 Feb 2006 19:55:20 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19JtKGF030028 for perforce@freebsd.org; Thu, 9 Feb 2006 19:55:20 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 9 Feb 2006 19:55:20 GMT Message-Id: <200602091955.k19JtKGF030028@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 91454 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 19:55:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=91454 Change 91454 by deker@deker_build1.columbia.sparta.com on 2006/02/09 19:54:38 Add bits to add notifyd and mtest method mappings to migscs Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/Makefile#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/Makefile#8 (text+ko) ==== @@ -45,9 +45,7 @@ # Mig security classes and access vectors -DEFS = $(DARWIN_ROOT)/system_cmds/mach_init.tproj/bootstrap.defs -#DEFS+= $(DARWIN_ROOT)/netinfo/servers/notifyd/notify_ipc.defs -#DEFS+= $(DARWIN_ROOT)/../../examples/mig/mtest.defs +DEFS = $(DARWIN_ROOT)/system_cmds/mach_init.tproj/bootstrap.defs $(DARWIN_ROOT)/netinfo/servers/notifyd/notify_ipc.defs $(DARWIN_ROOT)/../../examples/mig/mtest.defs mig_msgids: $(DEFS) echo > $@ From owner-p4-projects@FreeBSD.ORG Thu Feb 9 19:59:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82B7316A423; Thu, 9 Feb 2006 19:59:26 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 44B6216A420 for ; Thu, 9 Feb 2006 19:59:26 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CDFDD43D75 for ; Thu, 9 Feb 2006 19:59:25 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19JxPlx030225 for ; Thu, 9 Feb 2006 19:59:25 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19JxPUN030222 for perforce@freebsd.org; Thu, 9 Feb 2006 19:59:25 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 9 Feb 2006 19:59:25 GMT Message-Id: <200602091959.k19JxPUN030222@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 91455 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 19:59:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=91455 Change 91455 by deker@deker_build1.columbia.sparta.com on 2006/02/09 19:58:43 Update policy. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/macros/global_macros.te#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/rules#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/sebsd-relabel.sh#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/users#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/macros/global_macros.te#4 (text+ko) ==== @@ -310,6 +310,63 @@ ################################# # +# domain_exec_trans(parent_domain, child_domain) +# +# Permissions for transitioning to a new domain. +# + +define(`domain_exec_trans',` + +# +# Allow the process to transition to the new domain. +# +allow $1 $2:process transition; + +# +# Do not audit when glibc secure mode is enabled upon the transition. +# +dontaudit $1 $2:process noatsecure; + +# +# Allow the process to execute the program. +# +allow $1 *:file { read x_file_perms }; + +# +# Allow the process to reap the new domain. +# +allow $2 $1:process sigchld; + +# +# Allow the new domain to inherit and use file +# descriptions from the creating process and vice versa. +# +allow $2 $1:fd use; +allow $1 $2:fd use; + +# +# Allow the new domain to write back to the old domain via a pipe. +# +allow $2 $1:fifo_file rw_file_perms; + +# +# Allow the new domain to read and execute the program. +# +allow $2 *:file rx_file_perms; + +# +# Allow the new domain to be entered via the program. +# +allow $2 *:file entrypoint; + +# +# Make the transition +# +type_transition $1 *:process $2; +') + +################################# +# # domain_auto_trans(parent_domain, program_type, child_domain) # # Define a default domain transition and allow it. @@ -1162,22 +1219,31 @@ ##### define(`allow_mach_ipc', ` -allow $1 $2:mach_port { send copy_send make_send }; -allow $2 $1:mach_port { send copy_send make_send }; +allow $1 $2:mach_port { send copy_send make_send hold_send hold_recv }; +allow $2 $1:mach_port { send copy_send make_send hold_send hold_recv }; ') define(`mach_bootstrap', ` -allow $1 $2:mach_port { send copy_send make_send }; +allow $1 $2:mach_port { send copy_send make_send hold_send hold_recv }; allow $1 $2:mi_bootstrap { bootstrap_look_up bootstrap_look_up_array }; -allow init_d $1:mach_port { send copy_send }; +allow mach_init_d $1:mach_port { send copy_send hold_send hold_recv }; ') define(`mach_bootstrap_register', ` allow $1 $2:mi_bootstrap *; -allow $1 $2:mach_port { send copy_send }; -allow init_d $1:mach_port { send copy_send }; +allow $1 $2:mach_port { send copy_send hold_send hold_recv }; +allow mach_init_d $1:mach_port { send copy_send hold_send hold_recv }; +') + +define(`allow_notify_ipc', ` +allow $1 mach_init_d:mi_notify_ipc *; +allow $1 notifyd_d:mi_notify_ipc *; +allow notifyd_d $1:mi_notify_ipc *; +allow $1 notifyd_d:mach_port { send copy_send hold_send hold_recv }; +allow notifyd_d $1:mach_port { send copy_send hold_send hold_recv }; ') + define(`boot_names_t', `init_d') define(`user_names_t', `user_d') define(`user_secret_names_t', `user_secret_d') ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/rules#6 (text+ko) ==== @@ -10,10 +10,16 @@ type unlabeled_t, file, fs; type file_t, file; type bin_t, file; +type init_exec_t, file; +type mach_init_exec_t, file; type shell_exec_t, file; type login_exec_t, file; +type sshd_exec_t, file; type init_d, domain, domain2; +type mach_init_d, domain, domain2; +type mach_servers_d, domain, domain2; type login_d, domain, domain2; +type sshd_d, domain, domain2; type user_d, domain, domain2; type user_secret_d, domain, domain2; type protected_d, domain2; @@ -53,6 +59,10 @@ type systemstarter_d, domain, domain2; type lookupd_d, domain, domain2; type directoryservice_d, domain, domain2; +type notifyd_d, domain, domain2; +type mtest_d, domain, domain2; +type diskarbitrationd_d, domain, domain2; +type configd_d, domain, domain2; type pbs_exec_t, file; type cron_exec_t, file; @@ -63,9 +73,16 @@ type systemstarter_exec_t, file; type lookupd_exec_t, file; type directoryservice_exec_t, file; +type notifyd_exec_t, file; +type mtest_exec_t, file; +type diskarbitrationd_exec_t, file; +type configd_exec_t, file; role system_r types init_d; +role system_r types mach_init_d; +role system_r types mach_servers_d; role system_r types login_d; +role system_r types sshd_d; role system_r types user_d; role system_r types sysadm_d; role system_r types pbs_d; @@ -77,12 +94,18 @@ role system_r types systemstarter_d; role system_r types directoryservice_d; role system_r types lookupd_d; +role system_r types notifyd_d; +role system_r types mtest_d; +role system_r types diskarbitrationd_d; +role system_r types configd_d; role system_r types security_t; role system_r types unlabeled_t; role system_r types kernel_d; role system_r types boot_names_t; #role object_r types file_t; #role object_r types bin_t; +role object_r types init_exec_t; +role object_r types mach_init_exec_t; role object_r types shell_exec_t; role object_r types login_exec_t; role object_r types unlabeled_t; @@ -92,7 +115,10 @@ role user_r types user_d; role user_r types user_port_t; role user_r types protected_d; +role user_r types login_d; role user_secret_r types user_secret_d; +role user_secret_r types login_d; +role user_secret_r types mtest_d; role sysadm_r types sysadm_d; allow system_r user_r; @@ -104,25 +130,50 @@ #allow init_d { bin_t shell_exec_t file_t }:dir_file_class_set rw_file_perms; #allow init_d bin_t:file execute_no_trans; + +# Things executed by mach_init transition to mach_servers_d +# XXX - awful hack +domain_exec_trans(mach_init_d,mach_servers_d); + +# Transition from init_d -> mach_init_d when mach_init starts +# and then back to init_d when BSD init is exec'd +domain_auto_trans(init_d,mach_init_exec_t,mach_init_d); +domain_auto_trans(mach_init_d,init_exec_t,init_d); + +# User transitions for login and sshd domain_auto_trans(init_d,login_exec_t,login_d); - +domain_auto_trans(user_d,login_exec_t,login_d); +domain_auto_trans(user_secret_d,login_exec_t,login_d); +domain_auto_trans(sysadm_d,login_exec_t,login_d); domain_trans(login_d,shell_exec_t,user_d); domain_trans(login_d,shell_exec_t,user_secret_d); domain_trans(login_d,shell_exec_t,sysadm_d); +domain_auto_trans(systemstarter_d,sshd_exec_t,sshd_d); +domain_trans(sshd_d,shell_exec_t,user_d); +domain_trans(sshd_d,shell_exec_t,user_secret_d); +domain_trans(sshd_d,shell_exec_t,sysadm_d); + +# WindowServer runs commands on behalf of the console user domain_trans(windowserver_d,shell_exec_t,user_d); domain_trans(windowserver_d,shell_exec_t,user_secret_d); domain_trans(windowserver_d,shell_exec_t,sysadm_d); +# User transitions for MAC.loginPlugin +domain_trans(loginwindow_d,shell_exec_t,user_d); +domain_trans(loginwindow_d,shell_exec_t,user_secret_d); +domain_trans(loginwindow_d,shell_exec_t,sysadm_d); + + type_change user_d devpts_t:chr_file user_devpts_t; -allow domain2 self:mach_port { send make_send copy_send move_recv }; -allow domain2 kernel_d:mach_port { send make_send copy_send }; +allow domain2 self:mach_port { send make_send copy_send hold_send move_recv hold_recv }; +allow domain2 kernel_d:mach_port { send make_send copy_send hold_send }; allow domain2 self:mach_task set_special_port; allow domain2 self:mi_bootstrap { bootstrap_look_up }; allow domain2 root_t:dir { search getattr read }; allow domain2 self:process getsched; -allow kernel_d domain2:mach_port { send make_send copy_send }; +allow kernel_d domain2:mach_port { send make_send copy_send hold_send }; allow domain2 file:{file lnk_file sock_file fifo_file} {create_file_perms execute }; allow domain2 file:file execute_no_trans; @@ -142,14 +193,24 @@ domain_trans(user_d,shell_exec_t,protected_d); allow user_d security_t:security *; -domain_auto_trans(init_d,windowserver_exec_t,windowserver_d); +# Transitions for mach servers started by mach_init +domain_auto_trans(mach_init_d,windowserver_exec_t,windowserver_d); +domain_auto_trans(mach_init_d,lookupd_exec_t,lookupd_d); +domain_auto_trans(mach_init_d,notifyd_exec_t,notifyd_d); +domain_auto_trans(mach_init_d,diskarbitrationd_exec_t,diskarbitrationd_d); +domain_auto_trans(mach_init_d,configd_exec_t,configd_d); + +# Transitions for things started by BSD init +domain_auto_trans(init_d,systemstarter_exec_t,systemstarter_d); +domain_auto_trans(init_d,loginwindow_exec_t,loginwindow_d); # via /etc/ttys + +# Transitions for mtest +domain_auto_trans(user_secret_d,mtest_exec_t,mtest_d); + domain_auto_trans(systemstarter_d,windowserver_exec_t,windowserver_d); -domain_auto_trans(init_d,loginwindow_exec_t,loginwindow_d); -domain_auto_trans(init_d,systemstarter_exec_t,systemstarter_d); domain_auto_trans(systemstarter_d,securityserver_exec_t,securityserver_d); domain_auto_trans(systemstarter_d,coreservices_exec_t,coreservices_d); domain_auto_trans(systemstarter_d,cron_exec_t,cron_d); -domain_auto_trans(systemstarter_d,lookupd_exec_t,lookupd_d); domain_auto_trans(loginwindow_d,pbs_exec_t,pbs_d); allow user_secret_d secret_t:{file lnk_file} create_file_perms; @@ -159,97 +220,172 @@ #type_change user_d user_d:mach_port user_port_t; +allow_mach_ipc(init_d,mach_init_d); +allow_mach_ipc(login_d,mach_init_d); +allow_mach_ipc(login_d,unlabeled_t); +allow_mach_ipc(mach_servers_d,mach_init_d); +allow_mach_ipc(mach_servers_d,init_d); + allow_mach_ipc(securityserver_d,coreservices_d); allow_mach_ipc(securityserver_d,loginwindow_d); allow_mach_ipc(securityserver_d,windowserver_d); +allow_notify_ipc(windowserver_d); allow_mach_ipc(loginwindow_d,windowserver_d); allow_mach_ipc(loginwindow_d,unlabeled_t); +allow_mach_ipc(loginwindow_d,init_d); -allow init_d self:mi_bootstrap { bootstrap_register bootstrap_look_up }; +allow mach_init_d self:mi_bootstrap { bootstrap_register bootstrap_look_up }; allow kernel_d names:mach_port send; -allow_mach_ipc(init_d,coreservices_d); #??? -mach_bootstrap(init_d,boot_names_t,boot_names_t); #??? -mach_bootstrap_register(init_d,boot_names_t); +allow_mach_ipc(mach_init_d,coreservices_d); #??? +mach_bootstrap(mach_init_d,boot_names_t); +mach_bootstrap_register(mach_init_d,boot_names_t); #type_change loginwindow_d loginwindow_d:mach_names user_names_t; #XXX -allow init_d init_d:mach_port relabelfrom; -allow init_d boot_names_t:mach_port relabelto; -allow init_d {loginwindow_d windowserver_d}:mach_port relabelto; -allow init_d user_names_t:mach_port { copy_send relabelto }; +allow mach_init_d mach_init_d:mach_port relabelfrom; +allow mach_init_d boot_names_t:mach_port relabelto; +allow mach_init_d {loginwindow_d windowserver_d}:mach_port relabelto; +allow mach_init_d user_names_t:mach_port { copy_send hold_send relabelto }; allow_mach_ipc(systemstarter_d,unlabeled_t); allow_mach_ipc(systemstarter_d,boot_names_t); -allow_mach_ipc(systemstarter_d,init_d); +allow_mach_ipc(systemstarter_d,mach_init_d); # XXX - init_d too? +allow_mach_ipc(systemstarter_d,mach_servers_d); allow_mach_ipc(systemstarter_d,lookupd_d); allow_mach_ipc(systemstarter_d,coreservices_d); -mach_bootstrap(systemstarter_d,boot_names_t,coreservices_d); -mach_bootstrap(systemstarter_d,boot_names_t,securityserver_d); -mach_bootstrap(systemstarter_d,boot_names_t,windowserver_d); -mach_bootstrap(systemstarter_d,boot_names_t,boot_names_t); -mach_bootstrap_register(systemstarter_d,boot_names_t,boot_names_t); +mach_bootstrap(systemstarter_d,boot_names_t); +mach_bootstrap_register(systemstarter_d,boot_names_t); +allow_notify_ipc(systemstarter_d); -mach_bootstrap(coreservices_d,boot_names_t,boot_names_t); -mach_bootstrap(coreservices_d,boot_names_t,init_d); -mach_bootstrap(coreservices_d,boot_names_t,systemstarter_d); #??? +mach_bootstrap(coreservices_d,boot_names_t); mach_bootstrap_register(coreservices_d,boot_names_t); -mach_bootstrap(windowserver_d,boot_names_t,boot_names_t); -mach_bootstrap(windowserver_d,boot_names_t,coreservices_d); -mach_bootstrap(windowserver_d,boot_names_t,windowserver_d); +mach_bootstrap(windowserver_d,boot_names_t); allow_mach_ipc(windowserver_d,systemstarter_d); allow_mach_ipc(windowserver_d,pbs_d); allow_mach_ipc(windowserver_d,lookupd_d); -allow_mach_ipc(windowserver_d,init_d); # for wsloginui +allow_mach_ipc(windowserver_d,mach_init_d); # for wsloginui? +allow_mach_ipc(windowserver_d,mach_servers_d); # for wsloginui allow_mach_ipc(windowserver_d,coreservices_d); # for wsloginui mach_bootstrap_register(windowserver_d,boot_names_t); -allow windowserver_d init_d:mi_bootstrap bootstrap_register; +allow windowserver_d mach_init_d:mi_bootstrap bootstrap_register; allow_mach_ipc(loginwindow_d,coreservices_d); -allow_mach_ipc(loginwindow_d,init_d); +allow_mach_ipc(loginwindow_d,mach_init_d); +allow_mach_ipc(loginwindow_d,mach_servers_d); allow_mach_ipc(loginwindow_d,lookupd_d); allow_mach_ipc(loginwindow_d,systemstarter_d); -mach_bootstrap(loginwindow_d,boot_names_t,init_d); -mach_bootstrap(loginwindow_d,boot_names_t,boot_names_t); -mach_bootstrap(loginwindow_d,boot_names_t,windowserver_d); -mach_bootstrap(loginwindow_d,boot_names_t,securityserver_d); +allow_notify_ipc(loginwindow_d); +mach_bootstrap(loginwindow_d,boot_names_t); mach_bootstrap_register(loginwindow_d,boot_names_t); allow loginwindow_d boot_names_t:mi_bootstrap bootstrap_subset; -mach_bootstrap(securityserver_d,boot_names_t,init_d); -mach_bootstrap(securityserver_d,boot_names_t,boot_names_t); -mach_bootstrap(securityserver_d,boot_names_t,coreservices_d); -mach_bootstrap(securityserver_d,boot_names_t,windowserver_d); -mach_bootstrap(securityserver_d,boot_names_t,systemstarter_d); #??? -allow_mach_ipc(securityserver_d,init_d); #??? +mach_bootstrap(securityserver_d,boot_names_t); +allow_mach_ipc(securityserver_d,mach_init_d); #??? allow_mach_ipc(securityserver_d,systemstarter_d); #??? allow_mach_ipc(securityserver_d,lookupd_d); +allow_mach_ipc(securityserver_d,diskarbitrationd_d); +allow_mach_ipc(securityserver_d,mach_servers_d); # XXX allow_mach_ipc(lookupd_d,coreservices_d); -allow_mach_ipc(lookupd_d,init_d); #DirectoryService? +allow_mach_ipc(lookupd_d,mach_init_d); +allow_mach_ipc(lookupd_d,mach_servers_d); #DirectoryService? allow_mach_ipc(lookupd_d,cron_d); -mach_bootstrap(lookupd_d,boot_names_t,boot_names_t); +allow_notify_ipc(lookupd_d); +mach_bootstrap(lookupd_d,boot_names_t); allow lookupd_d boot_names_t:mi_bootstrap bootstrap_create_server; -mach_bootstrap(cron_d,boot_names_t,init_d); -allow_mach_ipc(cron_d,init_d); +# notifyd rules +mach_bootstrap(notifyd_d,mach_init_d); +allow_notify_ipc(init_d); # XXX +allow_notify_ipc(mach_servers_d); # XXX + +#mtest rules +allow_mach_ipc(user_secret_d, mtest_d); +allow_mach_ipc(mtest_d, unlabeled_t); +allow_mach_ipc(mtest_d, mach_init_d); +allow user_secret_d mtest_d:mi_mtest *; +allow mtest_d user_secret_d:mi_mtest *; + +#diskarbitrationd rules +mach_bootstrap(diskarbitrationd_d,mach_init_d); +#allow diskarbitrationd_d notifyd_d:mi_notify_ipc { _notify_server_register_check _notify_server_register_mach_port }; +#allow notifyd_d diskarbitrationd_d:mach_port { copy_send hold_send }; +#allow diskarbitrationd_d notifyd_d:mach_port { copy_send hold_send }; +allow_notify_ipc(diskarbitrationd_d); +allow_mach_ipc(diskarbitrationd_d,unlabeled_t); +allow_mach_ipc(diskarbitrationd_d,mach_servers_d); +allow_mach_ipc(diskarbitrationd_d,loginwindow_d); +allow_mach_ipc(diskarbitrationd_d,lookupd_d); +allow_mach_ipc(diskarbitrationd_d,securityserver_d); +allow_mach_ipc(diskarbitrationd_d,systemstarter_d); + +# user_d rules +allow_notify_ipc(user_d); +allow_mach_ipc(user_d,diskarbitrationd_d); +allow_mach_ipc(user_d,mach_servers_d); +allow_mach_ipc(user_d,init_d); + +# user_secret_d rules +allow_notify_ipc(user_secret_d); +allow_mach_ipc(user_secret_d,diskarbitrationd_d); +allow_mach_ipc(user_secret_d,mach_servers_d); +allow_mach_ipc(user_secret_d,init_d); +allow_mach_ipc(user_secret_d,login_d); + +# user_secret_d rules +#allow_notify_ipc(user_secret_d); +#allow_mach_ipc(user_secret_d,diskarbitrationd_d); +#allow_mach_ipc(user_secret_d,mach_servers_d); +#allow_mach_ipc(user_secret_d,init_d); + +# sysadm_d rules +allow_notify_ipc(sysadm_d); +allow_mach_ipc(sysadm_d,diskarbitrationd_d); +allow_mach_ipc(sysadm_d,mach_servers_d); +allow_mach_ipc(sysadm_d,init_d); + +# sshd_d rules +allow_notify_ipc(sshd_d); +allow_mach_ipc(sshd_d,unlabeled_t); +allow_mach_ipc(sshd_d,mach_init_d); +allow_mach_ipc(sshd_d,securityserver_d); +allow_mach_ipc(sshd_d,lookupd_d); +allow_mach_ipc(sshd_d,user_d); + +#logind rules +allow_notify_ipc(login_d); +allow_mach_ipc(lookupd_d,login_d); + +# test rule to allow talking to unlabeled_t stuff +allow_notify_ipc(unlabeled_t); + +# configd rules +mach_bootstrap(configd_d,mach_init_d); + +mach_bootstrap(cron_d,boot_names_t); +allow_mach_ipc(cron_d,mach_init_d); allow pbs_d appl_t:dir { search getattr read }; allow pbs_d appl_t:file { read getattr }; allow pbs_d lib_t:dir { search getattr }; allow pbs_d lib_t:file { read getattr }; -allow_mach_ipc(pbs_d,init_d); +allow_mach_ipc(pbs_d,mach_init_d); allow_mach_ipc(pbs_d,lookupd_d); allow_mach_ipc(pbs_d,coreservices_d); -mach_bootstrap_register(pbs_d,boot_names_t,boot_names_t); +allow_mach_ipc(pbs_d,mach_servers_d); +mach_bootstrap_register(pbs_d,boot_names_t); allow_mach_ipc(kernel_d,unlabeled_t); allow_mach_ipc(cron_d,unlabeled_t); allow_mach_ipc(init_d,unlabeled_t); +allow_mach_ipc(mach_init_d,unlabeled_t); +allow_mach_ipc(mach_servers_d,unlabeled_t); # XXX allow_mach_ipc(pbs_d,unlabeled_t); allow_mach_ipc(user_d,unlabeled_t); allow_mach_ipc(user_secret_d,unlabeled_t); +allow_mach_ipc(sysadm_d,unlabeled_t); allow_mach_ipc(protected_d,unlabeled_t); allow_mach_ipc(lookupd_d,unlabeled_t); allow_mach_ipc(coreservices_d,unlabeled_t); @@ -261,58 +397,46 @@ # define(`user_sys_access',` -allow $1 { $1 init_d }:mi_bootstrap { bootstrap_register bootstrap_look_up bootstrap_look_up_array }; +allow $1 { $1 mach_init_d }:mi_bootstrap { bootstrap_register bootstrap_look_up bootstrap_look_up_array }; -mach_bootstrap(init_d,$2,securityserver_d); #??? +mach_bootstrap(mach_init_d,$2); mach_bootstrap_register(windowserver_d,$2); allow_mach_ipc(windowserver_d,$1); -mach_bootstrap(windowserver_d,$2,systemstarter_d); -mach_bootstrap(windowserver_d,$2,pbs_d); -mach_bootstrap(windowserver_d,$2,coreservices_d); -mach_bootstrap(windowserver_d,$2,$2); -mach_bootstrap(windowserver_d,$2,init_d); +mach_bootstrap(windowserver_d,$2); allow_mach_ipc(loginwindow_d,$1); -mach_bootstrap(loginwindow_d,$2,$2); -mach_bootstrap(loginwindow_d,$2,coreservices_d); -mach_bootstrap(loginwindow_d,$2,systemstarter_d); #??? -mach_bootstrap(loginwindow_d,$2,$1); #??? +mach_bootstrap(loginwindow_d,$2); mach_bootstrap_register(loginwindow_d,$2); allow loginwindow_d $2:mi_bootstrap bootstrap_create_server; -mach_bootstrap(securityserver_d,$2,$2); -mach_bootstrap(securityserver_d,$2,$1); +mach_bootstrap(securityserver_d,$2); mach_bootstrap_register(securityserver_d,$2); mach_bootstrap_register(securityserver_d,boot_names_t); +allow_notify_ipc(securityserver_d); allow_mach_ipc($1,systemstarter_d); +allow_mach_ipc($1,mach_init_d); allow_mach_ipc($1,init_d); allow_mach_ipc($1,coreservices_d); #SystemUIServer -mach_bootstrap($1,$2,coreservices_d); -mach_bootstrap($1,$2,pbs_d); -mach_bootstrap($1,$2,loginwindow_d); -mach_bootstrap($1,$2,securityserver_d); -mach_bootstrap($1,$2,windowserver_d); -mach_bootstrap($1,$2,systemstarter_d); #??? +mach_bootstrap($1,$2); mach_bootstrap_register($1,$2); -mach_bootstrap($1,$2,$2); allow_mach_ipc($1,securityserver_d); allow_mach_ipc($1,lookupd_d); allow_mach_ipc(pbs_d,$1); -allow pbs_d $1:mach_port { send copy_send }; +allow pbs_d $1:mach_port { send copy_send hold_send }; mach_bootstrap_register(pbs_d,$2); -mach_bootstrap(pbs_d,$2,coreservices_d); -mach_bootstrap(pbs_d,$2,init_d) #??? +mach_bootstrap(pbs_d,$2); ') user_sys_access(user_d,user_names_t); +user_sys_access(sysadm_d,user_names_t); user_sys_access(protected_d,user_names_t); user_sys_access(user_secret_d,user_names_t); # can't use other names types yet bool lookups false; if (lookups) { -allow user_d {init_d systemstarter_d loginwindow_d user_d}:mi_bootstrap bootstrap_info; +allow user_d {mach_init_d init_d systemstarter_d loginwindow_d user_d}:mi_bootstrap bootstrap_info; } ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/sebsd-relabel.sh#3 (text+ko) ==== @@ -13,11 +13,18 @@ $SETFMAC sebsd/system_u:object_r:bin_t /usr/bin/* $SETFMAC sebsd/system_u:object_r:bin_t /usr/local/bin/* $SETFMAC sebsd/system_u:object_r:shell_exec_t /bin/*sh +$SETFMAC sebsd/system_u:object_r:login_exec_t /usr/bin/login +$SETFMAC sebsd/system_u:object_r:sshd_exec_t /usr/sbin/sshd $SETFMAC sebsd/system_u:object_r:lookupd_exec_t /usr/sbin/lookupd +$SETFMAC sebsd/system_u:object_r:mach_init_exec_t /sbin/mach_init +$SETFMAC sebsd/system_u:object_r:init_exec_t /sbin/init $SETFMAC -R sebsd/system_u:object_r:appl_t /Applications/* $SETFMAC sebsd/system_u:object_r:systemstarter_exec_t /sbin/SystemStarter +$SETFMAC sebsd/system_u:object_r:systemstarter_exec_t /usr/sbin/xinetd $SETFMAC sebsd/system_u:object_r:coreservices_exec_t /System/Library/CoreServices/coreservicesd $SETFMAC sebsd/system_u:object_r:loginwindow_exec_t /System/Library/CoreServices/loginwindow.app/Contents/MacOS/loginwindow +$SETFMAC sebsd/system_u:object_r:notifyd_exec_t /usr/sbin/notifyd +$SETFMAC sebsd/system_u:object_r:diskarbitrationd_exec_t /usr/sbin/diskarbitrationd $SETFMAC sebsd/system_u:object_r:pbs_exec_t /System/Library/CoreServices/pbs $SETFMAC sebsd/system_u:object_r:windowserver_exec_t /System/Library/Frameworks/ApplicationServices.framework/Frameworks/CoreGraphics.framework/Resources/WindowServer* $SETFMAC sebsd/system_u:object_r:securityserver_exec_t /System/Library/CoreServices/SecurityServer ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/users#4 (text+ko) ==== @@ -5,5 +5,6 @@ user rwatson roles { user_r user_secret_r }; user cvance roles { user_r user_secret_r }; user millert roles { user_r user_secret_r }; -user deker roles { user_r user_secret_r }; +user robdeker roles { user_r user_secret_r }; +user pleblanc roles { user_r user_secret_r }; user test roles { user_r user_secret_r }; From owner-p4-projects@FreeBSD.ORG Thu Feb 9 20:03:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01A2016A423; Thu, 9 Feb 2006 20:03:31 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8DD4616A420 for ; Thu, 9 Feb 2006 20:03:31 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 522D243D46 for ; Thu, 9 Feb 2006 20:03:31 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19K3VdG030430 for ; Thu, 9 Feb 2006 20:03:31 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19K3Umm030427 for perforce@freebsd.org; Thu, 9 Feb 2006 20:03:30 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 9 Feb 2006 20:03:30 GMT Message-Id: <200602092003.k19K3Umm030427@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 91456 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 20:03:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=91456 Change 91456 by deker@deker_build1.columbia.sparta.com on 2006/02/09 20:02:57 per millert: "Document the -m flag. Remove some lint." Submitted by: millert Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/Makefile#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/sebsd_loadpolicy.8#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/sebsd_loadpolicy.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/Makefile#4 (text+ko) ==== @@ -6,7 +6,7 @@ OBJS= sebsd_loadpolicy.o -CFLAGS+= -I$(SOURCE_ROOT)/sedarwin +CFLAGS+= -Wall -I$(SOURCE_ROOT)/sedarwin LDADD+= -L$(SOURCE_ROOT)/sedarwin/libselinux/src LDADD+= -lselinux $(LIBMAC) ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/sebsd_loadpolicy.8#3 (text+ko) ==== @@ -1,3 +1,4 @@ +.\" Copyright (c) 2005 SPARTA, Inc. .\" Copyright (c) 2002 Networks Associates Technology, Inc. .\" All rights reserved. .\" @@ -29,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD: $ -.Dd August 27, 2003 +.Dd December 28, 2005 .Dt SEBSD_LOADPOLICY 8 .Os .Sh NAME @@ -37,10 +38,23 @@ .Nd Re-load the sebsd policy .Sh SYNOPSIS .Nm sebsd_loadpolicy -.Ar policyfile +.Op Fl m Ar migscsfile +.Ar policy_file .Sh DESCRIPTION The .Nm sebsd_loadpolicy -utility loads a new security policy for the SEBSD module. The new policy file is specified in -.Ar policyfile . - +utility loads a new security policy for the SEBSD module. +The new policy file is specified in +.Ar policy_file . +.Pp +The options are as follows: +.Bl -tag -width Ds +.It Fl m Ar migscsfile +Load +.Ar migscsfile , +a mapping of security classes to MiG subsystem IDs, +in addition to +.Ar policy_file . +.Sh SEE ALSO +.Xr mac 4 , +.Xr selinux 8 ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/sebsd_loadpolicy.c#3 (text+ko) ==== @@ -1,12 +1,7 @@ /*- - * Copyright (c) 2003 Networks Associates Technology, Inc. + * Copyright (c) 2005 SPARTA, Inc. * All rights reserved. * - * This software was developed for the FreeBSD Project by and Network - * Associates Laboratories, the Security Research Division of Network - * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), - * as part of the DARPA CHATS research program. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -27,31 +22,57 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ -#include +#include +#include #include #include +#include + +#include /* XXX - not used */ -int main(int argc, char **argv) +void usage(void); + +int +main(int argc, char **argv) { - int ret_val; + int ch, error; + char *migscs = NULL; - if (argc != 2) { - printf("usage: %s path\n", argv[0]); - exit(1); + while ((ch = getopt(argc, argv, "m:")) != -1) { + switch (ch) { + case 'm': + migscs = optarg; + break; + default: + usage(); + break; + } } + argc -= optind; + argv += optind; - ret_val = sebsd_load_policy(argv[1]); + if (argc != 1) + usage(); - if (ret_val) { - perror("security_load_policy"); - exit(2); + if (migscs != NULL) { + error = sebsd_load_migscs(migscs); + if (error) + err(1, "%s", migscs); } + error = sebsd_load_policy(argv[0]); + if (error) + err(1, "%s", argv[0]); - printf("\nSuccess\n"); + exit(0); +} + +void +usage(void) +{ + extern char *__progname; - exit(0); + fprintf(stderr, "usage: %s [-m migscs_file] policy_file\n", __progname); + exit(1); } From owner-p4-projects@FreeBSD.ORG Thu Feb 9 20:07:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DB7316A423; Thu, 9 Feb 2006 20:07:37 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E4CBB16A420 for ; Thu, 9 Feb 2006 20:07:36 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B19EB43D45 for ; Thu, 9 Feb 2006 20:07:36 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19K7ate030640 for ; Thu, 9 Feb 2006 20:07:36 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19K7abL030637 for perforce@freebsd.org; Thu, 9 Feb 2006 20:07:36 GMT (envelope-from millert@freebsd.org) Date: Thu, 9 Feb 2006 20:07:36 GMT Message-Id: <200602092007.k19K7abL030637@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91457 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 20:07:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=91457 Change 91457 by millert@millert_ibook on 2006/02/09 20:07:21 #ifdef MAC for the AV trailer code Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_msg.c#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_msg.c#8 (text+ko) ==== @@ -272,6 +272,7 @@ if (option & MACH_RCV_TRAILER_ELEMENTS (MACH_RCV_TRAILER_AV)) { +#ifdef MAC if (kmsg->ikm_sender != NULL && IP_VALID(kmsg->ikm_header.msgh_remote_port)) { trailer->msgh_ad = !mac_check_ipc_method @@ -280,6 +281,7 @@ kmsg->ikm_header.msgh_id); } else +#endif trailer->msgh_ad = 0; } From owner-p4-projects@FreeBSD.ORG Thu Feb 9 20:23:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78CB016A423; Thu, 9 Feb 2006 20:23:15 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 36C6816A420 for ; Thu, 9 Feb 2006 20:23:15 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A3D7F43D7C for ; Thu, 9 Feb 2006 20:23:11 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19KNBTf031339 for ; Thu, 9 Feb 2006 20:23:11 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19KNBdm031336 for perforce@freebsd.org; Thu, 9 Feb 2006 20:23:11 GMT (envelope-from millert@freebsd.org) Date: Thu, 9 Feb 2006 20:23:11 GMT Message-Id: <200602092023.k19KNBdm031336@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91458 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 20:23:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=91458 Change 91458 by millert@millert_ibook on 2006/02/09 20:22:10 Add prototypes for sebsd_* functions that live in the libselinux dir. These should probably move in the future. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.h#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.h#5 (text+ko) ==== @@ -64,6 +64,11 @@ extern int thread_has_system(struct thread *td, access_vector_t perm); extern int thread_has_security(struct thread *td, access_vector_t perm); #endif -#endif /* _KERNEL */ +#else /* !_KERNEL */ +extern int sebsd_enabled(void); +extern int sebsd_enforcing(void); +extern int sebsd_load_policy(const char *); +extern int sebsd_load_migscs(const char *); +#endif /* !_KERNEL */ #endif /* _SYS_SECURITY_SEBSD_H */ From owner-p4-projects@FreeBSD.ORG Thu Feb 9 20:24:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 527FB16A423; Thu, 9 Feb 2006 20:24:14 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 13BA816A420 for ; Thu, 9 Feb 2006 20:24:14 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA95E43D46 for ; Thu, 9 Feb 2006 20:24:13 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19KODC1031400 for ; Thu, 9 Feb 2006 20:24:13 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19KODF3031397 for perforce@freebsd.org; Thu, 9 Feb 2006 20:24:13 GMT (envelope-from millert@freebsd.org) Date: Thu, 9 Feb 2006 20:24:13 GMT Message-Id: <200602092024.k19KODF3031397@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91460 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 20:24:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=91460 Change 91460 by millert@millert_ibook on 2006/02/09 20:23:46 Some style(9) Add a syscall for loading the migscs file (for loadpolicy) Syscall number for this was chosen arbitrarily Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscall.c#7 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscalls.h#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscall.c#7 (text+ko) ==== @@ -48,6 +48,8 @@ #define MAX_UC 510 +int sebsd_load_migscs(void *, size_t); /* XXX - move to header file */ + struct lp_args { void *data; @@ -57,19 +59,41 @@ static int sys_load_policy(struct proc *td, void *data, size_t len) { + void *kdata; + int rc; + + rc = cred_has_security(td->p_ucred, SECURITY__LOAD_POLICY); + if (rc) + return (rc); + + kdata = malloc(len, M_SEBSD, M_WAITOK); + rc = copyin(data, kdata, len); + if (rc) + return (rc); + + rc = security_load_policy(kdata, len); + free(kdata, M_SEBSD); + + return (rc); +} + +static int +sys_load_migscs(struct proc *td, void *data, size_t len) +{ + void *kdata; int rc; rc = cred_has_security(td->p_ucred, SECURITY__LOAD_POLICY); if (rc) return (rc); - void *kdata = malloc (len, M_SEBSD, M_WAITOK); - rc = copyin (data, kdata, len); + kdata = malloc(len, M_SEBSD, M_WAITOK); + rc = copyin(data, kdata, len); if (rc) return (rc); - rc = security_load_policy (kdata, len); - free (kdata, M_SEBSD); + rc = sebsd_load_migscs(kdata, len); + free(kdata, M_SEBSD); return (rc); } @@ -80,9 +104,8 @@ * * or, lists the SIDs that a given context can relabel files to. (username is ignored) */ - static int -sys_get_sids (int function, char *context, char *username, char *out, int *outlen) +sys_get_sids(int function, char *context, char *username, char *out, int *outlen) { u_int32_t n, nsids, scontext_len; security_id_t *sids, sid; @@ -91,11 +114,10 @@ int olen = 1; int ubufsz; - if (copyin (outlen, &ubufsz, sizeof (int))) - { - error = EFAULT; - goto out; - } + if (copyin(outlen, &ubufsz, sizeof(int))) { + error = EFAULT; + goto out; + } /* * XXX We need POLICY_RDLOCK here, but it's not exported! @@ -103,19 +125,20 @@ error = security_context_to_sid(context, strlen (context), &sid); if (error) goto out; - switch (function) - { - case SEBSDCALL_GETUSERSIDS: - error = security_get_user_sids(sid, username, &sids, &nsids); - break; + switch (function) { + case SEBSDCALL_GETUSERSIDS: + error = security_get_user_sids(sid, username, &sids, &nsids); + break; - case SEBSDCALL_GETFILESIDS: - error = security_get_file_sids(sid, SECCLASS_FILE, &sids, &nsids); - break; + case SEBSDCALL_GETFILESIDS: + error = security_get_file_sids(sid, SECCLASS_FILE, &sids, + &nsids); + break; - default: - error = ENOSYS; - } + default: + error = ENOSYS; + break; + } if (error) goto out; for (n = 0; n < nsids; n++) { @@ -123,19 +146,17 @@ &scontext_len); if (error) goto out2; - if (out && olen + scontext_len <= ubufsz) - { - error = copyout (scontext, out, scontext_len); - out += scontext_len; - } - else if (out) - error = ENOMEM; + if (out && olen + scontext_len <= ubufsz) { + error = copyout(scontext, out, scontext_len); + out += scontext_len; + } else if (out) + error = ENOMEM; olen += scontext_len; security_free_context(scontext); if (error) - goto out2; + goto out2; } - error = copyout (&olen, outlen, sizeof(int)); + error = copyout(&olen, outlen, sizeof(int)); out2: sebsd_free(sids); out: @@ -143,181 +164,194 @@ } static int -sys_change_sid (char *domains, char *sources, char *sclasss, char *out, int *outlen) +sys_change_sid(char *domains, char *sources, char *sclasss, char *out, + int *outlen) { - security_id_t domain, source; - struct class_datum *cld; - security_context_t outc; - int error; - int ubufsz, outclen; + security_id_t domain, source; + struct class_datum *cld; + security_context_t outc; + int error; + int ubufsz, outclen; - if (copyin (outlen, &ubufsz, sizeof (int))) - return EFAULT; + if (copyin(outlen, &ubufsz, sizeof(int))) + return (EFAULT); - /* - * XXX We need POLICY_RDLOCK here, but it's not exported! - */ - error = security_context_to_sid (sources, strlen (sources), &source); - if (error) - return error; + /* + * XXX We need POLICY_RDLOCK here, but it's not exported! + */ + error = security_context_to_sid(sources, strlen (sources), &source); + if (error) + return (error); - error = security_context_to_sid (domains, strlen (domains), &domain); - if (error) - return error; + error = security_context_to_sid(domains, strlen (domains), &domain); + if (error) + return (error); - cld = hashtab_search (policydb.p_classes.table, sclasss); - if (cld == NULL) - return EINVAL; + cld = hashtab_search(policydb.p_classes.table, sclasss); + if (cld == NULL) + return (EINVAL); - error = security_change_sid (domain, source, cld->value, &source); - if (error) - return error; - error = security_sid_to_context (source, &outc, &outclen); - if (error) - return error; - if (out) { - if (outclen > ubufsz) { - error = ENOMEM; - goto out; - } - error = copyout (outc, out, outclen); - if (error) - goto out; - } - error = copyout (&outclen, outlen, sizeof(int)); + error = security_change_sid(domain, source, cld->value, &source); + if (error) + return (error); + error = security_sid_to_context(source, &outc, &outclen); + if (error) + return (error); + if (out) { + if (outclen > ubufsz) { + error = ENOMEM; + goto out; + } + error = copyout(outc, out, outclen); + if (error) + goto out; + } + error = copyout(&outclen, outlen, sizeof(int)); - out: - security_free_context (outc); - return error; +out: + security_free_context (outc); + return (error); } -struct getsid_args -{ - char *ctx; - char *usr; - char *out; - int *outlen; +struct getsid_args { + char *ctx; + char *usr; + char *out; + int *outlen; }; -struct changesid_args -{ - char *domain; - char *source; - char *sclass; - char *out; - int *outlen; +struct changesid_args { + char *domain; + char *source; + char *sclass; + char *out; + int *outlen; }; static int sebsd_get_bools(struct proc *td, struct sebsd_get_bools *gb) { char *out = NULL; + int error; + if (gb->out) out = malloc(gb->len, M_SEBSD, M_WAITOK); - int err = security_get_bool_string(&gb->len, out); - if (out && err == 0) - err = copyout(out, gb->out, gb->len); + error = security_get_bool_string(&gb->len, out); + if (out && error == 0) + error = copyout(out, gb->out, gb->len); if (out) free(out, M_SEBSD); - return (err); + return (error); } int sebsd_syscall(struct proc *td, int call, void *args, int *retv) { - int err = EINVAL; struct lp_args p; - struct sebsd_get_bools gb; + int error = EINVAL; switch(call) { case SEBSDCALL_LOAD_POLICY: - if (copyin (args, &p, sizeof (struct lp_args))) + if (copyin(args, &p, sizeof(struct lp_args))) + return (EFAULT); + error = sys_load_policy(td, p.data, p.len); + break; + + case SEBSDCALL_LOAD_MIGSCS: + if (copyin(args, &p, sizeof(struct lp_args))) return (EFAULT); - err = sys_load_policy (td, p.data, p.len); + error = sys_load_migscs(td, p.data, p.len); break; case SEBSDCALL_GETUSERSIDS: case SEBSDCALL_GETFILESIDS: - { - struct getsid_args uap; - err = copyin (args, &uap, sizeof (struct getsid_args)); - if (err) - return err; - size_t dummy; - char *ctx = sebsd_malloc (MAX_UC, M_WAITOK); - err = copyinstr(uap.ctx, ctx, MAX_UC, &dummy); - if (err) { - sebsd_free (ctx); - return err; - } - char *usr = sebsd_malloc (MAX_UC, M_WAITOK); - err = copyinstr(uap.usr, usr, MAX_UC, &dummy); - if (err) { - sebsd_free (ctx); - sebsd_free (usr); - return err; - } - ctx[MAX_UC-1] = 0; - usr[MAX_UC-1] = 0; - err = sys_get_sids (call, ctx, usr, uap.out, uap.outlen); - sebsd_free (ctx); - sebsd_free (usr); - } - break; + { + struct getsid_args uap; + size_t dummy; + char *ctx, *usr; + + error = copyin(args, &uap, sizeof(struct getsid_args)); + if (error) + return (error); + ctx = sebsd_malloc(MAX_UC, M_WAITOK); + error = copyinstr(uap.ctx, ctx, MAX_UC, &dummy); + if (error) { + sebsd_free(ctx); + return (error); + } + usr = sebsd_malloc(MAX_UC, M_WAITOK); + error = copyinstr(uap.usr, usr, MAX_UC, &dummy); + if (error) { + sebsd_free(ctx); + sebsd_free(usr); + return (error); + } + ctx[MAX_UC-1] = 0; + usr[MAX_UC-1] = 0; + error = sys_get_sids(call, ctx, usr, uap.out, uap.outlen); + sebsd_free(ctx); + sebsd_free(usr); + break; + } case SEBSDCALL_CHANGE_SID: - { - struct changesid_args uap; - err = copyin (args, &uap, sizeof (struct changesid_args)); - if (err) - return err; - size_t dummy; - char *doms = sebsd_malloc (MAX_UC, M_WAITOK); - err = copyinstr(uap.domain, doms, MAX_UC, &dummy); - if (err) { - sebsd_free (doms); - return err; - } - char *srcs = sebsd_malloc (MAX_UC, M_WAITOK); - err = copyinstr(uap.source, srcs, MAX_UC, &dummy); - if (err) { - sebsd_free (doms); - sebsd_free (srcs); - return err; - } - char *scs = sebsd_malloc (MAX_UC, M_WAITOK); - err = copyinstr(uap.sclass, scs, MAX_UC, &dummy); - if (err) { - sebsd_free (doms); - sebsd_free (srcs); - sebsd_free (scs); - return err; - } - err = sys_change_sid (doms, srcs, scs, uap.out, uap.outlen); - sebsd_free (doms); - sebsd_free (srcs); - sebsd_free (scs); - return err; - } - break; + { + struct changesid_args uap; + size_t dummy; + char *doms, *srcs, *scs; + error = copyin(args, &uap, sizeof(struct changesid_args)); + if (error) + return (error); + doms = sebsd_malloc(MAX_UC, M_WAITOK); + error = copyinstr(uap.domain, doms, MAX_UC, &dummy); + if (error) { + sebsd_free(doms); + return (error); + } + srcs = sebsd_malloc(MAX_UC, M_WAITOK); + error = copyinstr(uap.source, srcs, MAX_UC, &dummy); + if (error) { + sebsd_free(doms); + sebsd_free(srcs); + return (error); + } + scs = sebsd_malloc(MAX_UC, M_WAITOK); + error = copyinstr(uap.sclass, scs, MAX_UC, &dummy); + if (error) { + sebsd_free(doms); + sebsd_free(srcs); + sebsd_free(scs); + return (error); + } + error = sys_change_sid(doms, srcs, scs, uap.out, uap.outlen); + sebsd_free(doms); + sebsd_free(srcs); + sebsd_free(scs); + return (error); + } case SEBSDCALL_GET_BOOLS: - if (copyin(args, &gb, sizeof (struct sebsd_get_bools))) + { + struct sebsd_get_bools gb; + + if (copyin(args, &gb, sizeof(struct sebsd_get_bools))) return (EFAULT); - err = sebsd_get_bools(td, &gb); - if (copyout(&gb, args, sizeof (struct sebsd_get_bools))) + error = sebsd_get_bools(td, &gb); + if (copyout(&gb, args, sizeof(struct sebsd_get_bools))) return (EFAULT); break; + } case SEBSDCALL_GET_BOOL: { + size_t dummy; char str[128]; - int active, pending; - size_t dummy; - err = copyinstr(args,str, 128, &dummy); - if (err) - return (err); + int active, pending; + + error = copyinstr(args, str, sizeof(str), &dummy); + if (error) + return (error); security_get_bool(str, &active, &pending); *retv = active | (pending << 1); return (0); @@ -327,11 +361,11 @@ { char *str; - err = cred_has_security(td->p_ucred, SECURITY__SETBOOL); - if (err) - return (err); + error = cred_has_security(td->p_ucred, SECURITY__SETBOOL); + if (error) + return (error); - if (copyin(args, &p, sizeof (struct lp_args))) + if (copyin(args, &p, sizeof(struct lp_args))) return (EFAULT); str = malloc(p.len, M_SEBSD, M_WAITOK); if (!str) @@ -342,22 +376,21 @@ } str[p.len-1] = 0; - err = security_set_bool(str+1, str[0]-'0'); + error = security_set_bool(str+1, str[0]-'0'); free(str, M_SEBSD); break; } case SEBSDCALL_COMMIT_BOOLS: - err = cred_has_security(td->p_ucred, SECURITY__SETBOOL); - if (err) - return (err); + error = cred_has_security(td->p_ucred, SECURITY__SETBOOL); + if (error) + return (error); + return (security_commit_pending_bools()); - return security_commit_pending_bools(); - default: - err = EINVAL; + error = EINVAL; break; } - return err; + return (error); } ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscalls.h#5 (text+ko) ==== @@ -7,6 +7,7 @@ * TBD: Should we really try to line up with SELinux? */ #define SEBSDCALL_LOAD_POLICY 7 +#define SEBSDCALL_LOAD_MIGSCS 12 /* XXX */ #define SEBSDCALL_GET_BOOLS 8 #define SEBSDCALL_GET_BOOL 9 #define SEBSDCALL_SET_BOOL 10 From owner-p4-projects@FreeBSD.ORG Thu Feb 9 20:25:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22A6F16A423; Thu, 9 Feb 2006 20:25:22 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D9E5C16A420 for ; Thu, 9 Feb 2006 20:25:21 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 93A8B43D6A for ; Thu, 9 Feb 2006 20:25:15 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19KPF9U031515 for ; Thu, 9 Feb 2006 20:25:15 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19KPF79031512 for perforce@freebsd.org; Thu, 9 Feb 2006 20:25:15 GMT (envelope-from millert@freebsd.org) Date: Thu, 9 Feb 2006 20:25:15 GMT Message-Id: <200602092025.k19KPF79031512@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91461 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 20:25:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=91461 Change 91461 by millert@millert_ibook on 2006/02/09 20:25:08 Add missing (c) notice Factor out code to load the migscs file into its own function for the new syscall. Add some missing error checks Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mach_av.c#9 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mach_av.c#9 (text+ko) ==== @@ -1,5 +1,31 @@ +/*- + * Copyright (c) 2005 SPARTA, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ #include +#include #include #include #include @@ -22,37 +48,41 @@ { int baseid; int nclasses; - int classes[0]; + int classes[0]; /* actually larger */ }; static struct hashtab *msgid2class; -void sebsd_mach_av_init() +static mutex_t *migscs_load_lock; + +/* + * Read the table mapping mach message ids to security classes. + * The permissions in those classes are expected to be relative to the + * base message id defined for a subsystem (which is in this table). + */ +int +sebsd_load_migscs(void *tdata, size_t tsize) { - /* Read the table mapping mach message ids to security classes. - The permissions in those classes are expected to be relative to the - base message id defined for a subsystem (which is in this table). */ + struct hashtab *ht, *oht; + int error, *p, *ep; - size_t tsize; - int *tdata; - if (!preload_find_data ("sebsd_migscs", &tsize, &tdata)) { - msgid2class = hashtab_create(msgid_hash, msgid_cmp, 3); - return; - } + ht = hashtab_create(msgid_hash, msgid_cmp, 31337); + if (ht == NULL) + return (-1); - msgid2class = hashtab_create(msgid_hash, msgid_cmp, 31337); + printf("security class to subsystem table: %d classes\n", + tsize / sizeof(int)); - tsize /= sizeof(int); - int *p = tdata; - - while (p < tdata+tsize) { + p = (int *)tdata; + ep = (int *)((char *)tdata + tsize); + while (p < ep) { int msgid = *p++; int nclasses = *p++; int size = *p++; int i; + struct msgid_classinfo *c; - struct msgid_classinfo *c = sebsd_malloc - (sizeof(int) * nclasses + sizeof(struct msgid_classinfo), M_WAITOK); + c = sebsd_malloc(sizeof(int) * nclasses + sizeof(*c), M_WAITOK); c->baseid = msgid; c->nclasses = nclasses; for (i = 0; i < nclasses; i++) @@ -60,11 +90,43 @@ for (i = msgid; i < msgid + size; i++) { int *ip = sebsd_malloc(sizeof(int), M_WAITOK); *ip = i; - hashtab_insert(msgid2class, ip, c); + error = hashtab_insert(ht, ip, c); + if (error) { + hashtab_destroy(ht); + return (-1); + } } } + + /* + * Swap the old message id to class mapping with the new one + * and free the old. + * XXX - does this leak memory? + */ + mutex_lock(migscs_load_lock); + oht = msgid2class; + msgid2class = ht; + mutex_unlock(migscs_load_lock); + hashtab_destroy(oht); + return (0); +} + +void +sebsd_mach_av_init(void) +{ + size_t tsize; + int *tdata; + + migscs_load_lock = mutex_alloc(ETAP_NO_TRACE); + + if (!preload_find_data ("sebsd_migscs", &tsize, &tdata) || + sebsd_load_migscs(tdata, tsize) != 0) { + msgid2class = hashtab_create(msgid_hash, msgid_cmp, 3); + return; + } } + int sebsd_check_ipc_method1(int subj, int obj, int msgid) { From owner-p4-projects@FreeBSD.ORG Thu Feb 9 21:32:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96B0E16A429; Thu, 9 Feb 2006 21:32:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F3EA416A464 for ; Thu, 9 Feb 2006 21:32:00 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A3C4143D49 for ; Thu, 9 Feb 2006 21:32:00 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19LW0Ub042627 for ; Thu, 9 Feb 2006 21:32:00 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19LW0kv042624 for perforce@freebsd.org; Thu, 9 Feb 2006 21:32:00 GMT (envelope-from millert@freebsd.org) Date: Thu, 9 Feb 2006 21:32:00 GMT Message-Id: <200602092132.k19LW0kv042624@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91473 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 21:32:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=91473 Change 91473 by millert@millert_ibook on 2006/02/09 21:31:53 Don't rely on mkPolicyInfoPlist.sh having its execute bit set Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/build/PolicyKext.mk#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/build/PolicyKext.mk#4 (text+ko) ==== @@ -71,7 +71,7 @@ mac_$(POLICY).kext/Contents/Info.plist: Makefile @echo "$(POLICY): Generating Info.plist..." - @$(DARWIN_ROOT)/build/mkPolicyInfoPlist.sh \ + @sh $(DARWIN_ROOT)/build/mkPolicyInfoPlist.sh \ $(POLICY) $(POLICY_VER) $(POLICY_COMPVER) \ $(POLICY_DESC) "$(POLICY_LIBS)" > $@ From owner-p4-projects@FreeBSD.ORG Thu Feb 9 21:35:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC26116A422; Thu, 9 Feb 2006 21:35:05 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 93F3F16A423 for ; Thu, 9 Feb 2006 21:35:05 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D1C2C43D58 for ; Thu, 9 Feb 2006 21:35:04 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19LZ4mu042762 for ; Thu, 9 Feb 2006 21:35:04 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19LZ4Td042759 for perforce@freebsd.org; Thu, 9 Feb 2006 21:35:04 GMT (envelope-from millert@freebsd.org) Date: Thu, 9 Feb 2006 21:35:04 GMT Message-Id: <200602092135.k19LZ4Td042759@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91474 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 21:35:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=91474 Change 91474 by millert@millert_ibook on 2006/02/09 21:34:37 Add mprotect entry point Add some casts to quiet gcc For mmap entry point, check flags for MAP_SHARED Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#28 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#28 (text+ko) ==== @@ -1186,13 +1186,13 @@ psec = SLOT(obj); tsec = SLOT(subj); - cld = hashtab_search (policydb.p_classes.table, s); + cld = hashtab_search(policydb.p_classes.table, (void *)s); if (cld == NULL) return EINVAL; - p = hashtab_search (cld->permissions.table, pn); + p = hashtab_search(cld->permissions.table, (void *)pn); if (p == NULL && cld->comdatum) - p = hashtab_search (cld->comdatum->permissions.table, pn); + p = hashtab_search(cld->comdatum->permissions.table, (void *)pn); if (p == NULL) return EINVAL; @@ -1212,7 +1212,7 @@ tsec = SLOT(subj); osec = SLOT(out); - cld = hashtab_search (policydb.p_classes.table, s); + cld = hashtab_search(policydb.p_classes.table, (void *)s); if (cld == NULL) return EINVAL; @@ -1409,7 +1409,7 @@ /* loginwindow.app/MAC.loginPlugin orphaned process. */ dst = SLOT(p->p_ucred->cr_label); #ifdef SEFOS_DEBUG - printf("sebsd_check_proc_setlcid (orphan): pid %d, lcid %d, sid 0x%x -> 0x%x\n", pid, lcid, dst->sid, dst->osid); + printf("sebsd_check_proc_setlcid (orphan): pid %d, lcid %d, sid 0x%x -> 0x%x\n", pid, lcid, dst->sid, dst->osid); // XXX #endif if (dst->sid != dst->osid) { /* @@ -1424,7 +1424,7 @@ case LCID_CREATE: /* Create */ /* nop */ #ifdef SEFOS_DEBUG - printf("sebsd_check_proc_setlcid (create): pid %d, lcid %d\n", pid, lcid); + printf("sebsd_check_proc_setlcid (create): pid %d, lcid %d\n", pid, lcid); // XXX #endif break; @@ -1435,7 +1435,7 @@ dst = SLOT(p->p_ucred->cr_label); #ifdef SEFOS_DEBUG - printf("sebsd_check_proc_setlcid (adopt): pid %d, lcid %d, sid 0x%x -> 0x%x\n", pid, lcid, dst->sid, src->sid); + printf("sebsd_check_proc_setlcid (adopt): pid %d, lcid %d, sid 0x%x -> 0x%x\n", pid, lcid, dst->sid, src->sid); // XXX #endif if (src->sid != dst->sid) { /* @@ -2267,12 +2267,9 @@ return vnode_has_perm(cred, vp, FILE__WRITE, NULL); } -/* - * Also registered for MAC_CHECK_VNODE_MPROTECT - */ static int sebsd_check_vnode_mmap(struct ucred *cred, struct vnode *vp, - struct label *label, int newmapping, int flags, int *maxprot) + struct label *label, int prot, int flags, int *maxprot) { access_vector_t av; @@ -2283,10 +2280,33 @@ if (vp) { av = FILE__READ; - if (newmapping & PROT_WRITE) + if ((prot & PROT_WRITE) && (flags & MAP_SHARED)) + av |= FILE__WRITE; + + if (prot & PROT_EXEC) + av |= FILE__EXECUTE; + + return (vnode_has_perm(cred, vp, av, NULL)); + } + return (0); +} + +static int +sebsd_check_vnode_mprotect(struct ucred *cred, struct vnode *vp, + struct label *label, int prot) +{ + access_vector_t av; + + /* + * TBD: Incomplete? + */ + if (vp) { + av = FILE__READ; + + if (prot & PROT_WRITE) av |= FILE__WRITE; - if (newmapping & PROT_EXEC) + if (prot & PROT_EXEC) av |= FILE__EXECUTE; return (vnode_has_perm(cred, vp, av, NULL)); @@ -2614,8 +2634,8 @@ .mpo_destroy = sebsd_destroy, .mpo_destroy_cred_label = sebsd_destroy_cred_label, - .mpo_destroy_task_label = sebsd_destroy_cred_label, - .mpo_destroy_port_label = sebsd_destroy_cred_label, + .mpo_destroy_task_label = sebsd_destroy_task_label, + .mpo_destroy_port_label = sebsd_destroy_port_label, .mpo_destroy_vnode_label = sebsd_destroy_vnode_label, .mpo_destroy_devfsdirent_label = sebsd_destroy_vnode_label, @@ -2686,6 +2706,7 @@ .mpo_check_vnode_link = sebsd_check_vnode_link, .mpo_check_vnode_lookup = sebsd_check_vnode_lookup, .mpo_check_vnode_mmap = sebsd_check_vnode_mmap, + .mpo_check_vnode_mprotect = sebsd_check_vnode_mprotect, .mpo_check_vnode_open = sebsd_check_vnode_open, .mpo_check_vnode_poll = sebsd_check_vnode_poll, .mpo_check_vnode_read = sebsd_check_vnode_read, From owner-p4-projects@FreeBSD.ORG Thu Feb 9 22:08:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C01E216A422; Thu, 9 Feb 2006 22:08:13 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 65E0016A423 for ; Thu, 9 Feb 2006 22:08:13 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 088B443D46 for ; Thu, 9 Feb 2006 22:08:01 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19M81ZO045204 for ; Thu, 9 Feb 2006 22:08:01 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19M80mm045201 for perforce@freebsd.org; Thu, 9 Feb 2006 22:08:00 GMT (envelope-from millert@freebsd.org) Date: Thu, 9 Feb 2006 22:08:00 GMT Message-Id: <200602092208.k19M80mm045201@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91480 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 22:08:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=91480 Change 91480 by millert@millert_g4tower on 2006/02/09 22:07:22 Back out changes to mpo_destroy_task_label and mpo_destroy_port_label that were unintentionally submitted. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#29 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#29 (text+ko) ==== @@ -2634,8 +2634,8 @@ .mpo_destroy = sebsd_destroy, .mpo_destroy_cred_label = sebsd_destroy_cred_label, - .mpo_destroy_task_label = sebsd_destroy_task_label, - .mpo_destroy_port_label = sebsd_destroy_port_label, + .mpo_destroy_task_label = sebsd_destroy_cred_label, + .mpo_destroy_port_label = sebsd_destroy_cred_label, .mpo_destroy_vnode_label = sebsd_destroy_vnode_label, .mpo_destroy_devfsdirent_label = sebsd_destroy_vnode_label, From owner-p4-projects@FreeBSD.ORG Thu Feb 9 22:38:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43DDC16A424; Thu, 9 Feb 2006 22:38:41 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0817616A420 for ; Thu, 9 Feb 2006 22:38:41 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BD59F43D49 for ; Thu, 9 Feb 2006 22:38:40 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k19McenX046748 for ; Thu, 9 Feb 2006 22:38:40 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k19Mce73046745 for perforce@freebsd.org; Thu, 9 Feb 2006 22:38:40 GMT (envelope-from millert@freebsd.org) Date: Thu, 9 Feb 2006 22:38:40 GMT Message-Id: <200602092238.k19Mce73046745@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91485 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2006 22:38:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=91485 Change 91485 by millert@millert_g4tower on 2006/02/09 22:38:05 Extended trailers are broken in 10.3.8; ifdef out for now. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/system_cmds/mach_init.tproj/bootstrap.c#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/system_cmds/mach_init.tproj/bootstrap.c#8 (text+ko) ==== @@ -1242,7 +1242,9 @@ bootstrapMaxRequestSize, bootstrap_port_set, MACH_RCV_TRAILER_ELEMENTS(MACH_RCV_TRAILER_SENDER)| - MACH_RCV_TRAILER_ELEMENTS(MACH_RCV_TRAILER_AV)| +#ifdef notyet + MACH_RCV_TRAILER_ELEMENTS(MACH_RCV_TRAILER_AV)| +#endif MACH_RCV_TRAILER_TYPE(MACH_MSG_TRAILER_FORMAT_0)); if (mresult != MACH_MSG_SUCCESS) kern_error(mresult, "mach_msg_server"); From owner-p4-projects@FreeBSD.ORG Fri Feb 10 04:14:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0874516A423; Fri, 10 Feb 2006 04:14:26 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BC52616A420 for ; Fri, 10 Feb 2006 04:14:25 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 87EDF43D49 for ; Fri, 10 Feb 2006 04:14:25 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1A4EPxP068267 for ; Fri, 10 Feb 2006 04:14:25 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1A4EP9p068264 for perforce@freebsd.org; Fri, 10 Feb 2006 04:14:25 GMT (envelope-from csjp@freebsd.org) Date: Fri, 10 Feb 2006 04:14:25 GMT Message-Id: <200602100414.k1A4EP9p068264@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 91489 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Feb 2006 04:14:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=91489 Change 91489 by csjp@csjp_xor on 2006/02/10 04:13:39 Conditionally compile audit support into login(1) unless somebody has specified the NO_AUDIT flag in /etc/make.conf Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/Makefile#8 edit .. //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#9 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/Makefile#8 (text+ko) ==== @@ -7,10 +7,15 @@ DPADD= ${LIBUTIL} ${LIBPAM} LDADD= -lutil ${MINUSLPAM} -lbsm MAN= login.1 login.access.5 + .if !defined(NO_SETUID_LOGIN) BINOWN= root BINMODE=4555 PRECIOUSPROG= .endif +.if !defined(NO_AUDIT) +CFLAGS += -DUSE_BSM_AUDIT +.endif + .include ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#9 (text+ko) ==== @@ -58,6 +58,7 @@ void au_login_success(void) { +#ifdef USE_BSM_AUDIT token_t *tok; int aufd; au_mask_t aumask; @@ -102,6 +103,7 @@ if (au_close(aufd, 1, AUE_login) == -1) errx(1, "login: Audit Record was not committed."); +#endif /* USE_BSM_AUDIT */ } /* @@ -111,6 +113,7 @@ void au_login_fail(char *errmsg, int na) { +#ifdef USE_BSM_AUDIT token_t *tok; int aufd; long au_cond; @@ -159,6 +162,7 @@ if (au_close(aufd, 1, AUE_login) == -1) errx(1, "login: Audit Error: au_close() was not committed"); +#endif /* USE_BSM_AUDIT */ } /* @@ -168,6 +172,7 @@ void audit_logout(void) { +#ifdef USE_BSM_AUDIT token_t *tok; int aufd; au_mask_t aumask; @@ -201,4 +206,5 @@ if (au_close(aufd, 1, AUE_logout) == -1) errx(1, "login: Audit Record was not committed."); +#endif /* USE_BSM_AUDIT */ } From owner-p4-projects@FreeBSD.ORG Fri Feb 10 06:35:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0729F16A423; Fri, 10 Feb 2006 06:35:17 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BE8DF16A420 for ; Fri, 10 Feb 2006 06:35:16 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8BDE843D45 for ; Fri, 10 Feb 2006 06:35:16 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1A6ZGq4080895 for ; Fri, 10 Feb 2006 06:35:16 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1A6ZGrQ080892 for perforce@freebsd.org; Fri, 10 Feb 2006 06:35:16 GMT (envelope-from csjp@freebsd.org) Date: Fri, 10 Feb 2006 06:35:16 GMT Message-Id: <200602100635.k1A6ZGrQ080892@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 91493 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Feb 2006 06:35:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=91493 Change 91493 by csjp@csjp_xor on 2006/02/10 06:34:52 It is alright to use err(3) instead of errx(3) here, as auditon(2) will set errno when it fails Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#10 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#10 (text+ko) ==== @@ -72,7 +72,7 @@ if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { if (errno == ENOSYS) return; - errx(1, "login: Could not determine audit condition"); + err(1, "login: Could not determine audit condition"); } if (au_cond == AUC_NOAUDIT) return; @@ -125,7 +125,7 @@ if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { if (errno == ENOSYS) return; - errx(1, "login: Could not determine audit condition"); + err(1, "login: Could not determine audit condition"); } if (au_cond == AUC_NOAUDIT) return; From owner-p4-projects@FreeBSD.ORG Fri Feb 10 14:31:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 589A916A423; Fri, 10 Feb 2006 14:31:44 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DFEE116A420; Fri, 10 Feb 2006 14:31:43 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1533D43D6D; Fri, 10 Feb 2006 14:31:43 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id 8A74C46B39; Fri, 10 Feb 2006 09:31:30 -0500 (EST) Date: Fri, 10 Feb 2006 14:34:26 +0000 (GMT) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: "Christian S.J. Peron" In-Reply-To: <200602100414.k1A4EP9p068264@repoman.freebsd.org> Message-ID: <20060210143257.I22680@fledge.watson.org> References: <200602100414.k1A4EP9p068264@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews Subject: Re: PERFORCE change 91489 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Feb 2006 14:31:45 -0000 On Fri, 10 Feb 2006, Christian S.J. Peron wrote: > http://perforce.freebsd.org/chv.cgi?CH=91489 > > Change 91489 by csjp@csjp_xor on 2006/02/10 04:13:39 > > Conditionally compile audit support into login(1) unless somebody has > specified the NO_AUDIT flag in /etc/make.conf > > Affected files ... > > .. //depot/projects/trustedbsd/audit3/usr.bin/login/Makefile#8 edit > .. //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#9 edit > > Differences ... > > ==== //depot/projects/trustedbsd/audit3/usr.bin/login/Makefile#8 (text+ko) ==== > > @@ -7,10 +7,15 @@ > DPADD= ${LIBUTIL} ${LIBPAM} > LDADD= -lutil ${MINUSLPAM} -lbsm Do you also need to conditionalize linking against libbsm here? And I notice we're missing a ${LIBBSM} entry on the DPADD line also. > +.if !defined(NO_AUDIT) > +CFLAGS += -DUSE_BSM_AUDIT > +.endif Would it be better to have the use of the audit-related functions in login.c ifdef'd, and to conditionally compile login_audit.c? Robert N M Watson From owner-p4-projects@FreeBSD.ORG Fri Feb 10 15:18:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B8C016A423; Fri, 10 Feb 2006 15:18:33 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1089216A420 for ; Fri, 10 Feb 2006 15:18:33 +0000 (GMT) (envelope-from jkoshy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 028D243D58 for ; Fri, 10 Feb 2006 15:18:32 +0000 (GMT) (envelope-from jkoshy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1AFIVhv018386 for ; Fri, 10 Feb 2006 15:18:31 GMT (envelope-from jkoshy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1AFIVvS018383 for perforce@freebsd.org; Fri, 10 Feb 2006 15:18:31 GMT (envelope-from jkoshy@freebsd.org) Date: Fri, 10 Feb 2006 15:18:31 GMT Message-Id: <200602101518.k1AFIVvS018383@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkoshy@freebsd.org using -f From: Joseph Koshy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91500 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Feb 2006 15:18:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=91500 Change 91500 by jkoshy@jkoshy_orthanc_mips on 2006/02/10 15:18:30 Unbreak `make _bootstrap-tools'. Affected files ... .. //depot/projects/mips/usr.sbin/config/config.h#7 edit Differences ... ==== //depot/projects/mips/usr.sbin/config/config.h#7 (text+ko) ==== @@ -92,6 +92,7 @@ * is a superconfiguration of a given machine. machinearch is the global * notion of the MACHINE_ARCH for this MACHINE. */ +char *machinename; char *machinearch; char *platformname; From owner-p4-projects@FreeBSD.ORG Fri Feb 10 15:27:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E92016A424; Fri, 10 Feb 2006 15:27:44 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4F7AE16A420 for ; Fri, 10 Feb 2006 15:27:44 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F13B43D45 for ; Fri, 10 Feb 2006 15:27:44 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1AFRi6H018862 for ; Fri, 10 Feb 2006 15:27:44 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1AFRhur018859 for perforce@freebsd.org; Fri, 10 Feb 2006 15:27:43 GMT (envelope-from csjp@freebsd.org) Date: Fri, 10 Feb 2006 15:27:43 GMT Message-Id: <200602101527.k1AFRhur018859@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 91502 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Feb 2006 15:27:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=91502 Change 91502 by csjp@csjp_xor on 2006/02/10 15:27:11 - Move unconditional LDADD into NO_AUDIT - Add a DPADD variable ${LIBBS} Spotted by: rwatson Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/Makefile#9 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/Makefile#9 (text+ko) ==== @@ -5,7 +5,7 @@ SRCS= login.c login_audit.c login_fbtab.c CFLAGS+=-DLOGALL DPADD= ${LIBUTIL} ${LIBPAM} -LDADD= -lutil ${MINUSLPAM} -lbsm +LDADD= -lutil ${MINUSLPAM} MAN= login.1 login.access.5 .if !defined(NO_SETUID_LOGIN) @@ -15,6 +15,8 @@ .endif .if !defined(NO_AUDIT) +DPADD+= ${LIBBSM} +LDADD+= -lbsm CFLAGS += -DUSE_BSM_AUDIT .endif From owner-p4-projects@FreeBSD.ORG Fri Feb 10 16:39:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A5E516A423; Fri, 10 Feb 2006 16:39:13 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3978B16A420 for ; Fri, 10 Feb 2006 16:39:13 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E4C5D43D46 for ; Fri, 10 Feb 2006 16:39:12 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1AGdCY0022017 for ; Fri, 10 Feb 2006 16:39:12 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1AGdCtw022014 for perforce@freebsd.org; Fri, 10 Feb 2006 16:39:12 GMT (envelope-from brueffer@freebsd.org) Date: Fri, 10 Feb 2006 16:39:12 GMT Message-Id: <200602101639.k1AGdCtw022014@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 91506 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Feb 2006 16:39:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=91506 Change 91506 by brueffer@brueffer_serenity on 2006/02/10 16:38:18 Add two missing MLINKS. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/Makefile#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/man/Makefile#5 $ +# $P4: //depot/projects/trustedbsd/openbsm/man/Makefile#6 $ # MAN= audit.2 \ @@ -16,4 +16,7 @@ audit_user.5 \ audit_warn.5 +MLINKS= getaudit.2 getaudit_addr.2 \ + setaudit.2 setaudit_addr.2 + .include From owner-p4-projects@FreeBSD.ORG Fri Feb 10 18:57:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C5ADE16A423; Fri, 10 Feb 2006 18:57:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A18A516A420 for ; Fri, 10 Feb 2006 18:57:01 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B34143D5F for ; Fri, 10 Feb 2006 18:57:01 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1AIv1DD035139 for ; Fri, 10 Feb 2006 18:57:01 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1AIv1TU035136 for perforce@freebsd.org; Fri, 10 Feb 2006 18:57:01 GMT (envelope-from imp@freebsd.org) Date: Fri, 10 Feb 2006 18:57:01 GMT Message-Id: <200602101857.k1AIv1TU035136@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91512 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Feb 2006 18:57:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=91512 Change 91512 by imp@imp_hammer on 2006/02/10 18:56:41 First cut at doing ohci attachment for the atmel arm bus. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#1 add .. //depot/projects/arm/src/sys/arm/conf/KB920X#15 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/KB920X#15 (text+ko) ==== @@ -72,6 +72,13 @@ device mii device lxtphy +# USB support +device ohci # OHCI USB interface +device usb # USB Bus (required) +device umass # Disks/Mass storage - Requires scbus and da +device scbus # SCSI bus (required for SCSI) +device da # Direct Access (disks) + # Debugging for use in -current #options INVARIANTS #Enable calls of extra sanity checking #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS From owner-p4-projects@FreeBSD.ORG Fri Feb 10 22:01:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4498916A423; Fri, 10 Feb 2006 22:01:07 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0442816A420 for ; Fri, 10 Feb 2006 22:01:07 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 717B243D46 for ; Fri, 10 Feb 2006 22:01:05 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1AM15ZS050296 for ; Fri, 10 Feb 2006 22:01:05 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1AM15nT050293 for perforce@freebsd.org; Fri, 10 Feb 2006 22:01:05 GMT (envelope-from brueffer@freebsd.org) Date: Fri, 10 Feb 2006 22:01:05 GMT Message-Id: <200602102201.k1AM15nT050293@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 91522 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Feb 2006 22:01:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=91522 Change 91522 by brueffer@brueffer_serenity on 2006/02/10 22:01:00 Duh, correct spacing from last commit. Noticed by: trhodes Affected files ... .. //depot/projects/trustedbsd/openbsm/man/Makefile#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/man/Makefile#6 $ +# $P4: //depot/projects/trustedbsd/openbsm/man/Makefile#7 $ # MAN= audit.2 \ @@ -16,7 +16,7 @@ audit_user.5 \ audit_warn.5 -MLINKS= getaudit.2 getaudit_addr.2 \ +MLINKS= getaudit.2 getaudit_addr.2 \ setaudit.2 setaudit_addr.2 .include From owner-p4-projects@FreeBSD.ORG Fri Feb 10 22:04:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3ACD716A424; Fri, 10 Feb 2006 22:04:10 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F067016A420 for ; Fri, 10 Feb 2006 22:04:09 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD80F43D45 for ; Fri, 10 Feb 2006 22:04:09 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1AM49F2050361 for ; Fri, 10 Feb 2006 22:04:09 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1AM49pj050358 for perforce@freebsd.org; Fri, 10 Feb 2006 22:04:09 GMT (envelope-from imp@freebsd.org) Date: Fri, 10 Feb 2006 22:04:09 GMT Message-Id: <200602102204.k1AM49pj050358@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91523 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Feb 2006 22:04:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=91523 Change 91523 by imp@imp_Speedy on 2006/02/10 22:03:27 fix ohci interrupt return value rewrite most of ohci_atmelarm and claim copyright now Affected files ... .. //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#2 edit .. //depot/projects/arm/src/sys/dev/usb/ohci.c#5 edit .. //depot/projects/arm/src/sys/dev/usb/ohci_pci.c#5 edit .. //depot/projects/arm/src/sys/dev/usb/ohcivar.h#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#2 (text+ko) ==== @@ -1,10 +1,5 @@ /*- - * Copyright (c) 1998 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Lennart Augustsson (augustss@carlstedt.se) at - * Carlstedt Research & Technology. + * Copyright (c) 2006 M. Warner Losh. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,25 +9,17 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include @@ -58,8 +45,8 @@ #define MEM_RID 0 -static int ohci_atmelarm_attach(device_t self); -static int ohci_atmelarm_detach(device_t self); +static int ohci_atmelarm_attach(device_t dev); +static int ohci_atmelarm_detach(device_t dev); static int ohci_atmelarm_probe(device_t self) @@ -77,42 +64,37 @@ /* XXX where does it say so in the spec? */ sc->sc_bus.usbrev = USBREV_1_0; + strlcpy(sc->sc_vendor, "Atmel", sizeof(sc->sc_vendor)); rid = MEM_RID; sc->io_res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, RF_ACTIVE); - if (!sc->io_res) { - device_printf(self, "Could not map memory\n"); - return ENXIO; + if (sc->io_res == NULL) { + err = ENXIO; + goto error; } sc->iot = rman_get_bustag(sc->io_res); sc->ioh = rman_get_bushandle(sc->io_res); rid = 0; sc->irq_res = bus_alloc_resource_any(self, SYS_RES_IRQ, &rid, - RF_SHAREABLE | RF_ACTIVE); + RF_ACTIVE); if (sc->irq_res == NULL) { - device_printf(self, "Could not allocate irq\n"); - ohci_atmelarm_detach(self); - return ENXIO; + err = ENXIO; + goto error; } sc->sc_bus.bdev = device_add_child(self, "usb", -1); - if (!sc->sc_bus.bdev) { - device_printf(self, "Could not add USB device\n"); - ohci_atmelarm_detach(self); - return ENOMEM; + if (sc->sc_bus.bdev == NULL) { + err = ENOMEM; + goto error; } device_set_ivars(sc->sc_bus.bdev, &sc->sc_bus); - strlcpy(sc->sc_vendor, "Atmel", sizeof(sc->sc_vendor)) - - err = bus_setup_intr(self, sc->irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - (driver_intr_t *) ohci_intr, sc, &sc->ih); + err = bus_setup_intr(self, sc->irq_res, INTR_TYPE_BIO, ohci_intr, sc, + &sc->ih); if (err) { - device_printf(self, "Could not setup irq, %d\n", err); - sc->ih = NULL; - ohci_atmelarm_detach(self); - return ENXIO; + err = ENXIO; + goto error; } err = ohci_init(sc); if (!err) { @@ -120,12 +102,12 @@ err = device_probe_and_attach(sc->sc_bus.bdev); } +error:; if (err) { - device_printf(self, "USB init failed\n"); ohci_atmelarm_detach(self); - return EIO; + return (err); } - return 0; + return (err); } static int @@ -138,13 +120,8 @@ sc->sc_flags &= ~OHCI_SCFLG_DONEINIT; } - if (sc->irq_res && sc->ih) { - int err = bus_teardown_intr(self, sc->irq_res, sc->ih); - - if (err) - /* XXX or should we panic? */ - device_printf(self, "Could not tear down irq, %d\n", - err); + if (sc->ih) { + bus_teardown_intr(self, sc->irq_res, sc->ih); sc->ih = NULL; } if (sc->sc_bus.bdev) { @@ -161,7 +138,7 @@ sc->iot = 0; sc->ioh = 0; } - return 0; + return (0); } static device_method_t ohci_methods[] = { ==== //depot/projects/arm/src/sys/dev/usb/ohci.c#5 (text+ko) ==== @@ -1145,23 +1145,23 @@ Static int ohci_intr1(ohci_softc_t *); -int +void ohci_intr(void *p) { ohci_softc_t *sc = p; if (sc == NULL || sc->sc_dying) - return (0); + return; /* If we get an interrupt while polling, then just ignore it. */ if (sc->sc_bus.use_polling) { #ifdef DIAGNOSTIC printf("ohci_intr: ignored interrupt while polling\n"); #endif - return (0); + return; } - return (ohci_intr1(sc)); + ohci_intr1(sc); } Static int ==== //depot/projects/arm/src/sys/dev/usb/ohci_pci.c#5 (text+ko) ==== @@ -295,8 +295,8 @@ sprintf(sc->sc_vendor, "(0x%04x)", pci_get_vendor(self)); } - err = bus_setup_intr(self, sc->irq_res, INTR_TYPE_BIO, - (driver_intr_t *) ohci_intr, sc, &sc->ih); + err = bus_setup_intr(self, sc->irq_res, INTR_TYPE_BIO, ohci_intr, sc, + &sc->ih); if (err) { device_printf(self, "Could not setup irq, %d\n", err); sc->ih = NULL; ==== //depot/projects/arm/src/sys/dev/usb/ohcivar.h#4 (text+ko) ==== @@ -164,7 +164,7 @@ #define OXFER(xfer) ((struct ohci_xfer *)(xfer)) usbd_status ohci_init(ohci_softc_t *); -int ohci_intr(void *); +void ohci_intr(void *); int ohci_detach(ohci_softc_t *, int); #if defined(__NetBSD__) || defined(__OpenBSD__) int ohci_activate(device_ptr_t, enum devact); From owner-p4-projects@FreeBSD.ORG Fri Feb 10 22:04:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F0E816A43C; Fri, 10 Feb 2006 22:04:10 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3958716A423 for ; Fri, 10 Feb 2006 22:04:10 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 07D1943D48 for ; Fri, 10 Feb 2006 22:04:10 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1AM49jr050367 for ; Fri, 10 Feb 2006 22:04:09 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1AM49Kv050364 for perforce@freebsd.org; Fri, 10 Feb 2006 22:04:09 GMT (envelope-from brueffer@freebsd.org) Date: Fri, 10 Feb 2006 22:04:09 GMT Message-Id: <200602102204.k1AM49Kv050364@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 91524 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Feb 2006 22:04:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=91524 Change 91524 by brueffer@brueffer_serenity on 2006/02/10 22:04:05 Hook up the audit system to system call entry and exit for sparc64. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/trap.c#5 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/trap.c#5 (text+ko) ==== @@ -66,6 +66,7 @@ #include #include #endif +#include #include #include @@ -595,7 +596,9 @@ PTRACESTOP_SC(p, td, S_PT_SCE); + AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, argp); + AUDIT_SYSCALL_EXIT(code, td); CTR5(KTR_SYSC, "syscall: p=%p error=%d %s return %#lx %#lx ", p, error, syscallnames[code], td->td_retval[0], From owner-p4-projects@FreeBSD.ORG Fri Feb 10 22:07:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDEC516A424; Fri, 10 Feb 2006 22:07:18 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 619B416A420 for ; Fri, 10 Feb 2006 22:07:18 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 30A3D43D64 for ; Fri, 10 Feb 2006 22:07:14 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1AM7EDC051494 for ; Fri, 10 Feb 2006 22:07:14 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1AM7DHb051491 for perforce@freebsd.org; Fri, 10 Feb 2006 22:07:13 GMT (envelope-from imp@freebsd.org) Date: Fri, 10 Feb 2006 22:07:13 GMT Message-Id: <200602102207.k1AM7DHb051491@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91525 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Feb 2006 22:07:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=91525 Change 91525 by imp@imp_Speedy on 2006/02/10 22:06:34 more changes Affected files ... .. //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#3 edit .. //depot/projects/arm/src/sys/arm/conf/KB920X#16 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#3 (text+ko) ==== @@ -49,16 +49,16 @@ static int ohci_atmelarm_detach(device_t dev); static int -ohci_atmelarm_probe(device_t self) +ohci_atmelarm_probe(device_t dev) { - device_set_desc(self, "AT91 integrated ohci controller"); + device_set_desc(dev, "AT91 integrated ohci controller"); return (BUS_PROBE_DEFAULT); } static int -ohci_atmelarm_attach(device_t self) +ohci_atmelarm_attach(device_t dev) { - ohci_softc_t *sc = device_get_softc(self); + ohci_softc_t *sc = device_get_softc(dev); int err; int rid; @@ -67,7 +67,7 @@ strlcpy(sc->sc_vendor, "Atmel", sizeof(sc->sc_vendor)); rid = MEM_RID; - sc->io_res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, + sc->io_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); if (sc->io_res == NULL) { err = ENXIO; @@ -77,20 +77,20 @@ sc->ioh = rman_get_bushandle(sc->io_res); rid = 0; - sc->irq_res = bus_alloc_resource_any(self, SYS_RES_IRQ, &rid, + sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); if (sc->irq_res == NULL) { err = ENXIO; goto error; } - sc->sc_bus.bdev = device_add_child(self, "usb", -1); + sc->sc_bus.bdev = device_add_child(dev, "usb", -1); if (sc->sc_bus.bdev == NULL) { err = ENOMEM; goto error; } device_set_ivars(sc->sc_bus.bdev, &sc->sc_bus); - err = bus_setup_intr(self, sc->irq_res, INTR_TYPE_BIO, ohci_intr, sc, + err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_BIO, ohci_intr, sc, &sc->ih); if (err) { err = ENXIO; @@ -104,16 +104,16 @@ error:; if (err) { - ohci_atmelarm_detach(self); + ohci_atmelarm_detach(dev); return (err); } return (err); } static int -ohci_atmelarm_detach(device_t self) +ohci_atmelarm_detach(device_t dev) { - ohci_softc_t *sc = device_get_softc(self); + ohci_softc_t *sc = device_get_softc(dev); if (sc->sc_flags & OHCI_SCFLG_DONEINIT) { ohci_detach(sc, 0); @@ -121,19 +121,19 @@ } if (sc->ih) { - bus_teardown_intr(self, sc->irq_res, sc->ih); + bus_teardown_intr(dev, sc->irq_res, sc->ih); sc->ih = NULL; } if (sc->sc_bus.bdev) { - device_delete_child(self, sc->sc_bus.bdev); + device_delete_child(dev, sc->sc_bus.bdev); sc->sc_bus.bdev = NULL; } if (sc->irq_res) { - bus_release_resource(self, SYS_RES_IRQ, 0, sc->irq_res); + bus_release_resource(dev, SYS_RES_IRQ, 0, sc->irq_res); sc->irq_res = NULL; } if (sc->io_res) { - bus_release_resource(self, SYS_RES_MEMORY, MEM_RID, sc->io_res); + bus_release_resource(dev, SYS_RES_MEMORY, MEM_RID, sc->io_res); sc->io_res = NULL; sc->iot = 0; sc->ioh = 0; ==== //depot/projects/arm/src/sys/arm/conf/KB920X#16 (text+ko) ==== @@ -42,7 +42,7 @@ #options UFS_ACL #Support for access control lists #options UFS_DIRHASH #Improve performance on big directories options MD_ROOT #MD is a potential root device -options MD_ROOT_SIZE=4096 # 3MB ram disk +options MD_ROOT_SIZE=4096 # 5MB ram disk options ROOTDEVNAME=\"ufs:md0\" #options NFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server From owner-p4-projects@FreeBSD.ORG Fri Feb 10 23:41:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5002416A423; Fri, 10 Feb 2006 23:41:09 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EA5FE16A420 for ; Fri, 10 Feb 2006 23:41:08 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA3D543D45 for ; Fri, 10 Feb 2006 23:41:08 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1ANf8Kn055655 for ; Fri, 10 Feb 2006 23:41:08 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1ANf8eq055652 for perforce@freebsd.org; Fri, 10 Feb 2006 23:41:08 GMT (envelope-from imp@freebsd.org) Date: Fri, 10 Feb 2006 23:41:08 GMT Message-Id: <200602102341.k1ANf8eq055652@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91526 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Feb 2006 23:41:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=91526 Change 91526 by imp@imp_Speedy on 2006/02/10 23:40:59 Fix base address for ohci. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91.c#4 (text+ko) ==== @@ -302,7 +302,7 @@ at91_add_child(dev, 10, "at91_spi", 0, AT91RM92_BASE + // SPI AT91RM92_SPI_BASE, AT91RM92_SPI_SIZE, AT91RM92_IRQ_SPI); // Not sure that the following belongs on this bus. - at91_add_child(dev, 10, "ohci", 0, AT91RM92_BASE + // UHP + at91_add_child(dev, 10, "ohci", 0, // UHP AT91RM92_OHCI_BASE, AT91RM92_OHCI_SIZE, AT91RM92_IRQ_UHP); bus_generic_probe(dev); bus_generic_attach(dev); From owner-p4-projects@FreeBSD.ORG Sat Feb 11 00:22:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4787D16A423; Sat, 11 Feb 2006 00:22:00 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E6ED916A420 for ; Sat, 11 Feb 2006 00:21:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 92D0243D46 for ; Sat, 11 Feb 2006 00:21:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1B0LxVs059201 for ; Sat, 11 Feb 2006 00:21:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1B0LxPu059198 for perforce@freebsd.org; Sat, 11 Feb 2006 00:21:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 11 Feb 2006 00:21:59 GMT Message-Id: <200602110021.k1B0LxPu059198@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91529 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Feb 2006 00:22:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=91529 Change 91529 by rwatson@rwatson_zoo on 2006/02/11 00:21:20 Temporarily remove ABI versioning code from module registration; keep API version number. Requested by: sbahra Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#452 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#241 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#452 (text+ko) ==== @@ -96,21 +96,10 @@ #ifdef MAC -/*- - * The TrustedBSD MAC Framework declares two version numbers in support of - * policy modules: - * - * - A linker version number, which declares the version of the MAC policy - * ABI. - * - * - A feature version number, relative to the linker version, which declares - * what if any optional features for the linker version are present. This - * supports the incremental addition of features in a FreeBSD RELENG - * branch. - * - * Modules will be unable to load if they do not match the current linker - * version due to ABI compatibility concerns. They may also test for support - * for specific API features that they depend on. +/* + * Declare that the kernel provides MAC support, version 1. This permits + * modules to refuse to be loaded if the necessary support isn't present, + * even if it's pre-boot. */ MODULE_VERSION(kernel_mac_support, 3); @@ -392,14 +381,6 @@ error = EBUSY; break; } - if (mac_version < mpc->mpc_depend_version) { - printf("mac_policy_modevent: %s policy requires " - "MAC version %d\n", mpc->mpc_name, - mpc->mpc_depend_version); - error = ENOTSUP; - break; - } - error = mac_policy_register(mpc); break; case MOD_UNLOAD: ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#241 (text+ko) ==== @@ -624,7 +624,6 @@ int mpc_loadtime_flags; /* flags */ int *mpc_field_off; /* security field */ int mpc_runtime_flags; /* flags */ - int mpc_depend_version; /* required MAC */ LIST_ENTRY(mac_policy_conf) mpc_list; /* global list */ }; @@ -636,10 +635,6 @@ /* Flags for the mpc_runtime_flags field. */ #define MPC_RUNTIME_FLAG_REGISTERED 0x00000001 -/* This must be defined after MAC_POLICY_SET. */ -#define MAC_DEPEND_VERSION(mpname, version) \ - mpname##_mac_policy_conf.mpc_depend_version = version; - #define MAC_POLICY_SET(mpops, mpname, mpfullname, mpflags, privdata_wanted) \ static struct mac_policy_conf mpname##_mac_policy_conf = { \ #mpname, \ @@ -648,7 +643,6 @@ mpflags, \ privdata_wanted, \ 0, \ - 0, \ }; \ static moduledata_t mpname##_mod = { \ #mpname, \ From owner-p4-projects@FreeBSD.ORG Sat Feb 11 00:27:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B76DC16A423; Sat, 11 Feb 2006 00:27:06 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 621F916A422 for ; Sat, 11 Feb 2006 00:27:06 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 25D3D43D46 for ; Sat, 11 Feb 2006 00:27:06 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1B0R6K2063233 for ; Sat, 11 Feb 2006 00:27:06 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1B0R5Md063227 for perforce@freebsd.org; Sat, 11 Feb 2006 00:27:05 GMT (envelope-from millert@freebsd.org) Date: Sat, 11 Feb 2006 00:27:05 GMT Message-Id: <200602110027.k1B0R5Md063227@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91530 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Feb 2006 00:27:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=91530 Change 91530 by millert@millert_ibook on 2006/02/11 00:26:40 Add sedarwin report which obsoletes mach-security.txt This is a work in progress Affected files ... .. //depot/projects/trustedbsd/sedarwin7/docs/mach-security.txt#5 delete .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/IEEEtran.bst#1 add .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/api.tex#1 add .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/bsd.tex#1 add .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/chgbar.sty#1 add .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/framework.tex#1 add .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/future.tex#1 add .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/getting.tex#1 add .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/intro.tex#1 add .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/mach.tex#1 add .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/sebsd.tex#1 add .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/sedarwin.bib#1 add .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/sedarwin.tex#1 add .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/test.tex#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Feb 11 01:23:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5745816A423; Sat, 11 Feb 2006 01:23:16 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED98516A420 for ; Sat, 11 Feb 2006 01:23:15 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9480143D45 for ; Sat, 11 Feb 2006 01:23:15 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1B1NFmF077245 for ; Sat, 11 Feb 2006 01:23:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1B1NF9X077242 for perforce@freebsd.org; Sat, 11 Feb 2006 01:23:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 11 Feb 2006 01:23:15 GMT Message-Id: <200602110123.k1B1NF9X077242@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91534 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Feb 2006 01:23:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=91534 Change 91534 by rwatson@rwatson_zoo on 2006/02/11 01:22:44 First pass at integrating trustedbsd_mac up to current TrustedBSD base HEAD. Affected files ... .. //depot/projects/trustedbsd/mac/sys/netinet/if_ether.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/igmp.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in.h#22 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in_gif.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in_pcb.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in_proto.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in_var.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_carp.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_dummynet.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_dummynet.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fastfwd.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw.h#21 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw_pfil.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_gre.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_gre.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_icmp.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_input.c#52 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_ipsec.c#1 branch .. //depot/projects/trustedbsd/mac/sys/netinet/ip_ipsec.h#1 branch .. //depot/projects/trustedbsd/mac/sys/netinet/ip_mroute.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_mroute.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_options.c#1 add .. //depot/projects/trustedbsd/mac/sys/netinet/ip_options.h#1 branch .. //depot/projects/trustedbsd/mac/sys/netinet/ip_output.c#46 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_var.h#28 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/libalias/libalias.3#2 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#44 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#60 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_output.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_sack.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_syncache.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_usrreq.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#43 integrate Differences ... ==== //depot/projects/trustedbsd/mac/sys/netinet/if_ether.c#31 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if_ether.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/netinet/if_ether.c,v 1.145 2005/11/08 12:05:57 glebius Exp $ + * $FreeBSD: src/sys/netinet/if_ether.c,v 1.150 2006/01/31 21:29:41 thompsa Exp $ */ /* @@ -81,9 +81,9 @@ static int arpt_keep = (20*60); /* once resolved, good for 20 more minutes */ SYSCTL_INT(_net_link_ether_inet, OID_AUTO, prune_intvl, CTLFLAG_RW, - &arpt_prune, 0, ""); + &arpt_prune, 0, "ARP table prune interval in seconds"); SYSCTL_INT(_net_link_ether_inet, OID_AUTO, max_age, CTLFLAG_RW, - &arpt_keep, 0, ""); + &arpt_keep, 0, "ARP entry lifetime in seconds"); #define rt_expire rt_rmx.rmx_expire @@ -106,11 +106,11 @@ static struct callout arp_callout; SYSCTL_INT(_net_link_ether_inet, OID_AUTO, maxtries, CTLFLAG_RW, - &arp_maxtries, 0, ""); + &arp_maxtries, 0, "ARP resolution attempts before returning error"); SYSCTL_INT(_net_link_ether_inet, OID_AUTO, useloopback, CTLFLAG_RW, - &useloopback, 0, ""); + &useloopback, 0, "Use the loopback interface for local traffic"); SYSCTL_INT(_net_link_ether_inet, OID_AUTO, proxyall, CTLFLAG_RW, - &arp_proxyall, 0, ""); + &arp_proxyall, 0, "Enable proxy ARP for all suitable requests"); static void arp_init(void); static void arp_rtrequest(int, struct rtentry *, struct rt_addrinfo *); @@ -570,6 +570,7 @@ */ static int log_arp_wrong_iface = 1; static int log_arp_movements = 1; +static int log_arp_permanent_modify = 1; SYSCTL_INT(_net_link_ether_inet, OID_AUTO, log_arp_wrong_iface, CTLFLAG_RW, &log_arp_wrong_iface, 0, @@ -577,6 +578,9 @@ SYSCTL_INT(_net_link_ether_inet, OID_AUTO, log_arp_movements, CTLFLAG_RW, &log_arp_movements, 0, "log arp replies from MACs different than the one in the cache"); +SYSCTL_INT(_net_link_ether_inet, OID_AUTO, log_arp_permanent_modify, CTLFLAG_RW, + &log_arp_permanent_modify, 0, + "log arp replies from MACs different than the one in the permanent arp entry"); /* * XXX: mbufs here require explicit MAC labeling on output. @@ -629,7 +633,8 @@ * XXX: This is really ugly! */ LIST_FOREACH(ia, INADDR_HASH(itaddr.s_addr), ia_hash) { - if ((bridged || (ia->ia_ifp == ifp)) && + if (((bridged && ia->ia_ifp->if_type != IFT_BRIDGE) || + (ia->ia_ifp == ifp)) && itaddr.s_addr == ia->ia_addr.sin_addr.s_addr) goto match; #ifdef DEV_CARP @@ -642,7 +647,8 @@ #endif } LIST_FOREACH(ia, INADDR_HASH(isaddr.s_addr), ia_hash) - if ((bridged || (ia->ia_ifp == ifp)) && + if (((bridged && ia->ia_ifp->if_type != IFT_BRIDGE) || + (ia->ia_ifp == ifp)) && isaddr.s_addr == ia->ia_addr.sin_addr.s_addr) goto match; /* @@ -723,12 +729,13 @@ ifp->if_addrlen, (u_char *)ar_sha(ah), ":", ifp->if_xname); } else { - log(LOG_ERR, - "arp: %*D attempts to modify permanent entry for %s on %s\n", - ifp->if_addrlen, (u_char *)ar_sha(ah), ":", - inet_ntoa(isaddr), ifp->if_xname); - RT_UNLOCK(rt); - goto reply; + RT_UNLOCK(rt); + if (log_arp_permanent_modify) + log(LOG_ERR, "arp: %*D attempts to modify " + "permanent entry for %s on %s\n", + ifp->if_addrlen, (u_char *)ar_sha(ah), ":", + inet_ntoa(isaddr), ifp->if_xname); + goto reply; } } /* ==== //depot/projects/trustedbsd/mac/sys/netinet/igmp.c#18 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)igmp.c 8.1 (Berkeley) 7/19/93 - * $FreeBSD: src/sys/netinet/igmp.c,v 1.50 2005/11/02 13:46:31 andre Exp $ + * $FreeBSD: src/sys/netinet/igmp.c,v 1.51 2005/11/18 20:12:39 andre Exp $ */ /* @@ -65,6 +65,7 @@ #include #include #include +#include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet/in.c#24 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * @(#)in.c 8.4 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/netinet/in.c,v 1.92 2005/10/28 20:29:42 glebius Exp $ + * $FreeBSD: src/sys/netinet/in.c,v 1.93 2006/01/24 16:19:31 andre Exp $ */ #include "opt_carp.h" @@ -479,7 +479,8 @@ s = splnet(); TAILQ_REMOVE(&ifp->if_addrhead, &ia->ia_ifa, ifa_link); TAILQ_REMOVE(&in_ifaddrhead, ia, ia_link); - LIST_REMOVE(ia, ia_hash); + if (ia->ia_addr.sin_family == AF_INET) + LIST_REMOVE(ia, ia_hash); IFAFREE(&ia->ia_ifa); splx(s); ==== //depot/projects/trustedbsd/mac/sys/netinet/in.h#22 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)in.h 8.3 (Berkeley) 1/3/94 - * $FreeBSD: src/sys/netinet/in.h,v 1.93 2005/09/26 20:25:16 andre Exp $ + * $FreeBSD: src/sys/netinet/in.h,v 1.95 2005/12/20 09:38:03 delphij Exp $ */ #ifndef _NETINET_IN_H_ @@ -228,6 +228,7 @@ #define IPPROTO_APES 99 /* any private encr. scheme */ #define IPPROTO_GMTP 100 /* GMTP*/ #define IPPROTO_IPCOMP 108 /* payload compression (IPComp) */ +#define IPPROTO_SCTP 132 /* SCTP */ /* 101-254: Partly Unassigned */ #define IPPROTO_PIM 103 /* Protocol Independent Mcast */ #define IPPROTO_CARP 112 /* CARP */ ==== //depot/projects/trustedbsd/mac/sys/netinet/in_gif.c#15 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet/in_gif.c,v 1.32 2005/11/09 13:29:15 ru Exp $ */ +/* $FreeBSD: src/sys/netinet/in_gif.c,v 1.34 2006/01/30 08:39:09 glebius Exp $ */ /* $KAME: in_gif.c,v 1.54 2001/05/14 14:02:16 itojun Exp $ */ /*- @@ -100,9 +100,12 @@ struct sockaddr_in *sin_src = (struct sockaddr_in *)sc->gif_psrc; struct sockaddr_in *sin_dst = (struct sockaddr_in *)sc->gif_pdst; struct ip iphdr; /* capsule IP header, host byte ordered */ + struct etherip_header eiphdr; int proto, error; u_int8_t tos; + GIF_LOCK_ASSERT(sc); + if (sin_src == NULL || sin_dst == NULL || sin_src->sin_family != AF_INET || sin_dst->sin_family != AF_INET) { @@ -142,6 +145,20 @@ break; } #endif /* INET6 */ + case AF_LINK: + proto = IPPROTO_ETHERIP; + eiphdr.eip_ver = ETHERIP_VERSION & ETHERIP_VER_VERS_MASK; + eiphdr.eip_pad = 0; + /* prepend Ethernet-in-IP header */ + M_PREPEND(m, sizeof(struct etherip_header), M_DONTWAIT); + if (m && m->m_len < sizeof(struct etherip_header)) + m = m_pullup(m, sizeof(struct etherip_header)); + if (m == NULL) + return ENOBUFS; + bcopy(&eiphdr, mtod(m, struct etherip_header *), + sizeof(struct etherip_header)); + break; + default: #ifdef DEBUG printf("in_gif_output: warning: unknown family %d passed\n", @@ -302,6 +319,10 @@ break; } #endif /* INET6 */ + case IPPROTO_ETHERIP: + af = AF_LINK; + break; + default: ipstat.ips_nogif++; m_freem(m); ==== //depot/projects/trustedbsd/mac/sys/netinet/in_pcb.c#36 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)in_pcb.c 8.4 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.166 2005/07/19 12:24:27 rwatson Exp $ + * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.168 2006/02/04 07:59:17 ume Exp $ */ #include "opt_ipsec.h" @@ -169,12 +169,9 @@ * Allocate a PCB and associate it with the socket. */ int -in_pcballoc(so, pcbinfo, type) - struct socket *so; - struct inpcbinfo *pcbinfo; - const char *type; +in_pcballoc(struct socket *so, struct inpcbinfo *pcbinfo, const char *type) { - register struct inpcb *inp; + struct inpcb *inp; int error; INP_INFO_WLOCK_ASSERT(pcbinfo); @@ -226,10 +223,7 @@ } int -in_pcbbind(inp, nam, cred) - register struct inpcb *inp; - struct sockaddr *nam; - struct ucred *cred; +in_pcbbind(struct inpcb *inp, struct sockaddr *nam, struct ucred *cred) { int anonport, error; @@ -264,12 +258,8 @@ * On error, the values of *laddrp and *lportp are not changed. */ int -in_pcbbind_setup(inp, nam, laddrp, lportp, cred) - struct inpcb *inp; - struct sockaddr *nam; - in_addr_t *laddrp; - u_short *lportp; - struct ucred *cred; +in_pcbbind_setup(struct inpcb *inp, struct sockaddr *nam, in_addr_t *laddrp, + u_short *lportp, struct ucred *cred) { struct socket *so = inp->inp_socket; unsigned short *lastport; @@ -486,10 +476,7 @@ * then pick one. */ int -in_pcbconnect(inp, nam, cred) - register struct inpcb *inp; - struct sockaddr *nam; - struct ucred *cred; +in_pcbconnect(struct inpcb *inp, struct sockaddr *nam, struct ucred *cred) { u_short lport, fport; in_addr_t laddr, faddr; @@ -548,15 +535,9 @@ * is set to NULL. */ int -in_pcbconnect_setup(inp, nam, laddrp, lportp, faddrp, fportp, oinpp, cred) - register struct inpcb *inp; - struct sockaddr *nam; - in_addr_t *laddrp; - u_short *lportp; - in_addr_t *faddrp; - u_short *fportp; - struct inpcb **oinpp; - struct ucred *cred; +in_pcbconnect_setup(struct inpcb *inp, struct sockaddr *nam, + in_addr_t *laddrp, u_short *lportp, in_addr_t *faddrp, u_short *fportp, + struct inpcb **oinpp, struct ucred *cred) { struct sockaddr_in *sin = (struct sockaddr_in *)nam; struct in_ifaddr *ia; @@ -689,8 +670,7 @@ } void -in_pcbdisconnect(inp) - struct inpcb *inp; +in_pcbdisconnect(struct inpcb *inp) { INP_INFO_WLOCK_ASSERT(inp->inp_pcbinfo); @@ -707,8 +687,7 @@ } void -in_pcbdetach(inp) - struct inpcb *inp; +in_pcbdetach(struct inpcb *inp) { struct socket *so = inp->inp_socket; struct inpcbinfo *ipi = inp->inp_pcbinfo; @@ -739,9 +718,7 @@ } struct sockaddr * -in_sockaddr(port, addr_p) - in_port_t port; - struct in_addr *addr_p; +in_sockaddr(in_port_t port, struct in_addr *addr_p) { struct sockaddr_in *sin; @@ -764,12 +741,10 @@ * because there actually /is/ a programming error somewhere... XXX) */ int -in_setsockaddr(so, nam, pcbinfo) - struct socket *so; - struct sockaddr **nam; - struct inpcbinfo *pcbinfo; +in_setsockaddr(struct socket *so, struct sockaddr **nam, + struct inpcbinfo *pcbinfo) { - register struct inpcb *inp; + struct inpcb *inp; struct in_addr addr; in_port_t port; @@ -793,12 +768,10 @@ * The wrapper function will pass down the pcbinfo for this function to lock. */ int -in_setpeeraddr(so, nam, pcbinfo) - struct socket *so; - struct sockaddr **nam; - struct inpcbinfo *pcbinfo; +in_setpeeraddr(struct socket *so, struct sockaddr **nam, + struct inpcbinfo *pcbinfo) { - register struct inpcb *inp; + struct inpcb *inp; struct in_addr addr; in_port_t port; @@ -819,11 +792,8 @@ } void -in_pcbnotifyall(pcbinfo, faddr, errno, notify) - struct inpcbinfo *pcbinfo; - struct in_addr faddr; - int errno; - struct inpcb *(*notify)(struct inpcb *, int); +in_pcbnotifyall(struct inpcbinfo *pcbinfo, struct in_addr faddr, int errno, + struct inpcb *(*notify)(struct inpcb *, int)) { struct inpcb *inp, *ninp; struct inpcbhead *head; @@ -851,9 +821,7 @@ } void -in_pcbpurgeif0(pcbinfo, ifp) - struct inpcbinfo *pcbinfo; - struct ifnet *ifp; +in_pcbpurgeif0(struct inpcbinfo *pcbinfo, struct ifnet *ifp) { struct inpcb *inp; struct ip_moptions *imo; @@ -895,15 +863,18 @@ /* * Lookup a PCB based on the local address and port. */ +#define INP_LOOKUP_MAPPED_PCB_COST 3 struct inpcb * -in_pcblookup_local(pcbinfo, laddr, lport_arg, wild_okay) - struct inpcbinfo *pcbinfo; - struct in_addr laddr; - u_int lport_arg; - int wild_okay; +in_pcblookup_local(struct inpcbinfo *pcbinfo, struct in_addr laddr, + u_int lport_arg, int wild_okay) { - register struct inpcb *inp; - int matchwild = 3, wildcard; + struct inpcb *inp; +#ifdef INET6 + int matchwild = 3 + INP_LOOKUP_MAPPED_PCB_COST; +#else + int matchwild = 3; +#endif + int wildcard; u_short lport = lport_arg; INP_INFO_WLOCK_ASSERT(pcbinfo); @@ -960,6 +931,21 @@ #ifdef INET6 if ((inp->inp_vflag & INP_IPV4) == 0) continue; + /* + * We never select the PCB that has + * INP_IPV6 flag and is bound to :: if + * we have another PCB which is bound + * to 0.0.0.0. If a PCB has the + * INP_IPV6 flag, then we set its cost + * higher than IPv4 only PCBs. + * + * Note that the case only happens + * when a socket is bound to ::, under + * the condition that the use of the + * mapped address is allowed. + */ + if ((inp->inp_vflag & INP_IPV6) != 0) + wildcard += INP_LOOKUP_MAPPED_PCB_COST; #endif /* * Clean out old time_wait sockets if they @@ -996,21 +982,18 @@ return (match); } } +#undef INP_LOOKUP_MAPPED_PCB_COST /* * Lookup PCB in hash list. */ struct inpcb * -in_pcblookup_hash(pcbinfo, faddr, fport_arg, laddr, lport_arg, wildcard, - ifp) - struct inpcbinfo *pcbinfo; - struct in_addr faddr, laddr; - u_int fport_arg, lport_arg; - int wildcard; - struct ifnet *ifp; +in_pcblookup_hash(struct inpcbinfo *pcbinfo, struct in_addr faddr, + u_int fport_arg, struct in_addr laddr, u_int lport_arg, int wildcard, + struct ifnet *ifp) { struct inpcbhead *head; - register struct inpcb *inp; + struct inpcb *inp; u_short fport = fport_arg, lport = lport_arg; INP_INFO_RLOCK_ASSERT(pcbinfo); @@ -1080,8 +1063,7 @@ * Insert PCB onto various hash lists. */ int -in_pcbinshash(inp) - struct inpcb *inp; +in_pcbinshash(struct inpcb *inp) { struct inpcbhead *pcbhash; struct inpcbporthead *pcbporthash; @@ -1135,8 +1117,7 @@ * not change after in_pcbinshash() has been called. */ void -in_pcbrehash(inp) - struct inpcb *inp; +in_pcbrehash(struct inpcb *inp) { struct inpcbinfo *pcbinfo = inp->inp_pcbinfo; struct inpcbhead *head; @@ -1162,8 +1143,7 @@ * Remove PCB from various lists. */ void -in_pcbremlists(inp) - struct inpcb *inp; +in_pcbremlists(struct inpcb *inp) { struct inpcbinfo *pcbinfo = inp->inp_pcbinfo; @@ -1190,8 +1170,7 @@ * label change into the in_pcb for the socket. */ void -in_pcbsosetlabel(so) - struct socket *so; +in_pcbsosetlabel(struct socket *so) { #ifdef MAC struct inpcb *inp; @@ -1215,8 +1194,7 @@ */ void -ipport_tick(xtp) - void *xtp; +ipport_tick(void *xtp) { if (ipport_tcpallocs > ipport_tcplastcount + ipport_randomcps) { ipport_stoprandom = ipport_randomtime; ==== //depot/projects/trustedbsd/mac/sys/netinet/in_proto.c#21 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)in_proto.c 8.2 (Berkeley) 2/9/95 - * $FreeBSD: src/sys/netinet/in_proto.c,v 1.80 2005/11/09 13:29:15 ru Exp $ + * $FreeBSD: src/sys/netinet/in_proto.c,v 1.81 2005/12/21 21:29:45 thompsa Exp $ */ #include "opt_ipx.h" @@ -260,6 +260,16 @@ { .pr_type = SOCK_RAW, .pr_domain = &inetdomain, + .pr_protocol = IPPROTO_ETHERIP, + .pr_flags = PR_ATOMIC|PR_ADDR|PR_LASTHDR, + .pr_input = encap4_input, + .pr_ctloutput = rip_ctloutput, + .pr_init = encap_init, + .pr_usrreqs = &rip_usrreqs +}, +{ + .pr_type = SOCK_RAW, + .pr_domain = &inetdomain, .pr_protocol = IPPROTO_GRE, .pr_flags = PR_ATOMIC|PR_ADDR|PR_LASTHDR, .pr_input = encap4_input, ==== //depot/projects/trustedbsd/mac/sys/netinet/in_var.h#13 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)in_var.h 8.2 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/netinet/in_var.h,v 1.55 2005/08/03 19:29:46 rwatson Exp $ + * $FreeBSD: src/sys/netinet/in_var.h,v 1.56 2006/01/18 14:24:39 andre Exp $ */ #ifndef _NETINET_IN_VAR_H_ @@ -242,7 +242,7 @@ void ip_input(struct mbuf *); int in_ifadown(struct ifaddr *ifa, int); void in_ifscrub(struct ifnet *, struct in_ifaddr *); -int ip_fastforward(struct mbuf *); +struct mbuf *ip_fastforward(struct mbuf *); #endif /* _KERNEL */ ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_carp.c#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet/ip_carp.c,v 1.35 2005/11/08 20:08:34 thompsa Exp $ */ +/* $FreeBSD: src/sys/netinet/ip_carp.c,v 1.38 2005/11/17 12:56:40 glebius Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff. All rights reserved. @@ -59,6 +59,7 @@ #include #include #include +#include #include #include @@ -78,7 +79,6 @@ #include #include #include -#include #endif #include @@ -1049,8 +1049,8 @@ if (ifa->ifa_addr->sa_family != AF_INET) continue; -/* arprequest(sc->sc_carpdev, &in, &in, IFP2ENADDR(sc->sc_ifp)); */ - arp_ifinit2(sc->sc_carpdev, ifa, IFP2ENADDR(sc->sc_ifp)); +/* arprequest(sc->sc_carpdev, &in, &in, IF_LLADDR(sc->sc_ifp)); */ + arp_ifinit2(sc->sc_carpdev, ifa, IF_LLADDR(sc->sc_ifp)); DELAY(1000); /* XXX */ } @@ -1145,7 +1145,7 @@ if (count == index) { if (vh->sc_state == MASTER) { - *enaddr = IFP2ENADDR(vh->sc_ifp); + *enaddr = IF_LLADDR(vh->sc_ifp); CARP_UNLOCK(cif); return (1); } else { @@ -1162,8 +1162,9 @@ TAILQ_FOREACH(vh, &cif->vhif_vrs, sc_list) { if ((SC2IFP(vh)->if_flags & IFF_UP) && (SC2IFP(vh)->if_drv_flags & IFF_DRV_RUNNING) && - ia->ia_ifp == SC2IFP(vh)) { - *enaddr = IFP2ENADDR(vh->sc_ifp); + ia->ia_ifp == SC2IFP(vh) && + vh->sc_state == MASTER) { + *enaddr = IF_LLADDR(vh->sc_ifp); CARP_UNLOCK(cif); return (1); } @@ -1187,7 +1188,8 @@ if (IN6_ARE_ADDR_EQUAL(taddr, &ifatoia6(ifa)->ia_addr.sin6_addr) && (SC2IFP(vh)->if_flags & IFF_UP) && - (SC2IFP(vh)->if_drv_flags & IFF_DRV_RUNNING)) { + (SC2IFP(vh)->if_drv_flags & IFF_DRV_RUNNING) && + vh->sc_state == MASTER) { CARP_UNLOCK(cif); return (ifa); } @@ -1219,14 +1221,14 @@ if (mtag == NULL) { /* better a bit than nothing */ CARP_UNLOCK(cif); - return (IFP2ENADDR(sc->sc_ifp)); + return (IF_LLADDR(sc->sc_ifp)); } bcopy(&ifp, (caddr_t)(mtag + 1), sizeof(struct ifnet *)); m_tag_prepend(m, mtag); CARP_UNLOCK(cif); - return (IFP2ENADDR(sc->sc_ifp)); + return (IF_LLADDR(sc->sc_ifp)); } } } @@ -1251,7 +1253,7 @@ if ((SC2IFP(vh)->if_flags & IFF_UP) && (SC2IFP(vh)->if_drv_flags & IFF_DRV_RUNNING) && vh->sc_state == MASTER && - !bcmp(dhost, IFP2ENADDR(vh->sc_ifp), ETHER_ADDR_LEN)) { + !bcmp(dhost, IF_LLADDR(vh->sc_ifp), ETHER_ADDR_LEN)) { CARP_UNLOCK(cif); return (SC2IFP(vh)); } @@ -1863,12 +1865,12 @@ return EEXIST; } sc->sc_vhid = carpr.carpr_vhid; - IFP2ENADDR(sc->sc_ifp)[0] = 0; - IFP2ENADDR(sc->sc_ifp)[1] = 0; - IFP2ENADDR(sc->sc_ifp)[2] = 0x5e; - IFP2ENADDR(sc->sc_ifp)[3] = 0; - IFP2ENADDR(sc->sc_ifp)[4] = 1; - IFP2ENADDR(sc->sc_ifp)[5] = sc->sc_vhid; + IF_LLADDR(sc->sc_ifp)[0] = 0; + IF_LLADDR(sc->sc_ifp)[1] = 0; + IF_LLADDR(sc->sc_ifp)[2] = 0x5e; + IF_LLADDR(sc->sc_ifp)[3] = 0; + IF_LLADDR(sc->sc_ifp)[4] = 1; + IF_LLADDR(sc->sc_ifp)[5] = sc->sc_vhid; error--; } if (carpr.carpr_advbase > 0 || carpr.carpr_advskew > 0) { ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_dummynet.c#31 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.95 2005/09/27 18:10:42 mlaier Exp $ + * $FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.98 2006/02/03 11:38:19 glebius Exp $ */ #define DUMMYNET_DEBUG @@ -115,15 +115,20 @@ static struct dn_heap ready_heap, extract_heap, wfq_ready_heap ; -static int heap_init(struct dn_heap *h, int size) ; -static int heap_insert (struct dn_heap *h, dn_key key1, void *p); -static void heap_extract(struct dn_heap *h, void *obj); +static int heap_init(struct dn_heap *h, int size); +static int heap_insert (struct dn_heap *h, dn_key key1, void *p); +static void heap_extract(struct dn_heap *h, void *obj); +static void transmit_event(struct dn_pipe *pipe, struct mbuf **head, + struct mbuf **tail); +static void ready_event(struct dn_flow_queue *q, struct mbuf **head, + struct mbuf **tail); +static void ready_event_wfq(struct dn_pipe *p, struct mbuf **head, + struct mbuf **tail); -static void transmit_event(struct dn_pipe *pipe); -static void ready_event(struct dn_flow_queue *q); - -static struct dn_pipe *all_pipes = NULL ; /* list of all pipes */ -static struct dn_flow_set *all_flow_sets = NULL ;/* list of all flow_sets */ +#define HASHSIZE 16 +#define HASH(num) ((((num) >> 8) ^ ((num) >> 4) ^ (num)) & 0x0f) +static struct dn_pipe_head pipehash[HASHSIZE]; /* all pipes */ +static struct dn_flow_set_head flowsethash[HASHSIZE]; /* all flowsets */ static struct callout dn_timeout; @@ -189,12 +194,11 @@ static void dummynet(void *); static void dummynet_flush(void); +static void dummynet_send(struct mbuf *); void dummynet_drain(void); static ip_dn_io_t dummynet_io; static void dn_rule_delete(void *); -int if_tx_rdy(struct ifnet *ifp); - /* * Heap management functions. * @@ -436,89 +440,37 @@ * invocations of the procedures. */ static void -transmit_event(struct dn_pipe *pipe) +transmit_event(struct dn_pipe *pipe, struct mbuf **head, struct mbuf **tail) { - struct mbuf *m ; - struct dn_pkt_tag *pkt ; - struct ip *ip; + struct mbuf *m; + struct dn_pkt_tag *pkt; - DUMMYNET_LOCK_ASSERT(); + DUMMYNET_LOCK_ASSERT(); - while ( (m = pipe->head) ) { - pkt = dn_tag_get(m); - if ( !DN_KEY_LEQ(pkt->output_time, curr_time) ) - break; - /* - * first unlink, then call procedures, since ip_input() can invoke - * ip_output() and viceversa, thus causing nested calls - */ - pipe->head = m->m_nextpkt ; - m->m_nextpkt = NULL; + while ((m = pipe->head) != NULL) { + pkt = dn_tag_get(m); + if (!DN_KEY_LEQ(pkt->output_time, curr_time)) + break; - /* XXX: drop the lock for now to avoid LOR's */ - DUMMYNET_UNLOCK(); - switch (pkt->dn_dir) { - case DN_TO_IP_OUT: - (void)ip_output(m, NULL, NULL, pkt->flags, NULL, NULL); - break ; + pipe->head = m->m_nextpkt; + if (*tail != NULL) + (*tail)->m_nextpkt = m; + else + *head = m; + *tail = m; + } + if (*tail != NULL) + (*tail)->m_nextpkt = NULL; - case DN_TO_IP_IN : - ip = mtod(m, struct ip *); - ip->ip_len = htons(ip->ip_len); - ip->ip_off = htons(ip->ip_off); - ip_input(m) ; - break ; - -#ifdef INET6 - case DN_TO_IP6_IN: - ip6_input(m) ; - break ; - - case DN_TO_IP6_OUT: - (void)ip6_output(m, NULL, NULL, pkt->flags, NULL, NULL, NULL); - break ; -#endif - - case DN_TO_IFB_FWD: - if (bridge_dn_p != NULL) - ((*bridge_dn_p)(m, pkt->ifp)); - else - printf("dummynet: if_bridge not loaded\n"); - - break; - - case DN_TO_ETH_DEMUX: - /* - * The Ethernet code assumes the Ethernet header is - * contiguous in the first mbuf header. Insure this is true. - */ - if (m->m_len < ETHER_HDR_LEN && - (m = m_pullup(m, ETHER_HDR_LEN)) == NULL) { - printf("dummynet/ether: pullup fail, dropping pkt\n"); - break; - } - ether_demux(m->m_pkthdr.rcvif, m); /* which consumes the mbuf */ - break ; - - case DN_TO_ETH_OUT: - ether_output_frame(pkt->ifp, m); - break; - - default: - printf("dummynet: bad switch %d!\n", pkt->dn_dir); - m_freem(m); - break ; + /* If there are leftover packets, put into the heap for next event. */ + if ((m = pipe->head) != NULL) { + pkt = dn_tag_get(m); + /* + * XXX: Should check errors on heap_insert, by draining the + * whole pipe p and hoping in the future we are more successful. + */ + heap_insert(&extract_heap, pkt->output_time, pipe); } - DUMMYNET_LOCK(); - } - /* if there are leftover packets, put into the heap for next event */ - if ( (m = pipe->head) ) { - pkt = dn_tag_get(m) ; - /* XXX should check errors on heap_insert, by draining the - * whole pipe p and hoping in the future we are more successful - */ - heap_insert(&extract_heap, pkt->output_time, pipe ) ; - } } /* @@ -562,7 +514,7 @@ * if there are leftover packets reinsert the pkt in the scheduler. */ static void -ready_event(struct dn_flow_queue *q) +ready_event(struct dn_flow_queue *q, struct mbuf **head, struct mbuf **tail) { struct mbuf *pkt; struct dn_pipe *p = q->fs->pipe ; @@ -612,11 +564,11 @@ q->numbytes = 0; } /* - * If the delay line was empty call transmit_event(p) now. + * If the delay line was empty call transmit_event() now. * Otherwise, the scheduler will take care of it. */ if (p_was_empty) - transmit_event(p); + transmit_event(p, head, tail); } /* @@ -628,7 +580,7 @@ * there is an additional delay. */ static void -ready_event_wfq(struct dn_pipe *p) +ready_event_wfq(struct dn_pipe *p, struct mbuf **head, struct mbuf **tail) { int p_was_empty = (p->head == NULL) ; struct dn_heap *sch = &(p->scheduler_heap); @@ -736,11 +688,11 @@ */ } /* - * If the delay line was empty call transmit_event(p) now. + * If the delay line was empty call transmit_event() now. * Otherwise, the scheduler will take care of it. */ if (p_was_empty) - transmit_event(p); + transmit_event(p, head, tail); } /* @@ -750,11 +702,12 @@ static void dummynet(void * __unused unused) { - void *p ; /* generic parameter to handler */ - struct dn_heap *h ; + struct mbuf *head = NULL, *tail = NULL; + struct dn_pipe *pipe; struct dn_heap *heaps[3]; + struct dn_heap *h; + void *p; /* generic parameter to handler */ int i; - struct dn_pipe *pe ; heaps[0] = &ready_heap ; /* fixed-rate queues */ heaps[1] = &wfq_ready_heap ; /* wfq queues */ @@ -771,63 +724,98 @@ p = h->p[0].object ; /* store a copy before heap_extract */ heap_extract(h, NULL); /* need to extract before processing */ if (i == 0) - ready_event(p) ; + ready_event(p, &head, &tail); else if (i == 1) { struct dn_pipe *pipe = p; if (pipe->if_name[0] != '\0') printf("dummynet: bad ready_event_wfq for pipe %s\n", pipe->if_name); else - ready_event_wfq(p) ; + ready_event_wfq(p, &head, &tail); } else - transmit_event(p); + transmit_event(p, &head, &tail); } } - /* sweep pipes trying to expire idle flow_queues */ - for (pe = all_pipes; pe ; pe = pe->next ) - if (pe->idle_heap.elements > 0 && - DN_KEY_LT(pe->idle_heap.p[0].key, pe->V) ) { - struct dn_flow_queue *q = pe->idle_heap.p[0].object ; + /* Sweep pipes trying to expire idle flow_queues. */ + for (i = 0; i < HASHSIZE; i++) + SLIST_FOREACH(pipe, &pipehash[i], next) + if (pipe->idle_heap.elements > 0 && + DN_KEY_LT(pipe->idle_heap.p[0].key, pipe->V) ) { + struct dn_flow_queue *q = pipe->idle_heap.p[0].object; + + heap_extract(&(pipe->idle_heap), NULL); + q->S = q->F + 1; /* Mark timestamp as invalid. */ + pipe->sum -= q->fs->weight; + } - heap_extract(&(pe->idle_heap), NULL); - q->S = q->F + 1 ; /* mark timestamp as invalid */ - pe->sum -= q->fs->weight ; - } DUMMYNET_UNLOCK(); + if (head != NULL) + dummynet_send(head); + callout_reset(&dn_timeout, 1, dummynet, NULL); } -/* - * called by an interface when tx_rdy occurs. - */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Feb 11 02:46:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD19616A423; Sat, 11 Feb 2006 02:46:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6904116A422 for ; Sat, 11 Feb 2006 02:46:01 +0000 (GMT) (envelope-from jkoshy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E15C943D48 for ; Sat, 11 Feb 2006 02:46:00 +0000 (GMT) (envelope-from jkoshy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1B2k01E081641 for ; Sat, 11 Feb 2006 02:46:00 GMT (envelope-from jkoshy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1B2k0Fo081638 for perforce@freebsd.org; Sat, 11 Feb 2006 02:46:00 GMT (envelope-from jkoshy@freebsd.org) Date: Sat, 11 Feb 2006 02:46:00 GMT Message-Id: <200602110246.k1B2k0Fo081638@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkoshy@freebsd.org using -f From: Joseph Koshy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91541 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Feb 2006 02:46:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=91541 Change 91541 by jkoshy@jkoshy_orthanc_mips on 2006/02/11 02:45:03 Bring back an accidentally deleted file. Discussed with: jmallett Affected files ... .. //depot/projects/mips/lib/libthr/thread/thr_getschedparam.c#3 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sat Feb 11 13:34:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3AC516A423; Sat, 11 Feb 2006 13:34:14 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 56E2616A420 for ; Sat, 11 Feb 2006 13:34:14 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EBC5243D45 for ; Sat, 11 Feb 2006 13:34:13 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1BDYDIH031765 for ; Sat, 11 Feb 2006 13:34:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1BDXq4E031493 for perforce@freebsd.org; Sat, 11 Feb 2006 13:33:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 11 Feb 2006 13:33:52 GMT Message-Id: <200602111333.k1BDXq4E031493@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91568 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Feb 2006 13:34:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=91568 Change 91568 by rwatson@rwatson_zoo on 2006/02/11 13:33:00 Continue integration of trustedbsd_mac branch from current TrustedBSD base branch head. Affected files ... .. //depot/projects/trustedbsd/mac/COPYRIGHT#5 integrate .. //depot/projects/trustedbsd/mac/LOCKS#2 integrate .. //depot/projects/trustedbsd/mac/MAINTAINERS#30 integrate .. //depot/projects/trustedbsd/mac/Makefile#36 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#61 integrate .. //depot/projects/trustedbsd/mac/ObsoleteFiles.inc#3 integrate .. //depot/projects/trustedbsd/mac/UPDATING#51 integrate .. //depot/projects/trustedbsd/mac/bin/date/date.1#13 integrate .. //depot/projects/trustedbsd/mac/bin/kenv/kenv.1#6 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.1#30 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.c#34 integrate .. //depot/projects/trustedbsd/mac/bin/ls/util.c#16 integrate .. //depot/projects/trustedbsd/mac/bin/rm/rm.1#12 integrate .. //depot/projects/trustedbsd/mac/bin/setfacl/setfacl.1#8 integrate .. //depot/projects/trustedbsd/mac/bin/sh/builtins.def#8 integrate .. //depot/projects/trustedbsd/mac/bin/sh/error.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/sh/eval.c#12 integrate .. //depot/projects/trustedbsd/mac/bin/sh/eval.h#6 integrate .. //depot/projects/trustedbsd/mac/bin/sh/expand.c#16 integrate .. //depot/projects/trustedbsd/mac/bin/sh/jobs.c#19 integrate .. //depot/projects/trustedbsd/mac/bin/sh/main.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/sh/miscbltin.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/sh/output.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/sh/sh.1#22 integrate .. //depot/projects/trustedbsd/mac/bin/sh/trap.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/sh/var.c#12 integrate .. //depot/projects/trustedbsd/mac/bin/sh/var.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bc/bc/main.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/CHANGES#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/FAQ#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/FREEBSD-Upgrade#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/README#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/dig.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/dighost.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/host.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/nslookup.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/aclconf.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/client.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/control.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/log.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/main.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.conf.5#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.conf.docbook#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.conf.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/server.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/unix/os.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/update.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/xfrout.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/config.threads.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/configure.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/isc.color.gif#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/validate.sh.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/misc/options#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3757.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3901.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc4025.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc4033.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc4034.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc4035.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc4074.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc4159.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/api#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/config.h.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/configure#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/configure.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/dst/md5.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/dst/support.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/include/resolv.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/include/resolv_mt.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/isc/eventlib.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/isc/eventlib_p.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/isc/memcluster.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/port_after.h.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/resolv/mtctxres.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/resolv/res_findzonecut.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind9/api#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind9/check.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind9/getaddresses.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/adb.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/api#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/forward.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/gen-unix.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/journal.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/key.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/name.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/rbt.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/rdata.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/resolver.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/validator.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/xfrin.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/zone.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/api#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/include/isc/print.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/inet_pton.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/lfsr.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/quota.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/result.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/rwlock.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/unix/entropy.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/unix/os.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/unix/socket.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isccfg/api#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isccfg/namedconf.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/api#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/getipnode.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/include/lwres/stdlib.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/lwconfig.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/print.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/strtoul.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/version#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/gensnmptree/gensnmptree.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/config.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/main.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/snmpd.config#6 integrate .. //depot/projects/trustedbsd/mac/contrib/cpio/doc/cpio.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cpio/doc/cpio.texi#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cpio/src/copyin.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cpio/src/copyout.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cpio/src/copypass.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cpio/src/extern.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cpio/src/global.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cpio/src/main.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-common#16 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/groff_mdoc.man#15 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/BSD/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/BSD/Makefile.ipsend#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/BSD/kupgrade#8 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/HISTORY#10 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/bpf_filter.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipf.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/iplang/iplang_l.l#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/iplang/iplang_y.y#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipmon.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsd/ipsd.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsd/ipsdr.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/arp.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/ip.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/ipresend.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/ipsend.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/ipsopt.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/iptest.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/iptests.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/larp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/lsock.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/resend.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/sbpf.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/sdlpi.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/slinux.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/snit.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/sock.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/tcpip.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipt.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/kmem.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/l4check/http.ok#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/addicmp.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/addipopt.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/addkeep.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/binprint.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/buildopts.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/checkrev.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/count4bits.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/count6bits.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/debug.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/extras.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/facpri.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/facpri.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/fill6bits.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/flags.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/genmask.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/getline.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/getnattype.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/getproto.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/hostmask.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/hostnum.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/icmpcode.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/inet_addr.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/initparse.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/ionames.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/ipft_ef.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/ipft_hx.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/ipft_pc.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/ipft_sn.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/ipft_td.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/ipft_tx.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/ipoptsec.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/kmem.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/kmem.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/load_hash.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/load_hashnode.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/load_pool.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/load_poolnode.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/loglevel.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/make_range.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/nat_setgroupmap.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/natparse.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/optname.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/optprint.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/optprintv6.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/optvalue.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/parse.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/portname.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/portnum.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/ports.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/print_toif.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printactivenat.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printaps.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printbuf.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printfr.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printfraginfo.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printhostmap.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printhostmask.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printifname.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printip.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printlog.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printmask.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printnat.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printpacket.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printportcmp.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printproto.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printstate.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/ratoi.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/ratoui.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/remove_hash.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/remove_hashnode.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/remove_pool.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/remove_poolnode.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/tcp_flags.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/tcpflags.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/tcpoptnames.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/to_interface.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/v6ionames.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/v6optvalue.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/verbose.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipf.5#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipftest.1#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipmon.8#10 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipnat.5#10 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipnat.8#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/mlfk_rule.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/opts.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/perl/ipf-mrtg.pl#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/perl/logfilter.pl#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/radix.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/radix_ipf.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.10#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.11#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.12#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.13#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.2#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.3#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.4#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.5#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.6#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.7#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.8#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.9#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.sr#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/samples/ipfilter-pb.gif#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/samples/proxy.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/samples/relay.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/snoop.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/dotest#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/bpf1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/f13#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/f17#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/f18#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/f19#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/f7#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/f9#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i11#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i12#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i14#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i16#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i17#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i18#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i19#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i2#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i20#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i21#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i4#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i6#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i7#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i8#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i9#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/in1#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/in2#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/in5#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/in6#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/n1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/n11#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/n13#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/n14#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/n2#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/n3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/n4#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/n5#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/n6#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/n7#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/p1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/p2#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/p3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/f13#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/f17#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/f18#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/f19#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/f7#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/f9#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/n13#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/n14#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/ni17#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/itest#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/natipftest#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/bpf1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/f13#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/f18#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/f19#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/f7#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i11#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i12#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i14#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i16#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i17#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i18#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i19#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i2#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i20#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i21#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i4#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i6#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i7#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i8#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i9#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/in1#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/in2#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/in5#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/in6#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/n13#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/n14#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni17.nat#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/p2.ipf#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/test.format#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/vfycksum.pl#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipf.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipf_y.y#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipfcomp.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipfstat.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipftest.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipmon.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipnat.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipnat_y.y#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipsyncm.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipsyncs.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-bpf.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/CHANGELOG#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/LICENSE#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/Makefile#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/README#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/TODO#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/VERSION#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/Makefile#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/audit/Makefile#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/audit/audit.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/audit/audit.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditd/Makefile#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditd/audit_warn.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditd/auditd.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditd/auditd.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditd/auditd.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditreduce/Makefile#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditreduce/auditreduce.1#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditreduce/auditreduce.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditreduce/auditreduce.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/praudit/Makefile#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/praudit/praudit.1#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/praudit/praudit.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/Makefile#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/audit.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/audit_internal.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/audit_kevents.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/audit_record.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/audit_uevents.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/libbsm.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/compat/endian.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/etc/audit_class#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/etc/audit_control#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/etc/audit_event#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/etc/audit_user#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/etc/audit_warn#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/Makefile#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/au_class.3#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/au_control.3#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/au_event.3#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/au_free_token.3#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/au_io.3#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/au_mask.3#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/au_token.3#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/au_user.3#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_audit.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_class.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_control.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_event.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_flags.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_io.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_mask.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_notify.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_token.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_user.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_wrappers.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/libbsm.3#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/Makefile#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/audit.2#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/audit.log.5#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/audit_class.5#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/audit_control.5#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/audit_event.5#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/audit_user.5#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/audit_warn.5#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/auditctl.2#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/auditon.2#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/getaudit.2#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/getauid.2#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/setaudit.2#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/setauid.2#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/tools/Makefile#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/tools/audump.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/authpf/authpf.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/mount_smbfs/getmntopts.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/smbfs/mount_smbfs/mntopts.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/smbfs/mount_smbfs/mount_smbfs.8#5 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/mount_smbfs/mount_smbfs.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-tcp.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/util/texindex.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/traceroute/traceroute.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/gssapi_locl.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd.c#16 integrate .. //depot/projects/trustedbsd/mac/etc/Makefile#46 integrate .. //depot/projects/trustedbsd/mac/etc/bluetooth/hosts#2 integrate .. //depot/projects/trustedbsd/mac/etc/bluetooth/protocols#2 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/bluetooth.device.conf#1 branch .. //depot/projects/trustedbsd/mac/etc/defaults/periodic.conf#14 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#44 integrate .. //depot/projects/trustedbsd/mac/etc/devd.conf#16 integrate .. //depot/projects/trustedbsd/mac/etc/etc.sparc64/ttys#10 integrate .. //depot/projects/trustedbsd/mac/etc/gettytab#5 integrate .. //depot/projects/trustedbsd/mac/etc/group#10 integrate .. //depot/projects/trustedbsd/mac/etc/gss/Makefile#1 branch .. //depot/projects/trustedbsd/mac/etc/gss/mech#1 branch .. //depot/projects/trustedbsd/mac/etc/gss/qop#1 branch .. //depot/projects/trustedbsd/mac/etc/inetd.conf#15 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#40 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.local.dist#27 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.root.dist#14 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.var.dist#13 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.x11-4.dist#10 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.x11.dist#3 integrate .. //depot/projects/trustedbsd/mac/etc/network.subr#10 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/daily/406.status-gmirror#1 branch .. //depot/projects/trustedbsd/mac/etc/periodic/daily/470.status-named#6 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/daily/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/etc/pf.conf#3 integrate .. //depot/projects/trustedbsd/mac/etc/portsnap.conf#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc#29 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#29 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/NETWORKING#9 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/abi#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/addswap#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/amd#11 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/auditd#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.d/bluetooth#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.d/cleanvar#10 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/cleartmp#9 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/devfs#9 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/dumpon#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ftpd#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.d/hcsecd#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/hostapd#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.d/initrandom#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ipsec#10 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ldconfig#12 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/localpkg#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/mixer#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/mountcritremote#11 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/netif#10 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/newsyslog#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ntpd#9 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ntpdate#9 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/pf#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/pflog#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/power_profile#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/rcconf.sh#5 delete .. //depot/projects/trustedbsd/mac/etc/rc.d/resolv#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/root#9 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/sdpd#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/syscons#9 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/syslogd#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/tmp#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/usbd#4 delete .. //depot/projects/trustedbsd/mac/etc/rc.firewall#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.initdiskless#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.shutdown#11 integrate .. //depot/projects/trustedbsd/mac/etc/rc.subr#21 integrate .. //depot/projects/trustedbsd/mac/etc/services#12 integrate .. //depot/projects/trustedbsd/mac/etc/snmpd.config#2 integrate .. //depot/projects/trustedbsd/mac/etc/usbd.conf#8 delete .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#39 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/limerick#7 integrate .. //depot/projects/trustedbsd/mac/games/morse/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/games/morse/morse.c#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc_int/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cvs/cvs/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/kgdb/main.c#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#7 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/grep/grep.1#11 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/mdoc.local#25 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/man/apropos/apropos.man#8 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/man/man/man.c#10 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/man/man/man.man#7 integrate .. //depot/projects/trustedbsd/mac/include/Makefile#52 integrate .. //depot/projects/trustedbsd/mac/include/dlfcn.h#7 integrate .. //depot/projects/trustedbsd/mac/include/gssapi.h#1 branch .. //depot/projects/trustedbsd/mac/include/gssapi/Makefile#1 branch .. //depot/projects/trustedbsd/mac/include/gssapi/gssapi.h#1 branch .. //depot/projects/trustedbsd/mac/include/kenv.h#2 integrate .. //depot/projects/trustedbsd/mac/include/mqueue.h#1 branch .. //depot/projects/trustedbsd/mac/include/nl_types.h#5 integrate .. //depot/projects/trustedbsd/mac/include/printf.h#1 branch .. //depot/projects/trustedbsd/mac/include/rpcsvc/yp_prot.h#4 integrate .. //depot/projects/trustedbsd/mac/include/stdio.h#14 integrate .. //depot/projects/trustedbsd/mac/include/stdlib.h#22 integrate .. //depot/projects/trustedbsd/mac/include/string.h#12 integrate .. //depot/projects/trustedbsd/mac/include/unistd.h#21 integrate .. //depot/projects/trustedbsd/mac/kerberos5/lib/libgssapi/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/kerberos5/tools/asn1_compile/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/Makefile#38 integrate .. //depot/projects/trustedbsd/mac/lib/bind/bind/config.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/bind/bind/port_after.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/bind/bind/port_before.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/bind/config.h#4 integrate .. //depot/projects/trustedbsd/mac/lib/bind/isc/isc/platform.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/bind/lwres/lwres/platform.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive.h.in#7 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_entry.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read.3#8 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_open_fd.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_tp.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_util.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/configure.ac.in#7 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/libarchive-formats.5#6 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/tar.5#5 integrate .. //depot/projects/trustedbsd/mac/lib/libbsm/Makefile#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/Makefile#20 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/Makefile.inc#23 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/__xuname.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/_pthread_stubs.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/dlfcn.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/ftw.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getcap.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getosreldate.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getosreldate.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getttyent.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/nlist.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/pwcache.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/uname.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/valloc.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/valloc.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gmon/gmon.c#12 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gmon/moncontrol.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/include/libc_private.h#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/isalnum.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/isalpha.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/isblank.3#10 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/iscntrl.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/isdigit.3#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/isgraph.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/islower.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/isprint.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/ispunct.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/isspace.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/isupper.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/isxdigit.3#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/tolower.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/toupper.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/if_indextoname.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/inet6_opt_init.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/name6.c#19 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/acl_get_entry.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/posix1e.3#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/netconfig.5#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/publickey.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpc_clnt_create.3#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpc_svc_calls.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fread.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/getc.3#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/getwc.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/local.h#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfprintf.c#22 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfscanf.c#19 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/xprintf.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/xprintf_errno.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/xprintf_float.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/xprintf_hexdump.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/xprintf_int.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/xprintf_quote.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/xprintf_str.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/xprintf_time.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/xprintf_vis.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/Makefile.inc#14 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/a64l.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/a64l.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/calloc.c#4 delete .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/grantpt.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/l64a.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/malloc.3#10 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/malloc.c#21 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/posix_memalign.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/string/memmem.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/Makefile.inc#17 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/abort2.2#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sys/aio_read.2#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/aio_write.2#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/clock_gettime.2#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/intro.2#16 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/kse.2#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/lio_listio.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/mmap.2#12 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/mq.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sys/mq_close.2#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sys/mq_getattr.2#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sys/mq_notify.2#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sys/mq_open.2#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sys/mq_receive.2#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sys/mq_send.2#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sys/mq_setattr.2#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sys/nfssvc.2#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/open.2#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/pipe.2#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/read.2#12 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/recv.2#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/rename.2#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/rmdir.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/sendfile.2#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/sigaction.2#14 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/sigqueue.2#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sys/sigreturn.2#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/sigwait.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/sigwaitinfo.2#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sys/stat.2#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/statfs.2#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/timer_create.2#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sys/timer_delete.2#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sys/timer_settime.2#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sys/undelete.2#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/utimes.2#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/wait.2#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/write.2#10 integrate .. //depot/projects/trustedbsd/mac/lib/libc/uuid/uuid.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/xdr/xdr.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/Makefile#15 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/disk.c#33 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/libdisk.3#11 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/libdisk.h#21 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/write_arm_disk.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libedit/editline.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libedit/editrc.5#6 integrate .. //depot/projects/trustedbsd/mac/lib/libedit/refresh.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libfetch/fetch.3#13 integrate .. //depot/projects/trustedbsd/mac/lib/libfetch/ftp.c#17 integrate .. //depot/projects/trustedbsd/mac/lib/libform/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/libgeom/libgeom.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libgssapi/Makefile#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/context.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/cred.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_accept_sec_context.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_accept_sec_context.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_acquire_cred.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_acquire_cred.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_add_cred.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_add_cred.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_add_oid_set_member.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_add_oid_set_member.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_canonicalize_name.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_canonicalize_name.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_compare_name.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_compare_name.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_context_time.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_context_time.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_create_empty_oid_set.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_create_empty_oid_set.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_delete_sec_context.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_delete_sec_context.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_display_name.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_display_name.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_display_status.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_display_status.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_duplicate_name.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_duplicate_name.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_export_name.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_export_name.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_export_sec_context.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_export_sec_context.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_get_mic.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_get_mic.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_import_name.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_import_name.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_import_sec_context.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_import_sec_context.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_indicate_mechs.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_indicate_mechs.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_init_sec_context.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_init_sec_context.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_inquire_context.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_inquire_context.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_inquire_cred.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_inquire_cred.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_inquire_cred_by_mech.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_inquire_cred_by_mech.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_inquire_mechs_for_name.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_inquire_mechs_for_name.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_inquire_names_for_mech.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_inquire_names_for_mech.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_krb5.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_mech_switch.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_names.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_process_context_token.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_process_context_token.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_release_buffer.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_release_buffer.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_release_cred.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_release_cred.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_release_name.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_release_name.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_release_oid_set.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_release_oid_set.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_seal.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_sign.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_test_oid_set_member.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_test_oid_set_member.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_unseal.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_unwrap.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_unwrap.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_utils.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_verify.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_verify_mic.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_verify_mic.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgssapi/gss_wrap.3#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Feb 11 13:44:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE73716A423; Sat, 11 Feb 2006 13:44:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9AF5716A420 for ; Sat, 11 Feb 2006 13:44:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 65A3743D48 for ; Sat, 11 Feb 2006 13:44:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1BDiRdu039979 for ; Sat, 11 Feb 2006 13:44:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1BDiQV1039966 for perforce@freebsd.org; Sat, 11 Feb 2006 13:44:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 11 Feb 2006 13:44:26 GMT Message-Id: <200602111344.k1BDiQV1039966@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91569 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Feb 2006 13:44:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=91569 Change 91569 by rwatson@rwatson_zoo on 2006/02/11 13:43:42 Re-merge CIPSO option parsing. Note that what we have may not be everything we need. Affected files ... .. //depot/projects/trustedbsd/mac/sys/netinet/ip_options.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_options.c#2 (text+ko) ==== @@ -354,8 +354,11 @@ case IPOPT_CIPSO: #ifdef MAC - error = mac_update_mbuf_from_cipso(m, cp, &code); - if (error) + /* + * Should we be providing the option to free the mbuf + * and not return ICMP? + */ + if (mac_update_mbuf_from_cipso(m, cp, &code) != 0) goto bad; #endif break; From owner-p4-projects@FreeBSD.ORG Sat Feb 11 14:00:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE4DC16A423; Sat, 11 Feb 2006 14:00:48 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8AADF16A422 for ; Sat, 11 Feb 2006 14:00:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2AC8443D4C for ; Sat, 11 Feb 2006 14:00:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1BE0lUq049543 for ; Sat, 11 Feb 2006 14:00:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1BE0lMh049536 for perforce@freebsd.org; Sat, 11 Feb 2006 14:00:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 11 Feb 2006 14:00:47 GMT Message-Id: <200602111400.k1BE0lMh049536@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91570 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Feb 2006 14:00:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=91570 Change 91570 by rwatson@rwatson_zoo on 2006/02/11 14:00:10 Correct integration merge mistake. Affected files ... .. //depot/projects/trustedbsd/mac/sys/i386/i386/trap.c#44 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/i386/trap.c#44 (text+ko) ==== @@ -1019,7 +1019,7 @@ error = mac_thread_syscall_enter(td, args, code); if (error == 0) #endif - error = (*callp->sy_call)(td, argp); + error = (*callp->sy_call)(td, args); #ifdef MAC mac_thread_syscall_exit(td, args, code, error); #endif From owner-p4-projects@FreeBSD.ORG Sat Feb 11 18:26:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A68916A423; Sat, 11 Feb 2006 18:26:22 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F8E016A420 for ; Sat, 11 Feb 2006 18:26:22 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D73943D48 for ; Sat, 11 Feb 2006 18:26:22 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1BIQMTW082595 for ; Sat, 11 Feb 2006 18:26:22 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1BIQLrI082592 for perforce@freebsd.org; Sat, 11 Feb 2006 18:26:21 GMT (envelope-from peter@freebsd.org) Date: Sat, 11 Feb 2006 18:26:21 GMT Message-Id: <200602111826.k1BIQLrI082592@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 91580 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Feb 2006 18:26:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=91580 Change 91580 by peter@peter_daintree on 2006/02/11 18:25:50 Try making the nmbclusters sysctl actually do something. Out of paranoia, do not allow it to reduce the current value - ie: increase only. It would probably work, but wouldn't be healthy to the network stack if we allowed it to be run into the ground. Affected files ... .. //depot/projects/hammer/sys/kern/kern_mbuf.c#15 edit Differences ... ==== //depot/projects/hammer/sys/kern/kern_mbuf.c#15 (text+ko) ==== @@ -111,9 +111,24 @@ SYSINIT(tunable_mbinit, SI_SUB_TUNABLES, SI_ORDER_ANY, tunable_mbinit, NULL); SYSCTL_DECL(_kern_ipc); -/* XXX: These should be tuneables. Can't change UMA limits on the fly. */ -SYSCTL_INT(_kern_ipc, OID_AUTO, nmbclusters, CTLFLAG_RW, &nmbclusters, 0, - "Maximum number of mbuf clusters allowed"); +static int +nmbcheck(SYSCTL_HANDLER_ARGS) +{ + int error, oldnmbclusters; + + oldnmbclusters = nmbclusters; + error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); + if (error == 0 && req->newptr) { + if (nmbclusters < oldnmbclusters) { + nmbclusters = oldnmbclusters; + return (EINVAL); + } + uma_zone_set_max(zone_clust, nmbclusters); + } + return (error); +} +SYSCTL_PROC(_kern_ipc, OID_AUTO, nmbclusters, CTLTYPE_INT|CTLFLAG_RW, + &nmbclusters, 0, nmbcheck, "IU", "Maximum number of mbuf clusters allowed"); SYSCTL_INT(_kern_ipc, OID_AUTO, nmbjumbo4, CTLFLAG_RW, &nmbjumbo4, 0, "Maximum number of mbuf 4k jumbo clusters allowed"); SYSCTL_INT(_kern_ipc, OID_AUTO, nmbjumbo9, CTLFLAG_RW, &nmbjumbo9, 0, From owner-p4-projects@FreeBSD.ORG Sat Feb 11 20:04:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D48F16A423; Sat, 11 Feb 2006 20:04:55 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4FFB316A422 for ; Sat, 11 Feb 2006 20:04:55 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4BF2043D73 for ; Sat, 11 Feb 2006 20:04:42 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1BK4gNR088069 for ; Sat, 11 Feb 2006 20:04:42 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1BK4M8S088064 for perforce@freebsd.org; Sat, 11 Feb 2006 20:04:22 GMT (envelope-from marcel@freebsd.org) Date: Sat, 11 Feb 2006 20:04:22 GMT Message-Id: <200602112004.k1BK4M8S088064@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 91585 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Feb 2006 20:04:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=91585 Change 91585 by marcel@marcel_nfs on 2006/02/11 20:03:43 IFC @91583 Affected files ... .. //depot/projects/uart/alpha/alpha/mp_machdep.c#14 integrate .. //depot/projects/uart/alpha/alpha/trap.c#8 integrate .. //depot/projects/uart/alpha/linux/linux_machdep.c#6 integrate .. //depot/projects/uart/alpha/linux/linux_proto.h#6 integrate .. //depot/projects/uart/alpha/linux/linux_syscall.h#6 integrate .. //depot/projects/uart/alpha/linux/linux_sysent.c#6 integrate .. //depot/projects/uart/alpha/linux/syscalls.master#6 integrate .. //depot/projects/uart/alpha/osf1/osf1_misc.c#9 integrate .. //depot/projects/uart/amd64/amd64/machdep.c#17 integrate .. //depot/projects/uart/amd64/amd64/mp_machdep.c#9 integrate .. //depot/projects/uart/amd64/amd64/pmap.c#26 integrate .. //depot/projects/uart/amd64/amd64/trap.c#10 integrate .. //depot/projects/uart/amd64/amd64/tsc.c#5 integrate .. //depot/projects/uart/amd64/ia32/ia32_syscall.c#8 integrate .. //depot/projects/uart/amd64/linux32/linux32_machdep.c#5 integrate .. //depot/projects/uart/arm/arm/identcpu.c#6 integrate .. //depot/projects/uart/arm/arm/trap.c#10 integrate .. //depot/projects/uart/arm/arm/undefined.c#8 integrate .. //depot/projects/uart/arm/at91/at91.c#1 branch .. //depot/projects/uart/arm/at91/at91_spi.c#1 branch .. //depot/projects/uart/arm/at91/at91_spiio.h#1 branch .. //depot/projects/uart/arm/at91/at91_spireg.h#1 branch .. //depot/projects/uart/arm/at91/at91_st.c#1 branch .. //depot/projects/uart/arm/at91/at91_streg.h#1 branch .. //depot/projects/uart/arm/at91/at91_twi.c#1 branch .. //depot/projects/uart/arm/at91/at91_twiio.h#1 branch .. //depot/projects/uart/arm/at91/at91_twireg.h#1 branch .. //depot/projects/uart/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/uart/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/uart/arm/at91/at91st.c#1 branch .. //depot/projects/uart/arm/at91/at91var.h#1 branch .. //depot/projects/uart/arm/at91/files.at91rm92#1 branch .. //depot/projects/uart/arm/at91/files.kb920x#1 branch .. //depot/projects/uart/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/uart/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/uart/arm/at91/if_ate.c#1 branch .. //depot/projects/uart/arm/at91/if_atereg.h#1 branch .. //depot/projects/uart/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/uart/arm/at91/std.at91rm92#1 branch .. //depot/projects/uart/arm/at91/std.kb920x#1 branch .. //depot/projects/uart/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/uart/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/uart/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/uart/arm/conf/KB920X#1 branch .. //depot/projects/uart/arm/conf/SKYEYE#1 branch .. //depot/projects/uart/arm/include/atomic.h#7 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321_aau.c#2 integrate .. //depot/projects/uart/bsm/audit.h#2 integrate .. //depot/projects/uart/bsm/audit_internal.h#1 branch .. //depot/projects/uart/bsm/audit_kevents.h#3 integrate .. //depot/projects/uart/bsm/audit_record.h#1 branch .. //depot/projects/uart/cam/scsi/scsi_da.c#16 integrate .. //depot/projects/uart/coda/coda_vnops.c#11 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_misc.c#11 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_proto.h#12 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_syscall.h#12 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_syscalls.c#12 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_sysent.c#12 integrate .. //depot/projects/uart/compat/freebsd32/syscalls.master#11 integrate .. //depot/projects/uart/compat/linux/linux_getcwd.c#7 integrate .. //depot/projects/uart/compat/linux/linux_stats.c#8 integrate .. //depot/projects/uart/compat/svr4/svr4_misc.c#9 integrate .. //depot/projects/uart/conf/NOTES#29 integrate .. //depot/projects/uart/conf/files#46 integrate .. //depot/projects/uart/conf/files.i386#20 integrate .. //depot/projects/uart/conf/files.pc98#18 integrate .. //depot/projects/uart/conf/files.sparc64#13 integrate .. //depot/projects/uart/conf/kern.post.mk#12 integrate .. //depot/projects/uart/conf/kmod.mk#17 integrate .. //depot/projects/uart/conf/options#23 integrate .. //depot/projects/uart/contrib/dev/ath/COPYRIGHT#3 integrate .. //depot/projects/uart/contrib/dev/ath/README#4 integrate .. //depot/projects/uart/contrib/dev/ath/ah.h#5 integrate .. //depot/projects/uart/contrib/dev/ath/ah_desc.h#3 integrate .. //depot/projects/uart/contrib/dev/ath/ah_devid.h#4 integrate .. //depot/projects/uart/contrib/dev/ath/freebsd/ah_if.m#3 integrate .. //depot/projects/uart/contrib/dev/ath/freebsd/ah_osdep.c#6 integrate .. //depot/projects/uart/contrib/dev/ath/freebsd/ah_osdep.h#5 integrate .. //depot/projects/uart/contrib/dev/ath/public/alpha-elf.hal.o.uu#1 branch .. //depot/projects/uart/contrib/dev/ath/public/alpha-elf.inc#1 branch .. //depot/projects/uart/contrib/dev/ath/public/alpha-elf.opt_ah.h#1 branch .. //depot/projects/uart/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#1 branch .. //depot/projects/uart/contrib/dev/ath/public/powerpc-be-elf.inc#1 branch .. //depot/projects/uart/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#1 branch .. //depot/projects/uart/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#1 branch .. //depot/projects/uart/contrib/dev/ath/public/sparc64-be-elf.inc#1 branch .. //depot/projects/uart/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#1 branch .. //depot/projects/uart/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/uart/contrib/dev/ath/version.h#5 integrate .. //depot/projects/uart/contrib/pf/net/if_pflog.c#6 integrate .. //depot/projects/uart/contrib/pf/net/if_pflog.h#4 integrate .. //depot/projects/uart/contrib/pf/net/pf_ioctl.c#7 integrate .. //depot/projects/uart/dev/acpi_support/acpi_asus.c#7 integrate .. //depot/projects/uart/dev/acpi_support/acpi_fujitsu.c#4 integrate .. //depot/projects/uart/dev/advansys/adv_eisa.c#7 integrate .. //depot/projects/uart/dev/advansys/adv_pci.c#11 integrate .. //depot/projects/uart/dev/amr/amr.c#13 integrate .. //depot/projects/uart/dev/amr/amr_pci.c#13 integrate .. //depot/projects/uart/dev/amr/amrvar.h#9 integrate .. //depot/projects/uart/dev/an/if_an.c#11 integrate .. //depot/projects/uart/dev/asr/asr.c#10 integrate .. //depot/projects/uart/dev/asr/i2odep.h#3 integrate .. //depot/projects/uart/dev/ata/ata-all.c#16 integrate .. //depot/projects/uart/dev/ata/ata-all.h#10 integrate .. //depot/projects/uart/dev/ata/ata-chipset.c#14 integrate .. //depot/projects/uart/dev/ata/ata-pci.c#12 integrate .. //depot/projects/uart/dev/ath/ath_rate/amrr/amrr.c#5 integrate .. //depot/projects/uart/dev/ath/ath_rate/onoe/onoe.c#5 integrate .. //depot/projects/uart/dev/ath/ath_rate/sample/sample.c#5 integrate .. //depot/projects/uart/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/uart/dev/ath/if_ath.c#20 integrate .. //depot/projects/uart/dev/ath/if_athioctl.h#9 integrate .. //depot/projects/uart/dev/ath/if_athvar.h#15 integrate .. //depot/projects/uart/dev/bge/if_bge.c#21 integrate .. //depot/projects/uart/dev/bge/if_bgereg.h#15 integrate .. //depot/projects/uart/dev/ce/if_ce.c#2 integrate .. //depot/projects/uart/dev/cs/if_csvar.h#6 integrate .. //depot/projects/uart/dev/em/if_em.c#18 integrate .. //depot/projects/uart/dev/em/if_em.h#16 integrate .. //depot/projects/uart/dev/ep/if_ep.c#13 integrate .. //depot/projects/uart/dev/ex/if_ex.c#7 integrate .. //depot/projects/uart/dev/firewire/fwcrom.c#6 integrate .. //depot/projects/uart/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/uart/dev/ipmi/ipmi.c#1 branch .. //depot/projects/uart/dev/ipmi/ipmi_pci.c#1 branch .. //depot/projects/uart/dev/ipmi/ipmi_smbios.c#1 branch .. //depot/projects/uart/dev/ipmi/ipmivars.h#1 branch .. //depot/projects/uart/dev/isp/isp.c#10 integrate .. //depot/projects/uart/dev/isp/isp_freebsd.c#11 integrate .. //depot/projects/uart/dev/isp/isp_freebsd.h#8 integrate .. //depot/projects/uart/dev/isp/isp_inline.h#7 delete .. //depot/projects/uart/dev/isp/isp_library.c#1 branch .. //depot/projects/uart/dev/isp/isp_library.h#1 branch .. //depot/projects/uart/dev/isp/isp_pci.c#10 integrate .. //depot/projects/uart/dev/isp/isp_sbus.c#8 integrate .. //depot/projects/uart/dev/isp/ispvar.h#9 integrate .. //depot/projects/uart/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/uart/dev/iwi/if_iwireg.h#4 integrate .. //depot/projects/uart/dev/le/am7990.c#1 branch .. //depot/projects/uart/dev/le/am79900.c#1 branch .. //depot/projects/uart/dev/le/am79900reg.h#1 branch .. //depot/projects/uart/dev/le/am79900var.h#1 branch .. //depot/projects/uart/dev/le/am7990reg.h#1 branch .. //depot/projects/uart/dev/le/am7990var.h#1 branch .. //depot/projects/uart/dev/le/if_le_ledma.c#1 branch .. //depot/projects/uart/dev/le/if_le_pci.c#1 branch .. //depot/projects/uart/dev/le/lance.c#1 branch .. //depot/projects/uart/dev/le/lancereg.h#1 branch .. //depot/projects/uart/dev/le/lancevar.h#1 branch .. //depot/projects/uart/dev/md/md.c#15 integrate .. //depot/projects/uart/dev/mpt/mpilib/fc_log.h#4 delete .. //depot/projects/uart/dev/mpt/mpt.c#7 integrate .. //depot/projects/uart/dev/mpt/mpt.h#5 integrate .. //depot/projects/uart/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/uart/dev/mpt/mpt_debug.c#7 integrate .. //depot/projects/uart/dev/mpt/mpt_pci.c#12 integrate .. //depot/projects/uart/dev/pccbb/pccbb.c#14 integrate .. //depot/projects/uart/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/uart/dev/pci/vga_pci.c#2 integrate .. //depot/projects/uart/dev/ral/if_ral.c#4 integrate .. //depot/projects/uart/dev/ral/if_ralreg.h#3 integrate .. //depot/projects/uart/dev/ral/if_ralvar.h#3 integrate .. //depot/projects/uart/dev/sn/if_sn.c#8 integrate .. //depot/projects/uart/dev/sound/isa/mss.c#9 integrate .. //depot/projects/uart/dev/sound/pci/csapcm.c#9 integrate .. //depot/projects/uart/dev/sound/pcm/dsp.c#11 integrate .. //depot/projects/uart/dev/sound/pcm/sound.c#8 integrate .. //depot/projects/uart/dev/sound/usb/uaudio.c#6 integrate .. //depot/projects/uart/dev/uart/uart_bus_ebus.c#12 integrate .. //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#25 integrate .. //depot/projects/uart/dev/usb/ohci.c#15 integrate .. //depot/projects/uart/dev/usb/ohci_pci.c#10 integrate .. //depot/projects/uart/dev/usb/ohcivar.h#8 integrate .. //depot/projects/uart/dev/usb/umass.c#15 integrate .. //depot/projects/uart/dev/usb/uplcom.c#12 integrate .. //depot/projects/uart/dev/usb/usb_subr.c#13 integrate .. //depot/projects/uart/dev/usb/usbdevs#17 integrate .. //depot/projects/uart/fs/devfs/devfs_vnops.c#13 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_vnops.c#13 integrate .. //depot/projects/uart/fs/nullfs/null_vfsops.c#9 integrate .. //depot/projects/uart/fs/udf/ecma167-udf.h#3 integrate .. //depot/projects/uart/fs/udf/udf_vfsops.c#12 integrate .. //depot/projects/uart/fs/udf/udf_vnops.c#13 integrate .. //depot/projects/uart/geom/concat/g_concat.c#6 integrate .. //depot/projects/uart/geom/concat/g_concat.h#3 integrate .. //depot/projects/uart/geom/eli/g_eli.c#4 integrate .. //depot/projects/uart/geom/eli/g_eli.h#2 integrate .. //depot/projects/uart/geom/eli/g_eli_crypto.c#2 integrate .. //depot/projects/uart/geom/eli/g_eli_ctl.c#3 integrate .. //depot/projects/uart/geom/eli/g_eli_key.c#2 integrate .. //depot/projects/uart/geom/eli/pkcs5v2.c#2 integrate .. //depot/projects/uart/geom/eli/pkcs5v2.h#2 integrate .. //depot/projects/uart/geom/gate/g_gate.c#6 integrate .. //depot/projects/uart/geom/gate/g_gate.h#4 integrate .. //depot/projects/uart/geom/label/g_label.c#4 integrate .. //depot/projects/uart/geom/label/g_label.h#4 integrate .. //depot/projects/uart/geom/label/g_label_iso9660.c#4 integrate .. //depot/projects/uart/geom/label/g_label_msdosfs.c#3 integrate .. //depot/projects/uart/geom/label/g_label_ufs.c#5 integrate .. //depot/projects/uart/geom/mirror/g_mirror.c#9 integrate .. //depot/projects/uart/geom/mirror/g_mirror.h#6 integrate .. //depot/projects/uart/geom/mirror/g_mirror_ctl.c#5 integrate .. //depot/projects/uart/geom/nop/g_nop.c#4 integrate .. //depot/projects/uart/geom/raid3/g_raid3.c#10 integrate .. //depot/projects/uart/geom/raid3/g_raid3.h#6 integrate .. //depot/projects/uart/geom/raid3/g_raid3_ctl.c#5 integrate .. //depot/projects/uart/geom/shsec/g_shsec.c#4 integrate .. //depot/projects/uart/geom/shsec/g_shsec.h#3 integrate .. //depot/projects/uart/geom/stripe/g_stripe.c#7 integrate .. //depot/projects/uart/geom/stripe/g_stripe.h#4 integrate .. //depot/projects/uart/geom/vinum/geom_vinum_move.c#2 integrate .. //depot/projects/uart/geom/zero/g_zero.c#4 integrate .. //depot/projects/uart/i386/conf/NOTES#15 integrate .. //depot/projects/uart/i386/conf/XBOX#2 integrate .. //depot/projects/uart/i386/i386/geode.c#4 integrate .. //depot/projects/uart/i386/i386/identcpu.c#15 integrate .. //depot/projects/uart/i386/i386/machdep.c#19 integrate .. //depot/projects/uart/i386/i386/mp_machdep.c#18 integrate .. //depot/projects/uart/i386/i386/trap.c#12 integrate .. //depot/projects/uart/i386/i386/tsc.c#6 integrate .. //depot/projects/uart/i386/ibcs2/Makefile#2 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_isc_syscall.h#4 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_isc_sysent.c#4 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_misc.c#8 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_proto.h#5 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_syscall.h#5 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_sysent.c#5 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_xenix.c#4 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_xenix.h#4 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_xenix_syscall.h#4 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_xenix_sysent.c#4 integrate .. //depot/projects/uart/i386/ibcs2/syscalls.isc#4 integrate .. //depot/projects/uart/i386/ibcs2/syscalls.master#5 integrate .. //depot/projects/uart/i386/ibcs2/syscalls.xenix#4 integrate .. //depot/projects/uart/i386/include/cserial.h#3 integrate .. //depot/projects/uart/i386/include/xbox.h#2 integrate .. //depot/projects/uart/i386/linux/linux_machdep.c#6 integrate .. //depot/projects/uart/i386/linux/linux_proto.h#6 integrate .. //depot/projects/uart/i386/linux/linux_syscall.h#6 integrate .. //depot/projects/uart/i386/linux/linux_sysent.c#6 integrate .. //depot/projects/uart/i386/linux/syscalls.master#6 integrate .. //depot/projects/uart/i386/xbox/xbox.c#2 integrate .. //depot/projects/uart/i386/xbox/xboxfb.c#3 integrate .. //depot/projects/uart/ia64/conf/SKI#5 integrate .. //depot/projects/uart/ia64/ia32/ia32_trap.c#5 integrate .. //depot/projects/uart/ia64/ia64/mca.c#4 integrate .. //depot/projects/uart/ia64/ia64/mp_machdep.c#9 integrate .. //depot/projects/uart/ia64/ia64/trap.c#14 integrate .. //depot/projects/uart/kern/init_main.c#13 integrate .. //depot/projects/uart/kern/init_sysent.c#14 integrate .. //depot/projects/uart/kern/kern_acct.c#8 integrate .. //depot/projects/uart/kern/kern_clock.c#9 integrate .. //depot/projects/uart/kern/kern_descrip.c#20 integrate .. //depot/projects/uart/kern/kern_exec.c#15 integrate .. //depot/projects/uart/kern/kern_exit.c#10 integrate .. //depot/projects/uart/kern/kern_fork.c#14 integrate .. //depot/projects/uart/kern/kern_kse.c#9 integrate .. //depot/projects/uart/kern/kern_kthread.c#4 integrate .. //depot/projects/uart/kern/kern_ktrace.c#10 integrate .. //depot/projects/uart/kern/kern_malloc.c#12 integrate .. //depot/projects/uart/kern/kern_mbuf.c#6 integrate .. //depot/projects/uart/kern/kern_proc.c#15 integrate .. //depot/projects/uart/kern/kern_prot.c#11 integrate .. //depot/projects/uart/kern/kern_resource.c#8 integrate .. //depot/projects/uart/kern/kern_rwlock.c#2 integrate .. //depot/projects/uart/kern/kern_shutdown.c#8 integrate .. //depot/projects/uart/kern/kern_sig.c#21 integrate .. //depot/projects/uart/kern/kern_synch.c#12 integrate .. //depot/projects/uart/kern/kern_tc.c#11 integrate .. //depot/projects/uart/kern/kern_thr.c#11 integrate .. //depot/projects/uart/kern/kern_thread.c#18 integrate .. //depot/projects/uart/kern/kern_umtx.c#11 integrate .. //depot/projects/uart/kern/subr_trap.c#9 integrate .. //depot/projects/uart/kern/sys_pipe.c#19 integrate .. //depot/projects/uart/kern/sys_process.c#12 integrate .. //depot/projects/uart/kern/syscalls.c#14 integrate .. //depot/projects/uart/kern/syscalls.master#14 integrate .. //depot/projects/uart/kern/tty_pts.c#2 integrate .. //depot/projects/uart/kern/tty_pty.c#9 integrate .. //depot/projects/uart/kern/uipc_usrreq.c#9 integrate .. //depot/projects/uart/kern/vfs_bio.c#20 integrate .. //depot/projects/uart/kern/vfs_cache.c#9 integrate .. //depot/projects/uart/kern/vfs_default.c#15 integrate .. //depot/projects/uart/kern/vfs_lookup.c#10 integrate .. //depot/projects/uart/kern/vfs_mount.c#17 integrate .. //depot/projects/uart/kern/vfs_subr.c#19 integrate .. //depot/projects/uart/kern/vfs_syscalls.c#18 integrate .. //depot/projects/uart/modules/Makefile#22 integrate .. //depot/projects/uart/modules/arcnet/Makefile#3 integrate .. //depot/projects/uart/modules/ce/Makefile#1 branch .. //depot/projects/uart/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/uart/modules/ipmi/Makefile#1 branch .. //depot/projects/uart/modules/le/Makefile#1 branch .. //depot/projects/uart/modules/pf/Makefile#5 integrate .. //depot/projects/uart/modules/pflog/Makefile#1 branch .. //depot/projects/uart/net/if.c#16 integrate .. //depot/projects/uart/net/if.h#10 integrate .. //depot/projects/uart/net/if_bridge.c#5 integrate .. //depot/projects/uart/net/if_ethersubr.c#14 integrate .. //depot/projects/uart/net/if_gif.c#7 integrate .. //depot/projects/uart/net/if_gif.h#6 integrate .. //depot/projects/uart/net/if_gre.c#7 integrate .. //depot/projects/uart/net/if_var.h#11 integrate .. //depot/projects/uart/net/if_vlan.c#12 integrate .. //depot/projects/uart/net/if_vlan_var.h#8 integrate .. //depot/projects/uart/net/pfil.c#6 integrate .. //depot/projects/uart/net/pfil.h#5 integrate .. //depot/projects/uart/net/radix.c#5 integrate .. //depot/projects/uart/net80211/ieee80211_output.c#15 integrate .. //depot/projects/uart/netgraph/netflow/ng_netflow.h#5 integrate .. //depot/projects/uart/netgraph/ng_eiface.c#8 integrate .. //depot/projects/uart/netgraph/ng_sppp.c#5 integrate .. //depot/projects/uart/netinet/if_ether.c#11 integrate .. //depot/projects/uart/netinet/in_gif.c#8 integrate .. //depot/projects/uart/netinet/in_pcb.c#10 integrate .. //depot/projects/uart/netinet/ip_dummynet.c#13 integrate .. //depot/projects/uart/netinet/ip_fastfwd.c#9 integrate .. //depot/projects/uart/netinet/ip_fw2.c#18 integrate .. //depot/projects/uart/netinet/ip_input.c#14 integrate .. //depot/projects/uart/netinet/ip_ipsec.c#1 branch .. //depot/projects/uart/netinet/ip_ipsec.h#1 branch .. //depot/projects/uart/netinet/ip_mroute.h#5 integrate .. //depot/projects/uart/netinet/ip_output.c#15 integrate .. //depot/projects/uart/netinet/tcp_syncache.c#13 integrate .. //depot/projects/uart/netinet6/in6.c#10 integrate .. //depot/projects/uart/netinet6/in6_gif.c#7 integrate .. //depot/projects/uart/netinet6/ip6_forward.c#8 integrate .. //depot/projects/uart/netinet6/ip6_input.c#11 integrate .. //depot/projects/uart/netinet6/ip6_output.c#12 integrate .. //depot/projects/uart/netinet6/udp6_usrreq.c#8 integrate .. //depot/projects/uart/nfsserver/nfs_serv.c#9 integrate .. //depot/projects/uart/nfsserver/nfs_srvsubs.c#7 integrate .. //depot/projects/uart/pc98/conf/NOTES#14 integrate .. //depot/projects/uart/pc98/pc98/machdep.c#5 integrate .. //depot/projects/uart/pci/agp_i810.c#8 integrate .. //depot/projects/uart/powerpc/powerpc/trap.c#8 integrate .. //depot/projects/uart/security/audit/audit.c#1 branch .. //depot/projects/uart/security/audit/audit.h#1 branch .. //depot/projects/uart/security/audit/audit_arg.c#1 branch .. //depot/projects/uart/security/audit/audit_bsm.c#1 branch .. //depot/projects/uart/security/audit/audit_bsm_klib.c#1 branch .. //depot/projects/uart/security/audit/audit_bsm_token.c#1 branch .. //depot/projects/uart/security/audit/audit_pipe.c#1 branch .. //depot/projects/uart/security/audit/audit_private.h#1 branch .. //depot/projects/uart/security/audit/audit_syscalls.c#1 branch .. //depot/projects/uart/security/audit/audit_trigger.c#1 branch .. //depot/projects/uart/sparc64/conf/GENERIC#16 integrate .. //depot/projects/uart/sparc64/sbus/dma_sbus.c#4 integrate .. //depot/projects/uart/sparc64/sbus/lsi64854.c#4 integrate .. //depot/projects/uart/sparc64/sbus/lsi64854var.h#3 integrate .. //depot/projects/uart/sparc64/sparc64/mp_machdep.c#7 integrate .. //depot/projects/uart/sparc64/sparc64/tick.c#7 integrate .. //depot/projects/uart/sparc64/sparc64/trap.c#8 integrate .. //depot/projects/uart/sys/_rwlock.h#2 integrate .. //depot/projects/uart/sys/imgact.h#5 integrate .. //depot/projects/uart/sys/ipmi.h#1 branch .. //depot/projects/uart/sys/mbuf.h#10 integrate .. //depot/projects/uart/sys/mount.h#13 integrate .. //depot/projects/uart/sys/namei.h#7 integrate .. //depot/projects/uart/sys/pcpu.h#5 integrate .. //depot/projects/uart/sys/proc.h#17 integrate .. //depot/projects/uart/sys/ptrace.h#7 integrate .. //depot/projects/uart/sys/rwlock.h#2 integrate .. //depot/projects/uart/sys/sockio.h#4 integrate .. //depot/projects/uart/sys/syscall.h#13 integrate .. //depot/projects/uart/sys/syscall.mk#13 integrate .. //depot/projects/uart/sys/syscallsubr.h#9 integrate .. //depot/projects/uart/sys/sysproto.h#13 integrate .. //depot/projects/uart/sys/systm.h#15 integrate .. //depot/projects/uart/sys/thr.h#5 integrate .. //depot/projects/uart/sys/vnode.h#15 integrate .. //depot/projects/uart/tools/fw_stub.awk#2 integrate .. //depot/projects/uart/ufs/ufs/ufs_extattr.c#10 integrate .. //depot/projects/uart/vm/redzone.c#1 branch .. //depot/projects/uart/vm/redzone.h#1 branch .. //depot/projects/uart/vm/uma_core.c#21 integrate .. //depot/projects/uart/vm/vm_contig.c#14 integrate .. //depot/projects/uart/vm/vm_fault.c#13 integrate .. //depot/projects/uart/vm/vm_object.c#19 integrate .. //depot/projects/uart/vm/vm_page.c#17 integrate .. //depot/projects/uart/vm/vm_pageout.c#18 integrate .. //depot/projects/uart/vm/vnode_pager.c#17 integrate Differences ... ==== //depot/projects/uart/alpha/alpha/mp_machdep.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.57 2005/11/03 21:08:19 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.58 2006/02/07 21:22:01 phk Exp $"); #include "opt_kstack_pages.h" @@ -225,7 +225,7 @@ spinlock_exit(); KASSERT(curthread->td_md.md_spinlock_count == 1, ("invalid count")); - binuptime(PCPU_PTR(switchtime)); + PCPU_SET(switchtime, cpu_ticks()); PCPU_SET(switchticks, ticks); cpu_throw(NULL, choosethread()); /* doesn't return */ ==== //depot/projects/uart/alpha/alpha/trap.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.127 2005/12/06 11:19:36 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.128 2006/02/08 08:09:14 phk Exp $"); /* #include "opt_fix_unaligned_vax_fp.h" */ #include "opt_ddb.h" @@ -259,7 +259,6 @@ register struct proc *p; register int i; u_int64_t ucode; - u_int sticks; int user; #ifdef SMP register_t s; @@ -302,12 +301,11 @@ CTR5(KTR_TRAP, "%s trap: pid %d, (%lx, %lx, %lx)", user ? "user" : "kernel", p->p_pid, a0, a1, a2); if (user) { - sticks = td->td_sticks; + td->td_pticks = 0; td->td_frame = framep; if (td->td_ucred != p->p_ucred) cred_update_thread(td); } else { - sticks = 0; /* XXX bogus -Wuninitialized warning */ KASSERT(cold || td->td_ucred != NULL, ("kernel trap doesn't have ucred")); } @@ -595,7 +593,7 @@ out: if (user) { framep->tf_regs[FRAME_SP] = alpha_pal_rdusp(); - userret(td, framep, sticks); + userret(td, framep); mtx_assert(&Giant, MA_NOTOWNED); } return; @@ -632,7 +630,6 @@ struct proc *p; int error = 0; u_int64_t opc; - u_int sticks; u_int64_t args[10]; /* XXX */ u_int hidden = 0, nargs; #ifdef SMP @@ -664,7 +661,7 @@ PCPU_LAZY_INC(cnt.v_syscall); td->td_frame = framep; opc = framep->tf_regs[FRAME_PC] - 4; - sticks = td->td_sticks; + td->td_pticks = 0; if (td->td_ucred != p->p_ucred) cred_update_thread(td); if (p->p_flag & P_SA) @@ -773,7 +770,7 @@ if ((callp->sy_narg & SYF_MPSAFE) == 0) mtx_unlock(&Giant); - userret(td, framep, sticks); + userret(td, framep); #ifdef KTRACE if (KTRPOINT(td, KTR_SYSRET)) ==== //depot/projects/uart/alpha/linux/linux_machdep.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.36 2005/02/18 18:32:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.37 2006/02/06 22:06:52 jhb Exp $"); #include #include @@ -81,7 +81,6 @@ free(path, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); - exec_free_args(&eargs); return (error); } ==== //depot/projects/uart/alpha/linux/linux_proto.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.23 2005/07/13 20:35:07 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.64 2005/07/13 20:32:41 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.24 2006/02/06 01:16:00 rwatson Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/uart/alpha/linux/linux_syscall.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.21 2005/07/13 20:35:07 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.64 2005/07/13 20:32:41 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.22 2006/02/06 01:16:00 rwatson Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/uart/alpha/linux/linux_sysent.c#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.21 2005/07/13 20:35:07 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.64 2005/07/13 20:32:41 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.22 2006/02/06 01:16:00 rwatson Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp */ #include @@ -21,156 +21,156 @@ struct sysent linux_sysent[] = { #define nosys linux_nosys { 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_NULL }, /* 1 = exit */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_NULL }, /* 2 = linux_fork */ - { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ - { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ + { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_FORK }, /* 2 = linux_fork */ + { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_READ }, /* 3 = read */ + { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_WRITE }, /* 4 = write */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 5 = */ - { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_NULL }, /* 6 = close */ - { SYF_MPSAFE | AS(osf1_wait4_args), (sy_call_t *)osf1_wait4, AUE_NULL }, /* 7 = osf1_wait4 */ + { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ + { SYF_MPSAFE | AS(osf1_wait4_args), (sy_call_t *)osf1_wait4, AUE_WAIT4 }, /* 7 = osf1_wait4 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 8 = */ - { SYF_MPSAFE | AS(linux_link_args), (sy_call_t *)linux_link, AUE_NULL }, /* 9 = linux_link */ - { SYF_MPSAFE | AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_NULL }, /* 10 = linux_unlink */ + { SYF_MPSAFE | AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK }, /* 9 = linux_link */ + { SYF_MPSAFE | AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK }, /* 10 = linux_unlink */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 11 = */ - { SYF_MPSAFE | AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_NULL }, /* 12 = linux_chdir */ - { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_NULL }, /* 13 = fchdir */ - { SYF_MPSAFE | AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_NULL }, /* 14 = linux_mknod */ - { SYF_MPSAFE | AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_NULL }, /* 15 = linux_chmod */ - { SYF_MPSAFE | AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_NULL }, /* 16 = linux_chown */ + { SYF_MPSAFE | AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR }, /* 12 = linux_chdir */ + { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR }, /* 13 = fchdir */ + { SYF_MPSAFE | AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD }, /* 14 = linux_mknod */ + { SYF_MPSAFE | AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD }, /* 15 = linux_chmod */ + { SYF_MPSAFE | AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN }, /* 16 = linux_chown */ { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 17 = linux_brk */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 18 = */ - { SYF_MPSAFE | AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_NULL }, /* 19 = linux_lseek */ - { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_NULL }, /* 20 = getpid */ + { SYF_MPSAFE | AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK }, /* 19 = linux_lseek */ + { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_GETPID }, /* 20 = getpid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 21 = osf1_mount */ - { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_NULL }, /* 22 = linux_umount */ - { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_NULL }, /* 23 = setuid */ - { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_NULL }, /* 24 = getuid */ + { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UNMOUNT }, /* 22 = linux_umount */ + { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 23 = setuid */ + { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_GETUID }, /* 24 = getuid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 25 = */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_ptrace, AUE_NULL }, /* 26 = linux_ptrace */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_ptrace, AUE_PTRACE }, /* 26 = linux_ptrace */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 27 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 28 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 29 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 30 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 31 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 32 = */ - { SYF_MPSAFE | AS(linux_access_args), (sy_call_t *)linux_access, AUE_NULL }, /* 33 = linux_access */ + { SYF_MPSAFE | AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS }, /* 33 = linux_access */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 34 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 35 = */ - { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_NULL }, /* 36 = sync */ - { SYF_MPSAFE | AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_NULL }, /* 37 = linux_kill */ + { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_SYNC }, /* 36 = sync */ + { SYF_MPSAFE | AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL }, /* 37 = linux_kill */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 38 = */ - { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_NULL }, /* 39 = setpgid */ + { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 39 = setpgid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 40 = */ - { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_NULL }, /* 41 = dup */ - { SYF_MPSAFE | 0, (sy_call_t *)pipe, AUE_NULL }, /* 42 = pipe */ + { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_DUP }, /* 41 = dup */ + { SYF_MPSAFE | 0, (sy_call_t *)pipe, AUE_PIPE }, /* 42 = pipe */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 43 = osf_set_program_attributes */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 44 = */ - { SYF_MPSAFE | AS(linux_open_args), (sy_call_t *)linux_open, AUE_NULL }, /* 45 = linux_open */ + { SYF_MPSAFE | AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC }, /* 45 = linux_open */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 46 = */ - { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_NULL }, /* 47 = getgid */ - { SYF_MPSAFE | AS(osf1_sigprocmask_args), (sy_call_t *)osf1_sigprocmask, AUE_NULL }, /* 48 = osf1_sigprocmask */ + { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_GETGID }, /* 47 = getgid */ + { SYF_MPSAFE | AS(osf1_sigprocmask_args), (sy_call_t *)osf1_sigprocmask, AUE_SIGPROCMASK }, /* 48 = osf1_sigprocmask */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 49 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 50 = */ - { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_NULL }, /* 51 = acct */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_sigpending, AUE_NULL }, /* 52 = linux_sigpending */ + { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_sigpending, AUE_SIGPENDING }, /* 52 = linux_sigpending */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 53 = */ - { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_NULL }, /* 54 = linux_ioctl */ + { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL }, /* 54 = linux_ioctl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 55 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = */ - { SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_NULL }, /* 57 = linux_symlink */ - { SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_NULL }, /* 58 = linux_readlink */ - { SYF_MPSAFE | AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_NULL }, /* 59 = linux_execve */ - { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_NULL }, /* 60 = umask */ - { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_NULL }, /* 61 = chroot */ + { SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK }, /* 57 = linux_symlink */ + { SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK }, /* 58 = linux_readlink */ + { SYF_MPSAFE | AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE }, /* 59 = linux_execve */ + { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ + { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 62 = */ - { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_NULL }, /* 63 = getpgrp */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getpagesize, AUE_NULL }, /* 64 = linux_getpagesize */ + { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 63 = getpgrp */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getpagesize, AUE_O_GETPAGESIZE }, /* 64 = linux_getpagesize */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 65 = */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_vfork, AUE_NULL }, /* 66 = linux_vfork */ - { SYF_MPSAFE | AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_NULL }, /* 67 = linux_newstat */ - { SYF_MPSAFE | AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_NULL }, /* 68 = linux_newlstat */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_vfork, AUE_VFORK }, /* 66 = linux_vfork */ + { SYF_MPSAFE | AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT }, /* 67 = linux_newstat */ + { SYF_MPSAFE | AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT }, /* 68 = linux_newlstat */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 69 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 70 = */ - { SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_NULL }, /* 71 = linux_mmap */ + { SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP }, /* 71 = linux_mmap */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 72 = */ - { SYF_MPSAFE | AS(linux_munmap_args), (sy_call_t *)linux_munmap, AUE_NULL }, /* 73 = linux_munmap */ - { SYF_MPSAFE | AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_NULL }, /* 74 = linux_mprotect */ - { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_NULL }, /* 75 = madvise */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_vhangup, AUE_NULL }, /* 76 = linux_vhangup */ + { SYF_MPSAFE | AS(linux_munmap_args), (sy_call_t *)linux_munmap, AUE_MUNMAP }, /* 73 = linux_munmap */ + { SYF_MPSAFE | AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT }, /* 74 = linux_mprotect */ + { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 75 = madvise */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_vhangup, AUE_O_VHANGUP }, /* 76 = linux_vhangup */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 77 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 78 = */ - { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_NULL }, /* 79 = linux_setgroups */ - { SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_NULL }, /* 80 = linux_getgroups */ + { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS }, /* 79 = linux_setgroups */ + { SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS }, /* 80 = linux_getgroups */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 81 = */ { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_NULL }, /* 82 = setpgid */ - { SYF_MPSAFE | AS(osf1_setitimer_args), (sy_call_t *)osf1_setitimer, AUE_NULL }, /* 83 = osf1_setitimer */ + { SYF_MPSAFE | AS(osf1_setitimer_args), (sy_call_t *)osf1_setitimer, AUE_SETITIMER }, /* 83 = osf1_setitimer */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 84 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 85 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 86 = osf_getitimer */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_gethostname, AUE_NULL }, /* 87 = linux_gethostname */ - { SYF_MPSAFE | AS(sethostname_args), (sy_call_t *)osethostname, AUE_NULL }, /* 88 = osethostname */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getdtablesize, AUE_NULL }, /* 89 = linux_getdtablesize */ - { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_NULL }, /* 90 = dup2 */ - { SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_NULL }, /* 91 = linux_newfstat */ - { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_NULL }, /* 92 = linux_fcntl */ - { SYF_MPSAFE | AS(osf1_select_args), (sy_call_t *)osf1_select, AUE_NULL }, /* 93 = osf1_select */ - { SYF_MPSAFE | AS(poll_args), (sy_call_t *)poll, AUE_NULL }, /* 94 = poll */ - { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_NULL }, /* 95 = fsync */ - { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_NULL }, /* 96 = setpriority */ - { SYF_MPSAFE | AS(osf1_socket_args), (sy_call_t *)osf1_socket, AUE_NULL }, /* 97 = osf1_socket */ - { SYF_MPSAFE | AS(linux_connect_args), (sy_call_t *)linux_connect, AUE_NULL }, /* 98 = linux_connect */ - { SYF_MPSAFE | AS(accept_args), (sy_call_t *)oaccept, AUE_NULL }, /* 99 = accept */ - { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_NULL }, /* 100 = linux_getpriority */ - { SYF_MPSAFE | AS(osend_args), (sy_call_t *)osend, AUE_NULL }, /* 101 = osend */ - { SYF_MPSAFE | AS(orecv_args), (sy_call_t *)orecv, AUE_NULL }, /* 102 = orecv */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_gethostname, AUE_SYSCTL }, /* 87 = linux_gethostname */ + { SYF_MPSAFE | AS(sethostname_args), (sy_call_t *)osethostname, AUE_SYSCTL }, /* 88 = osethostname */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getdtablesize, AUE_GETDTABLESIZE }, /* 89 = linux_getdtablesize */ + { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 90 = dup2 */ + { SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT }, /* 91 = linux_newfstat */ + { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL }, /* 92 = linux_fcntl */ + { SYF_MPSAFE | AS(osf1_select_args), (sy_call_t *)osf1_select, AUE_SELECT }, /* 93 = osf1_select */ + { SYF_MPSAFE | AS(poll_args), (sy_call_t *)poll, AUE_POLL }, /* 94 = poll */ + { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 95 = fsync */ + { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 96 = setpriority */ + { SYF_MPSAFE | AS(osf1_socket_args), (sy_call_t *)osf1_socket, AUE_SOCKET }, /* 97 = osf1_socket */ + { SYF_MPSAFE | AS(linux_connect_args), (sy_call_t *)linux_connect, AUE_CONNECT }, /* 98 = linux_connect */ + { SYF_MPSAFE | AS(accept_args), (sy_call_t *)oaccept, AUE_ACCEPT }, /* 99 = accept */ + { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY }, /* 100 = linux_getpriority */ + { SYF_MPSAFE | AS(osend_args), (sy_call_t *)osend, AUE_SEND }, /* 101 = osend */ + { SYF_MPSAFE | AS(orecv_args), (sy_call_t *)orecv, AUE_RECV }, /* 102 = orecv */ { SYF_MPSAFE | AS(osf1_sigreturn_args), (sy_call_t *)osf1_sigreturn, AUE_NULL }, /* 103 = osf1_sigreturn */ - { SYF_MPSAFE | AS(bind_args), (sy_call_t *)bind, AUE_NULL }, /* 104 = bind */ - { SYF_MPSAFE | AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_NULL }, /* 105 = setsockopt */ - { SYF_MPSAFE | AS(listen_args), (sy_call_t *)listen, AUE_NULL }, /* 106 = listen */ + { SYF_MPSAFE | AS(bind_args), (sy_call_t *)bind, AUE_BIND }, /* 104 = bind */ + { SYF_MPSAFE | AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT }, /* 105 = setsockopt */ + { SYF_MPSAFE | AS(listen_args), (sy_call_t *)listen, AUE_LISTEN }, /* 106 = listen */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 107 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 108 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 109 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 110 = */ { SYF_MPSAFE | AS(osf1_sigsuspend_args), (sy_call_t *)osf1_sigsuspend, AUE_NULL }, /* 111 = osf1_sigsuspend */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 112 = osf_sigstack */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_recvmsg, AUE_NULL }, /* 113 = linux_recvmsg */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_sendmsg, AUE_NULL }, /* 114 = linux_sendmsg */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_recvmsg, AUE_RECVMSG }, /* 113 = linux_recvmsg */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_sendmsg, AUE_SENDMSG }, /* 114 = linux_sendmsg */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 115 = */ { SYF_MPSAFE | AS(osf1_gettimeofday_args), (sy_call_t *)osf1_gettimeofday, AUE_NULL }, /* 116 = osf1_gettimeofday */ - { SYF_MPSAFE | AS(osf1_getrusage_args), (sy_call_t *)osf1_getrusage, AUE_NULL }, /* 117 = osf1_getrusage */ - { SYF_MPSAFE | AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_NULL }, /* 118 = getsockopt */ + { SYF_MPSAFE | AS(osf1_getrusage_args), (sy_call_t *)osf1_getrusage, AUE_GETRUSAGE }, /* 117 = osf1_getrusage */ + { SYF_MPSAFE | AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_GETSOCKOPT }, /* 118 = getsockopt */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 119 = */ - { SYF_MPSAFE | AS(readv_args), (sy_call_t *)readv, AUE_NULL }, /* 120 = readv */ - { SYF_MPSAFE | AS(writev_args), (sy_call_t *)writev, AUE_NULL }, /* 121 = writev */ + { SYF_MPSAFE | AS(readv_args), (sy_call_t *)readv, AUE_READV }, /* 120 = readv */ + { SYF_MPSAFE | AS(writev_args), (sy_call_t *)writev, AUE_WRITEV }, /* 121 = writev */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 122 = osf_settimeofday */ - { SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 123 = fchown */ - { SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_NULL }, /* 124 = fchmod */ - { SYF_MPSAFE | AS(recvfrom_args), (sy_call_t *)orecvfrom, AUE_NULL }, /* 125 = recvfrom */ - { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_NULL }, /* 126 = setreuid */ - { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_NULL }, /* 127 = setregid */ - { SYF_MPSAFE | AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_NULL }, /* 128 = linux_rename */ - { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_NULL }, /* 129 = linux_truncate */ - { SYF_MPSAFE | AS(oftruncate_args), (sy_call_t *)oftruncate, AUE_NULL }, /* 130 = oftruncate */ - { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_NULL }, /* 131 = flock */ - { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_NULL }, /* 132 = setgid */ - { SYF_MPSAFE | AS(osf1_sendto_args), (sy_call_t *)osf1_sendto, AUE_NULL }, /* 133 = osf1_sendto */ - { SYF_MPSAFE | AS(shutdown_args), (sy_call_t *)shutdown, AUE_NULL }, /* 134 = shutdown */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_socketpair, AUE_NULL }, /* 135 = linux_socketpair */ - { SYF_MPSAFE | AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_NULL }, /* 136 = linux_mkdir */ - { SYF_MPSAFE | AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_NULL }, /* 137 = linux_rmdir */ - { SYF_MPSAFE | AS(utimes_args), (sy_call_t *)utimes, AUE_NULL }, /* 138 = utimes */ + { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 123 = fchown */ + { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 124 = fchmod */ + { AS(recvfrom_args), (sy_call_t *)orecvfrom, AUE_RECVFROM }, /* 125 = recvfrom */ + { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 126 = setreuid */ + { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 127 = setregid */ + { SYF_MPSAFE | AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME }, /* 128 = linux_rename */ + { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 129 = linux_truncate */ + { SYF_MPSAFE | AS(oftruncate_args), (sy_call_t *)oftruncate, AUE_FTRUNCATE }, /* 130 = oftruncate */ + { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 131 = flock */ + { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID }, /* 132 = setgid */ + { SYF_MPSAFE | AS(osf1_sendto_args), (sy_call_t *)osf1_sendto, AUE_SENDTO }, /* 133 = osf1_sendto */ + { SYF_MPSAFE | AS(shutdown_args), (sy_call_t *)shutdown, AUE_SHUTDOWN }, /* 134 = shutdown */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_socketpair, AUE_SOCKETPAIR }, /* 135 = linux_socketpair */ + { SYF_MPSAFE | AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR }, /* 136 = linux_mkdir */ + { SYF_MPSAFE | AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR }, /* 137 = linux_rmdir */ + { SYF_MPSAFE | AS(utimes_args), (sy_call_t *)utimes, AUE_UTIMES }, /* 138 = utimes */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 139 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 140 = */ - { SYF_MPSAFE | AS(ogetpeername_args), (sy_call_t *)ogetpeername, AUE_NULL }, /* 141 = ogetpeername */ + { SYF_MPSAFE | AS(ogetpeername_args), (sy_call_t *)ogetpeername, AUE_GETPEERNAME }, /* 141 = ogetpeername */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 142 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 143 = */ - { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_NULL }, /* 144 = linux_getrlimit */ - { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_NULL }, /* 145 = linux_setrlimit */ + { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT }, /* 144 = linux_getrlimit */ + { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT }, /* 145 = linux_setrlimit */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 146 = */ - { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_NULL }, /* 147 = setsid */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_quotactl, AUE_NULL }, /* 148 = linux_quotactl */ + { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_SETSID }, /* 147 = setsid */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL }, /* 148 = linux_quotactl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 149 = */ - { SYF_MPSAFE | AS(getsockname_args), (sy_call_t *)ogetsockname, AUE_NULL }, /* 150 = getsockname */ + { SYF_MPSAFE | AS(getsockname_args), (sy_call_t *)ogetsockname, AUE_GETSOCKNAME }, /* 150 = getsockname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 151 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 152 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 153 = */ @@ -186,7 +186,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 163 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 164 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 165 = osf_getdomainname */ - { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_NULL }, /* 166 = setdomainname */ + { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL }, /* 166 = setdomainname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 167 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 168 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 169 = */ @@ -220,24 +220,24 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 197 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 198 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 199 = osf_swapon */ - { SYF_MPSAFE | AS(linux_msgctl_args), (sy_call_t *)linux_msgctl, AUE_NULL }, /* 200 = linux_msgctl */ - { SYF_MPSAFE | AS(linux_msgget_args), (sy_call_t *)linux_msgget, AUE_NULL }, /* 201 = linux_msgget */ - { SYF_MPSAFE | AS(linux_msgrcv_args), (sy_call_t *)linux_msgrcv, AUE_NULL }, /* 202 = linux_msgrcv */ - { SYF_MPSAFE | AS(linux_msgsnd_args), (sy_call_t *)linux_msgsnd, AUE_NULL }, /* 203 = linux_msgsnd */ - { AS(linux_semctl_args), (sy_call_t *)linux_semctl, AUE_NULL }, /* 204 = linux_semctl */ - { SYF_MPSAFE | AS(linux_semget_args), (sy_call_t *)linux_semget, AUE_NULL }, /* 205 = linux_semget */ - { SYF_MPSAFE | AS(linux_semop_args), (sy_call_t *)linux_semop, AUE_NULL }, /* 206 = linux_semop */ + { SYF_MPSAFE | AS(linux_msgctl_args), (sy_call_t *)linux_msgctl, AUE_MSGCTL }, /* 200 = linux_msgctl */ + { SYF_MPSAFE | AS(linux_msgget_args), (sy_call_t *)linux_msgget, AUE_MSGGET }, /* 201 = linux_msgget */ + { SYF_MPSAFE | AS(linux_msgrcv_args), (sy_call_t *)linux_msgrcv, AUE_MSGRCV }, /* 202 = linux_msgrcv */ + { SYF_MPSAFE | AS(linux_msgsnd_args), (sy_call_t *)linux_msgsnd, AUE_MSGSND }, /* 203 = linux_msgsnd */ + { AS(linux_semctl_args), (sy_call_t *)linux_semctl, AUE_SEMCTL }, /* 204 = linux_semctl */ + { SYF_MPSAFE | AS(linux_semget_args), (sy_call_t *)linux_semget, AUE_SEMGET }, /* 205 = linux_semget */ + { SYF_MPSAFE | AS(linux_semop_args), (sy_call_t *)linux_semop, AUE_SEMOP }, /* 206 = linux_semop */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 207 = osf_utsname */ - { SYF_MPSAFE | AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_NULL }, /* 208 = linux_lchown */ - { SYF_MPSAFE | AS(linux_shmat_args), (sy_call_t *)linux_shmat, AUE_NULL }, /* 209 = linux_shmat */ - { SYF_MPSAFE | AS(linux_shmctl_args), (sy_call_t *)linux_shmctl, AUE_NULL }, /* 210 = linux_shmctl */ - { SYF_MPSAFE | AS(linux_shmdt_args), (sy_call_t *)linux_shmdt, AUE_NULL }, /* 211 = linux_shmdt */ - { SYF_MPSAFE | AS(linux_shmget_args), (sy_call_t *)linux_shmget, AUE_NULL }, /* 212 = linux_shmget */ + { SYF_MPSAFE | AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN }, /* 208 = linux_lchown */ + { SYF_MPSAFE | AS(linux_shmat_args), (sy_call_t *)linux_shmat, AUE_SHMAT }, /* 209 = linux_shmat */ + { SYF_MPSAFE | AS(linux_shmctl_args), (sy_call_t *)linux_shmctl, AUE_SHMCTL }, /* 210 = linux_shmctl */ + { SYF_MPSAFE | AS(linux_shmdt_args), (sy_call_t *)linux_shmdt, AUE_SHMDT }, /* 211 = linux_shmdt */ + { SYF_MPSAFE | AS(linux_shmget_args), (sy_call_t *)linux_shmget, AUE_SHMGET }, /* 212 = linux_shmget */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 213 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 214 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 215 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 216 = */ - { SYF_MPSAFE | AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_NULL }, /* 217 = linux_msync */ + { SYF_MPSAFE | AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC }, /* 217 = linux_msync */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 218 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 219 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 220 = */ @@ -253,8 +253,8 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 230 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 231 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 232 = */ - { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_NULL }, /* 233 = getpgid */ - { SYF_MPSAFE | AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_NULL }, /* 234 = linux_getsid */ + { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPPID }, /* 233 = getpgid */ + { SYF_MPSAFE | AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID }, /* 234 = linux_getsid */ { SYF_MPSAFE | 0, (sy_call_t *)linux_sigaltstack, AUE_NULL }, /* 235 = linux_sigaltstack */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 236 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 237 = */ @@ -320,57 +320,57 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 297 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 298 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 299 = */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_bdflush, AUE_NULL }, /* 300 = linux_bdflush */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH }, /* 300 = linux_bdflush */ { SYF_MPSAFE | 0, (sy_call_t *)linux_sethae, AUE_NULL }, /* 301 = linux_sethae */ - { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_NULL }, /* 302 = linux_mount */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_old_adjtimex, AUE_NULL }, /* 303 = linux_old_adjtimex */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_swapoff, AUE_NULL }, /* 304 = linux_swapoff */ - { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_NULL }, /* 305 = linux_getdents */ + { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT }, /* 302 = linux_mount */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_old_adjtimex, AUE_ADJTIME }, /* 303 = linux_old_adjtimex */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF }, /* 304 = linux_swapoff */ + { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS }, /* 305 = linux_getdents */ { SYF_MPSAFE | 0, (sy_call_t *)linux_create_module, AUE_NULL }, /* 306 = linux_create_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_init_module, AUE_NULL }, /* 307 = linux_init_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_delete_module, AUE_NULL }, /* 308 = linux_delete_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL }, /* 309 = linux_get_kernel_syms */ { SYF_MPSAFE | AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL }, /* 310 = linux_syslog */ - { SYF_MPSAFE | AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_NULL }, /* 311 = linux_reboot */ - { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_NULL }, /* 312 = linux_clone */ - { AS(linux_uselib_args), (sy_call_t *)linux_uselib, AUE_NULL }, /* 313 = linux_uselib */ - { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_NULL }, /* 314 = mlock */ - { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_NULL }, /* 315 = munlock */ - { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_NULL }, /* 316 = mlockall */ - { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_NULL }, /* 317 = munlockall */ + { SYF_MPSAFE | AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT }, /* 311 = linux_reboot */ + { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK }, /* 312 = linux_clone */ + { AS(linux_uselib_args), (sy_call_t *)linux_uselib, AUE_USELIB }, /* 313 = linux_uselib */ + { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK }, /* 314 = mlock */ + { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK }, /* 315 = munlock */ + { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL }, /* 316 = mlockall */ + { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL }, /* 317 = munlockall */ { SYF_MPSAFE | 0, (sy_call_t *)linux_sysinfo, AUE_NULL }, /* 318 = linux_sysinfo */ - { SYF_MPSAFE | AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_NULL }, /* 319 = linux_sysctl */ + { SYF_MPSAFE | AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL }, /* 319 = linux_sysctl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 320 = sys_idle */ - { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_NULL }, /* 321 = linux_oldumount */ - { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_NULL }, /* 322 = swapon */ + { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT }, /* 321 = linux_oldumount */ + { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 322 = swapon */ { SYF_MPSAFE | AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 323 = linux_times */ - { SYF_MPSAFE | AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_NULL }, /* 324 = linux_personality */ - { SYF_MPSAFE | AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_NULL }, /* 325 = linux_setfsuid */ - { SYF_MPSAFE | AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_NULL }, /* 326 = linux_setfsgid */ + { SYF_MPSAFE | AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY }, /* 324 = linux_personality */ + { SYF_MPSAFE | AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID }, /* 325 = linux_setfsuid */ + { SYF_MPSAFE | AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID }, /* 326 = linux_setfsgid */ { SYF_MPSAFE | AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL }, /* 327 = linux_ustat */ - { SYF_MPSAFE | AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_NULL }, /* 328 = linux_statfs */ - { SYF_MPSAFE | AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_NULL }, /* 329 = linux_fstatfs */ - { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL }, /* 330 = sched_setparam */ - { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL }, /* 331 = sched_getparam */ - { SYF_MPSAFE | AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_NULL }, /* 332 = linux_sched_setscheduler */ - { SYF_MPSAFE | AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_NULL }, /* 333 = linux_sched_getscheduler */ + { SYF_MPSAFE | AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS }, /* 328 = linux_statfs */ + { SYF_MPSAFE | AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS }, /* 329 = linux_fstatfs */ + { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM }, /* 330 = sched_setparam */ + { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM }, /* 331 = sched_getparam */ + { SYF_MPSAFE | AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER }, /* 332 = linux_sched_setscheduler */ + { SYF_MPSAFE | AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER }, /* 333 = linux_sched_getscheduler */ { SYF_MPSAFE | 0, (sy_call_t *)sched_yield, AUE_NULL }, /* 334 = sched_yield */ - { SYF_MPSAFE | AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_NULL }, /* 335 = linux_sched_get_priority_max */ - { SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_NULL }, /* 336 = linux_sched_get_priority_min */ - { SYF_MPSAFE | AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_NULL }, /* 337 = sched_rr_get_interval */ + { SYF_MPSAFE | AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX }, /* 335 = linux_sched_get_priority_max */ + { SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN }, /* 336 = linux_sched_get_priority_min */ + { SYF_MPSAFE | AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL }, /* 337 = sched_rr_get_interval */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 338 = sys_afs_syscall */ { SYF_MPSAFE | AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL }, /* 339 = linux_newuname */ { SYF_MPSAFE | AS(nanosleep_args), (sy_call_t *)nanosleep, AUE_NULL }, /* 340 = nanosleep */ { SYF_MPSAFE | AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL }, /* 341 = linux_mremap */ { SYF_MPSAFE | 0, (sy_call_t *)linux_nfsservctl, AUE_NULL }, /* 342 = linux_nfsservctl */ - { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_NULL }, /* 343 = setresuid */ - { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_NULL }, /* 344 = getresuid */ + { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID }, /* 343 = setresuid */ + { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID }, /* 344 = getresuid */ { SYF_MPSAFE | 0, (sy_call_t *)linux_pciconfig_read, AUE_NULL }, /* 345 = linux_pciconfig_read */ { SYF_MPSAFE | 0, (sy_call_t *)linux_pciconfig_write, AUE_NULL }, /* 346 = linux_pciconfig_write */ { SYF_MPSAFE | 0, (sy_call_t *)linux_query_module, AUE_NULL }, /* 347 = linux_query_module */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_prctl, AUE_NULL }, /* 348 = linux_prctl */ - { SYF_MPSAFE | AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_NULL }, /* 349 = linux_pread */ - { SYF_MPSAFE | AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_NULL }, /* 350 = linux_pwrite */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_prctl, AUE_PRCTL }, /* 348 = linux_prctl */ + { SYF_MPSAFE | AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD }, /* 349 = linux_pread */ + { SYF_MPSAFE | AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE }, /* 350 = linux_pwrite */ { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigreturn, AUE_NULL }, /* 351 = linux_rt_sigreturn */ { SYF_MPSAFE | AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL }, /* 352 = linux_rt_sigaction */ { SYF_MPSAFE | AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL }, /* 353 = linux_rt_sigprocmask */ @@ -378,24 +378,24 @@ { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL }, /* 355 = linux_rt_sigtimedwait */ { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL }, /* 356 = linux_rt_sigqueueinfo */ { SYF_MPSAFE | AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL }, /* 357 = linux_rt_sigsuspend */ - { SYF_MPSAFE | AS(linux_select_args), (sy_call_t *)linux_select, AUE_NULL }, /* 358 = linux_select */ + { SYF_MPSAFE | AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT }, /* 358 = linux_select */ { SYF_MPSAFE | AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_NULL }, /* 359 = gettimeofday */ - { SYF_MPSAFE | AS(settimeofday_args), (sy_call_t *)settimeofday, AUE_NULL }, /* 360 = settimeofday */ - { SYF_MPSAFE | AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_NULL }, /* 361 = linux_getitimer */ - { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_NULL }, /* 362 = linux_setitimer */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Feb 11 23:33:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAF7116A423; Sat, 11 Feb 2006 23:33:50 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6508116A426; Sat, 11 Feb 2006 23:33:50 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8DB7C43D45; Sat, 11 Feb 2006 23:33:49 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id E7E2F46BB6; Sat, 11 Feb 2006 18:33:35 -0500 (EST) Date: Sat, 11 Feb 2006 23:36:39 +0000 (GMT) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: Peter Wemm In-Reply-To: <200602111826.k1BIQLrI082592@repoman.freebsd.org> Message-ID: <20060211233448.D71792@fledge.watson.org> References: <200602111826.k1BIQLrI082592@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews Subject: Re: PERFORCE change 91580 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Feb 2006 23:33:51 -0000 On Sat, 11 Feb 2006, Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=91580 > > Change 91580 by peter@peter_daintree on 2006/02/11 18:25:50 > > Try making the nmbclusters sysctl actually do something. Out of paranoia, > do not allow it to reduce the current value - ie: increase only. It would > probably work, but wouldn't be healthy to the network stack if we allowed it > to be run into the ground. ... > -/* XXX: These should be tuneables. Can't change UMA limits on the fly. */ > -SYSCTL_INT(_kern_ipc, OID_AUTO, nmbclusters, CTLFLAG_RW, &nmbclusters, 0, > - "Maximum number of mbuf clusters allowed"); > +static int > +nmbcheck(SYSCTL_HANDLER_ARGS) > +{ > + int error, oldnmbclusters; > + > + oldnmbclusters = nmbclusters; > + error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); Should this be: error = sysctl_handle_int(oidp, &nmbclusters, NULL, req); > + if (error == 0 && req->newptr) { > + if (nmbclusters < oldnmbclusters) { > + nmbclusters = oldnmbclusters; > + return (EINVAL); > + } Would it be better to use a newnmbclusters variable so as to avoid frobbing the global back and forth in the event that you abort the change? If the value does change, we also don't need to call into UMA, we can just return. Robert N M Watson From owner-p4-projects@FreeBSD.ORG Sat Feb 11 23:52:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FD5516A423; Sat, 11 Feb 2006 23:52:46 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 24D7A16A420 for ; Sat, 11 Feb 2006 23:52:46 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AEB1D43D49 for ; Sat, 11 Feb 2006 23:52:45 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1BNqjcj011046 for ; Sat, 11 Feb 2006 23:52:45 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1BNqRM7011042 for perforce@freebsd.org; Sat, 11 Feb 2006 23:52:27 GMT (envelope-from imp@freebsd.org) Date: Sat, 11 Feb 2006 23:52:27 GMT Message-Id: <200602112352.k1BNqRM7011042@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91596 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Feb 2006 23:52:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=91596 Change 91596 by imp@imp_harmony on 2006/02/11 23:52:09 IFC @91593 (mostly loopback from current) Affected files ... .. //depot/projects/arm/src/sys/alpha/alpha/trap.c#4 integrate .. //depot/projects/arm/src/sys/amd64/amd64/trap.c#7 integrate .. //depot/projects/arm/src/sys/amd64/amd64/tsc.c#2 integrate .. //depot/projects/arm/src/sys/amd64/ia32/ia32_syscall.c#4 integrate .. //depot/projects/arm/src/sys/arm/arm/trap.c#7 integrate .. //depot/projects/arm/src/sys/arm/at91/at91.c#5 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_spi.c#2 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_spiio.h#2 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_st.c#3 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_streg.h#2 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#5 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_twiio.h#3 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_twireg.h#5 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_usartreg.h#2 integrate .. //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#13 integrate .. //depot/projects/arm/src/sys/arm/at91/at91var.h#2 integrate .. //depot/projects/arm/src/sys/arm/at91/files.at91rm92#10 integrate .. //depot/projects/arm/src/sys/arm/at91/files.kb920x#3 integrate .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#28 integrate .. //depot/projects/arm/src/sys/arm/at91/if_atereg.h#6 integrate .. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#15 integrate .. //depot/projects/arm/src/sys/arm/at91/std.at91rm92#2 integrate .. //depot/projects/arm/src/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/arm/src/sys/arm/at91/uart_bus_at91usart.c#5 integrate .. //depot/projects/arm/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#7 integrate .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#10 integrate .. //depot/projects/arm/src/sys/arm/conf/KB920X#17 integrate .. //depot/projects/arm/src/sys/arm/conf/SKYEYE#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/README#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/freebsd/ah_if.m#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/freebsd/ah_osdep.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#1 branch .. //depot/projects/arm/src/sys/contrib/dev/ath/public/alpha-elf.inc#1 branch .. //depot/projects/arm/src/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#1 branch .. //depot/projects/arm/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#1 branch .. //depot/projects/arm/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#1 branch .. //depot/projects/arm/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#1 branch .. //depot/projects/arm/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#1 branch .. //depot/projects/arm/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#1 branch .. //depot/projects/arm/src/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#1 branch .. //depot/projects/arm/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-all.c#6 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-all.h#8 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#11 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.c#6 integrate .. //depot/projects/arm/src/sys/dev/ath/ath_rate/amrr/amrr.c#3 integrate .. //depot/projects/arm/src/sys/dev/ath/ath_rate/onoe/onoe.c#3 integrate .. //depot/projects/arm/src/sys/dev/ath/ath_rate/sample/sample.c#3 integrate .. //depot/projects/arm/src/sys/dev/ath/ath_rate/sample/sample.h#3 integrate .. //depot/projects/arm/src/sys/dev/ath/if_ath.c#5 integrate .. //depot/projects/arm/src/sys/dev/ath/if_athioctl.h#4 integrate .. //depot/projects/arm/src/sys/dev/ath/if_athvar.h#4 integrate .. //depot/projects/arm/src/sys/dev/cs/if_csvar.h#3 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.c#14 integrate .. //depot/projects/arm/src/sys/dev/ipmi/ipmi.c#1 branch .. //depot/projects/arm/src/sys/dev/ipmi/ipmi_pci.c#1 branch .. //depot/projects/arm/src/sys/dev/ipmi/ipmi_smbios.c#1 branch .. //depot/projects/arm/src/sys/dev/ipmi/ipmivars.h#1 branch .. //depot/projects/arm/src/sys/dev/mpt/mpilib/fc_log.h#3 delete .. //depot/projects/arm/src/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt.h#4 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_debug.c#4 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_pci.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/ohci.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/ohci_pci.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/ohcivar.h#5 integrate .. //depot/projects/arm/src/sys/dev/usb/uplcom.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_subr.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#11 integrate .. //depot/projects/arm/src/sys/fs/nullfs/null_vfsops.c#5 integrate .. //depot/projects/arm/src/sys/geom/eli/g_eli.c#6 integrate .. //depot/projects/arm/src/sys/geom/mirror/g_mirror.c#7 integrate .. //depot/projects/arm/src/sys/geom/mirror/g_mirror.h#5 integrate .. //depot/projects/arm/src/sys/geom/raid3/g_raid3.c#8 integrate .. //depot/projects/arm/src/sys/geom/raid3/g_raid3.h#5 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_move.c#2 integrate .. //depot/projects/arm/src/sys/i386/i386/geode.c#3 integrate .. //depot/projects/arm/src/sys/i386/i386/identcpu.c#9 integrate .. //depot/projects/arm/src/sys/i386/i386/machdep.c#8 integrate .. //depot/projects/arm/src/sys/i386/i386/trap.c#6 integrate .. //depot/projects/arm/src/sys/i386/i386/tsc.c#2 integrate .. //depot/projects/arm/src/sys/i386/include/xbox.h#2 integrate .. //depot/projects/arm/src/sys/i386/xbox/xboxfb.c#3 integrate .. //depot/projects/arm/src/sys/ia64/ia32/ia32_trap.c#3 integrate .. //depot/projects/arm/src/sys/ia64/ia64/mp_machdep.c#4 integrate .. //depot/projects/arm/src/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_clock.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_exit.c#11 integrate .. //depot/projects/arm/src/sys/kern/kern_fork.c#6 integrate .. //depot/projects/arm/src/sys/kern/kern_proc.c#7 integrate .. //depot/projects/arm/src/sys/kern/kern_resource.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_synch.c#6 integrate .. //depot/projects/arm/src/sys/kern/kern_tc.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_thr.c#5 integrate .. //depot/projects/arm/src/sys/kern/subr_trap.c#4 integrate .. //depot/projects/arm/src/sys/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/ipmi/Makefile#1 branch .. //depot/projects/arm/src/sys/net/if_vlan.c#7 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_output.c#5 integrate .. //depot/projects/arm/src/sys/netgraph/netflow/ng_netflow.h#4 integrate .. //depot/projects/arm/src/sys/netgraph/ng_eiface.c#6 integrate .. //depot/projects/arm/src/sys/netinet/tcp_syncache.c#7 integrate .. //depot/projects/arm/src/sys/netinet6/in6.c#4 integrate .. //depot/projects/arm/src/sys/pc98/conf/NOTES#8 integrate .. //depot/projects/arm/src/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/trap.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/tick.c#5 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/trap.c#3 integrate .. //depot/projects/arm/src/sys/sys/ipmi.h#1 branch .. //depot/projects/arm/src/sys/sys/proc.h#8 integrate .. //depot/projects/arm/src/sys/sys/systm.h#10 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_quota.c#5 integrate .. //depot/projects/arm/src/sys/vm/uma_core.c#5 integrate Differences ... ==== //depot/projects/arm/src/sys/alpha/alpha/trap.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.127 2005/12/06 11:19:36 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.128 2006/02/08 08:09:14 phk Exp $"); /* #include "opt_fix_unaligned_vax_fp.h" */ #include "opt_ddb.h" @@ -259,7 +259,6 @@ register struct proc *p; register int i; u_int64_t ucode; - u_int sticks; int user; #ifdef SMP register_t s; @@ -302,12 +301,11 @@ CTR5(KTR_TRAP, "%s trap: pid %d, (%lx, %lx, %lx)", user ? "user" : "kernel", p->p_pid, a0, a1, a2); if (user) { - sticks = td->td_sticks; + td->td_pticks = 0; td->td_frame = framep; if (td->td_ucred != p->p_ucred) cred_update_thread(td); } else { - sticks = 0; /* XXX bogus -Wuninitialized warning */ KASSERT(cold || td->td_ucred != NULL, ("kernel trap doesn't have ucred")); } @@ -595,7 +593,7 @@ out: if (user) { framep->tf_regs[FRAME_SP] = alpha_pal_rdusp(); - userret(td, framep, sticks); + userret(td, framep); mtx_assert(&Giant, MA_NOTOWNED); } return; @@ -632,7 +630,6 @@ struct proc *p; int error = 0; u_int64_t opc; - u_int sticks; u_int64_t args[10]; /* XXX */ u_int hidden = 0, nargs; #ifdef SMP @@ -664,7 +661,7 @@ PCPU_LAZY_INC(cnt.v_syscall); td->td_frame = framep; opc = framep->tf_regs[FRAME_PC] - 4; - sticks = td->td_sticks; + td->td_pticks = 0; if (td->td_ucred != p->p_ucred) cred_update_thread(td); if (p->p_flag & P_SA) @@ -773,7 +770,7 @@ if ((callp->sy_narg & SYF_MPSAFE) == 0) mtx_unlock(&Giant); - userret(td, framep, sticks); + userret(td, framep); #ifdef KTRACE if (KTRPOINT(td, KTR_SYSRET)) ==== //depot/projects/arm/src/sys/amd64/amd64/trap.c#7 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.301 2006/02/04 20:37:20 wsalamon Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.302 2006/02/08 08:09:15 phk Exp $"); /* * AMD64 Trap and System call handling @@ -162,7 +162,6 @@ { struct thread *td = curthread; struct proc *p = td->td_proc; - u_int sticks = 0; int i = 0, ucode = 0, type, code; register_t addr = 0; ksiginfo_t ksi; @@ -254,7 +253,7 @@ if (ISPL(frame.tf_cs) == SEL_UPL) { /* user trap */ - sticks = td->td_sticks; + td->td_pticks = 0; td->td_frame = &frame; addr = frame.tf_rip; if (td->td_ucred != p->p_ucred) @@ -524,7 +523,7 @@ #endif user: - userret(td, &frame, sticks); + userret(td, &frame); mtx_assert(&Giant, MA_NOTOWNED); userout: out: @@ -731,7 +730,6 @@ struct thread *td = curthread; struct proc *p = td->td_proc; register_t orig_tf_rflags; - u_int sticks; int error; int narg; register_t args[8]; @@ -757,7 +755,7 @@ reg = 0; regcnt = 6; - sticks = td->td_sticks; + td->td_pticks = 0; td->td_frame = &frame; if (td->td_ucred != p->p_ucred) cred_update_thread(td); @@ -885,7 +883,7 @@ /* * Handle reschedule and other end-of-syscall issues */ - userret(td, &frame, sticks); + userret(td, &frame); CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td, td->td_proc->p_pid, td->td_proc->p_comm, code); ==== //depot/projects/arm/src/sys/amd64/amd64/tsc.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.205 2003/11/17 08:58:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.206 2006/02/11 09:33:05 phk Exp $"); #include "opt_clock.h" @@ -77,6 +77,7 @@ tsc_freq = tscval[1] - tscval[0]; if (bootverbose) printf("TSC clock: %lu Hz\n", tsc_freq); + set_cputicker(rdtsc, tsc_freq, 1); } ==== //depot/projects/arm/src/sys/amd64/ia32/ia32_syscall.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.10 2006/02/04 20:37:20 wsalamon Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.11 2006/02/08 08:09:15 phk Exp $"); /* * 386 Trap and System call handling @@ -96,7 +96,6 @@ struct thread *td = curthread; struct proc *p = td->td_proc; register_t orig_tf_rflags; - u_int sticks; int error; int narg; u_int32_t args[8]; @@ -110,7 +109,7 @@ */ PCPU_LAZY_INC(cnt.v_syscall); - sticks = td->td_sticks; + td->td_pticks = 0; td->td_frame = &frame; if (td->td_ucred != p->p_ucred) cred_update_thread(td); @@ -241,7 +240,7 @@ /* * Handle reschedule and other end-of-syscall issues */ - userret(td, &frame, sticks); + userret(td, &frame); #ifdef KTRACE if (KTRPOINT(td, KTR_SYSRET)) ==== //depot/projects/arm/src/sys/arm/arm/trap.c#7 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.20 2006/02/04 17:01:19 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.21 2006/02/08 08:09:15 phk Exp $"); #include @@ -234,7 +234,6 @@ vm_prot_t ftype; void *onfault; vm_offset_t va; - u_int sticks = 0; int error = 0; struct ksig ksig; struct proc *p; @@ -261,7 +260,8 @@ user = TRAP_USERMODE(tf); if (user) { - sticks = td->td_sticks; td->td_frame = tf; + td->td_pticks = 0; + td->td_frame = tf; if (td->td_ucred != td->td_proc->p_ucred) cred_update_thread(td); if (td->td_pflags & TDP_SA) @@ -465,7 +465,7 @@ out: /* If returning to user mode, make sure to invoke userret() */ if (user) - userret(td, tf, sticks); + userret(td, tf); } /* @@ -707,7 +707,6 @@ struct vm_map *map; vm_offset_t fault_pc, va; int error = 0; - u_int sticks = 0; struct ksig ksig; @@ -754,7 +753,7 @@ /* Prefetch aborts cannot happen in kernel mode */ if (__predict_false(!TRAP_USERMODE(tf))) dab_fatal(tf, 0, tf->tf_pc, NULL, &ksig); - sticks = td->td_sticks; + td->td_pticks = 0; /* Ok validate the address, can only execute in USER space */ @@ -809,7 +808,7 @@ call_trapsignal(td, ksig.signb, ksig.code); out: - userret(td, tf, sticks); + userret(td, tf); } @@ -871,10 +870,9 @@ register_t *ap, *args, copyargs[MAXARGS]; struct sysent *callp; int locked = 0; - u_int sticks = 0; PCPU_LAZY_INC(cnt.v_syscall); - sticks = td->td_sticks; + td->td_pticks = 0; if (td->td_ucred != td->td_proc->p_ucred) cred_update_thread(td); switch (insn & SWI_OS_MASK) { @@ -883,11 +881,11 @@ break; default: call_trapsignal(td, SIGILL, 0); - userret(td, frame, td->td_sticks); + userret(td, frame); return; } code = insn & 0x000fffff; - sticks = td->td_sticks; + td->td_pticks = 0; ap = &frame->tf_r0; if (code == SYS_syscall) { code = *ap++; @@ -973,7 +971,7 @@ mtx_unlock(&Giant); - userret(td, frame, sticks); + userret(td, frame); CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td, td->td_proc->p_pid, td->td_proc->p_comm, code); @@ -995,6 +993,7 @@ td->td_frame = frame; + td->td_pticks = 0; if (td->td_proc->p_flag & P_SA) thread_user_enter(td); /* @@ -1003,7 +1002,7 @@ */ if (__predict_false(((frame->tf_pc - INSN_SIZE) & 3) != 0)) { call_trapsignal(td, SIGILL, 0); - userret(td, frame, td->td_sticks); + userret(td, frame); return; } insn = *(u_int32_t *)(frame->tf_pc - INSN_SIZE); ==== //depot/projects/arm/src/sys/arm/at91/at91.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.2 2006/02/11 03:58:07 imp Exp $"); #include #include ==== //depot/projects/arm/src/sys/arm/at91/at91_spi.c#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/at91/at91_spiio.h#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/at91/at91_spireg.h#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/at91/at91_st.c#3 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/at91/at91_streg.h#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/at91/at91_twi.c#5 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/at91/at91_twiio.h#3 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/at91/at91_twireg.h#5 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/at91/at91_usartreg.h#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#13 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/at91/at91var.h#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/at91/files.at91rm92#10 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/at91/files.kb920x#3 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#28 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.4 2006/02/07 21:31:13 cognet Exp $"); #include #include @@ -147,6 +147,7 @@ static int ate_ifmedia_upd(struct ifnet *ifp); static void ate_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr); static void ate_get_mac(struct ate_softc *sc, u_char *eaddr); +static void ate_set_mac(struct ate_softc *sc, u_char *eaddr); /* * The AT91 family of products has the ethernet called EMAC. However, @@ -180,14 +181,15 @@ callout_init_mtx(&sc->tick_ch, &sc->sc_mtx, 0); ate_get_mac(sc, eaddr); + ate_set_mac(sc, eaddr); + sc->ifp = ifp = if_alloc(IFT_ETHER); if (mii_phy_probe(dev, &sc->miibus, ate_ifmedia_upd, ate_ifmedia_sts)) { device_printf(dev, "Cannot find my PHY.\n"); err = ENXIO; goto out; } - sc->ifp = ifp = if_alloc(IFT_ETHER); ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_mtu = ETHERMTU; @@ -540,6 +542,15 @@ } static void +ate_set_mac(struct ate_softc *sc, u_char *eaddr) +{ + WR4(sc, ETH_SA1L, (eaddr[3] << 24) | (eaddr[2] << 16) | + (eaddr[1] << 8) | eaddr[0]); + WR4(sc, ETH_SA1H, (eaddr[5] << 8) | (eaddr[4])); + +} + +static void ate_get_mac(struct ate_softc *sc, u_char *eaddr) { uint32_t low, high; @@ -569,7 +580,8 @@ status = RD4(sc, ETH_ISR); if (status == 0) return; - printf("IT IS %x\n", RD4(sc, ETH_RSR)); + printf("IT IS %x %x\n", RD4(sc, ETH_RSR), RD4(sc, ETH_CTL)); + if (status & ETH_ISR_RCOM) { bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_POSTREAD); @@ -611,6 +623,10 @@ BUS_DMASYNC_PREWRITE); continue; } + mb->m_len = sc->rx_descs[i].status & + ETH_LEN_MASK; + mb->m_pkthdr.len = mb->m_len; + mb->m_pkthdr.rcvif = sc->ifp; /* * For the last buffer, set the wrap bit so * the controller restarts from the first @@ -817,7 +833,7 @@ /* * Enable some parts of the MAC that are needed always (like the * MII bus. This turns off the RE and TE bits, which will remain - * off until atestart() is called to turn them on. With RE and TE + * off until ateinit() is called to turn them on. With RE and TE * turned off, there's no DMA to worry about after this write. */ WR4(sc, ETH_CTL, ETH_CTL_MPE); ==== //depot/projects/arm/src/sys/arm/at91/if_atereg.h#6 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#15 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/at91/std.at91rm92#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/at91/std.kb920x#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/at91/uart_bus_at91usart.c#5 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#7 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#10 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/conf/KB920X#17 (text+ko) ==== @@ -1,4 +1,5 @@ -# GENERIC -- Generic kernel configuration file for FreeBSD/arm +# KB920X -- Custom kernel configuration for the KB9200, 9201 and 9202 +# AT91RM9200 evaluation boards from kwikbyte.com. # # For more information on this file, please read the handbook section on # Kernel Configuration Files: @@ -15,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/SIMICS,v 1.8 2005/10/04 14:39:33 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/KB920X,v 1.3 2006/02/07 18:45:10 imp Exp $ machine arm ident KB920X @@ -42,7 +43,7 @@ #options UFS_ACL #Support for access control lists #options UFS_DIRHASH #Improve performance on big directories options MD_ROOT #MD is a potential root device -options MD_ROOT_SIZE=4096 # 5MB ram disk +options MD_ROOT_SIZE=4096 # 3MB ram disk options ROOTDEVNAME=\"ufs:md0\" #options NFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server @@ -72,13 +73,6 @@ device mii device lxtphy -# USB support -device ohci # OHCI USB interface -device usb # USB Bus (required) -device umass # Disks/Mass storage - Requires scbus and da -device scbus # SCSI bus (required for SCSI) -device da # Direct Access (disks) - # Debugging for use in -current #options INVARIANTS #Enable calls of extra sanity checking #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS ==== //depot/projects/arm/src/sys/arm/conf/SKYEYE#3 (text+ko) ==== @@ -1,4 +1,5 @@ -# GENERIC -- Generic kernel configuration file for FreeBSD/arm +# SKYEYE -- Kernel configuration for running the skyeye simulator +# simulating the Atmel AT91RM9200. # # For more information on this file, please read the handbook section on # Kernel Configuration Files: @@ -15,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/SIMICS,v 1.8 2005/10/04 14:39:33 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.2 2006/02/07 18:45:54 imp Exp $ machine arm ident KB920X ==== //depot/projects/arm/src/sys/contrib/dev/ath/COPYRIGHT#2 (text+ko) ==== @@ -4,7 +4,7 @@ redistribution with changes. /*- - * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting, Atheros + * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting, Atheros * Communications, Inc. All rights reserved. * * Redistribution and use in source and binary forms are permitted @@ -38,5 +38,5 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGES. * - * $Id: COPYRIGHT,v 1.3 2004/01/07 23:09:27 sam Exp $ + * $Id: //depot/sw/linuxsrc/src/802_11/madwifi/hal/main/COPYRIGHT#5 $ */ ==== //depot/projects/arm/src/sys/contrib/dev/ath/README#2 (text+ko) ==== @@ -1,35 +1,32 @@ -$Id: README,v 1.3 2004/01/07 23:09:27 sam Exp $ - - -WARNING: THIS IS A BETA DISTRIBUTION. THIS SOFTWARE HAS KNOWN PROBLEMS AND -WARNING: LIMITATIONS THAT WILL BE CORRECTED BEFORE A PRODUCTION RELEASE. -WARNING: USE AT YOUR OWN RISK! +$Id: //depot/sw/linuxsrc/src/802_11/madwifi/hal/main/README#5 $ Atheros Hardware Access Layer (HAL) =================================== -* Copyright (c) 2002-2004 Sam Leffler. -* Copyright (c) 2002-2004 Atheros Communications, Inc. +* Copyright (c) 2002-2006 Sam Leffler. +* Copyright (c) 2002-2006 Atheros Communications, Inc. * All rights reserved. Read the file COPYRIGHT for the complete copyright. -This code manages much of the chip-specific operation of the Atheros driver. -The HAL is provided in a binary-only form in order to comply with FCC -regulations. In particular, a radio transmitter can only be operated at -power levels and on frequency channels for which it is approved. The FCC -requires that a software-defined radio cannot be configured by a user -to operate outside the approved power levels and frequency channels. -This makes it difficult to open-source code that enforces limits on -the power levels, frequency channels and other parameters of the radio -transmitter. See +This code manages much of the chip-specific operation of the Atheros +driver. The HAL is provided in a binary-only form in order to +comply with local regulatory agency rules. In the United States +the FCC requires that a radio transmitter only be operated at power +levels and on frequency channels for which it is approved. The FCC +requires that a software-defined radio cannot be configured by a +user to operate outside the approved power levels and frequency +channels. This makes it difficult to open-source code that enforces +limits on the power levels, frequency channels and other parameters +of the radio transmitter. See http://ftp.fcc.gov/Bureaus/Engineering_Technology/Orders/2001/fcc01264.pdf -for the specific FCC regulation. Because the module is provided in a -binary-only form it is marked "Proprietary"; this means when you load -it you will see messages that your system is now "tainted". +for the specific FCC regulation. Because the module is provided +in a binary-only form it is marked "Proprietary" on Linux; this +means when you load it you will see messages that your system is +now "tainted". If you wish to use this driver on a platform for which an ath_hal module is not already provided please contact the author. Note that @@ -39,26 +36,19 @@ Atheros Hardware ================ -There are currently 3 generations of Atheros 802.11 wireless devices: +There are many generations of Atheros 802.11 wireless devices that +are typically referred to by their programming model: 5210 supports 11a only 5211 supports both 11a and 11b 5212 supports 11a, 11b, and 11g These parts have been incorporated in a variety of retail products -including cardbus cards from DLink, Linksys, Netgear, and Proxim; and -mini-pci cards from some of these same vendors. In addition many -laptop vendors use Atheros mini-pci cards for their builtin wireless -support. An (incomplete) list of products that use Atheros parts is: +including cardbus cards and mini-pci cards. In addition many laptop +vendors use Atheros mini-pci cards for their builtin wireless +support. -Netgear WAG511 D-Link DWL-AG520 Linksys WPC55AG -Netgear WAB501 D-Link DWL-AG650 Linksys WMP55AG - D-Link DWL-AB650 Linksys WPC51AB - -In general, if a device is identified as ``11a only'' it is almost -certain to contain an Atheros 5210 part in it. All retail a+b -products use the 5211. The latest generation of universal a+b+g -combo products use the 5212. When in doubt check the PCI vendor -id with a tool like lspci, the Atheros vendor id is 0x168c; e.g. - - 00:13.0 Ethernet controller: Unknown device 168c:0012 (rev 01) +The Atheors PCI vendor id is 0x168c. The file ah_devid.h lists most +known PCI device id's but is not exhaustive. Some vendors program +their own vendor and/or device id's to aid in BIOS-locking mini-pci +cards in laptops. ==== //depot/projects/arm/src/sys/contrib/dev/ath/ah.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting, Atheros + * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting, Atheros * Communications, Inc. All rights reserved. * * Redistribution and use in source and binary forms are permitted @@ -33,7 +33,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGES. * - * $Id: ah.h,v 1.82 2004/11/30 00:31:42 sam Exp $ + * $Id: //depot/sw/linuxsrc/src/802_11/madwifi/hal/main/ah.h#134 $ */ #ifndef _ATH_AH_H_ @@ -105,13 +105,25 @@ HAL_CAP_FASTFRAME = 14, /* hardware supoprts fast frames */ HAL_CAP_TXPOW = 15, /* global tx power limit */ HAL_CAP_TPC = 16, /* per-packet tx power control */ + HAL_CAP_PHYDIAG = 17, /* hardware phy error diagnostic */ + HAL_CAP_BSSIDMASK = 18, /* hardware supports bssid mask */ + HAL_CAP_MCAST_KEYSRCH = 19, /* hardware has multicast key search */ + HAL_CAP_TSF_ADJUST = 20, /* hardware has beacon tsf adjust */ + HAL_CAP_XR = 21, /* hardware has XR support */ + HAL_CAP_WME_TKIPMIC = 22, /* hardware can support TKIP MIC when WMM is turned on */ + HAL_CAP_CHAN_HALFRATE = 23, /* hardware can support half rate channels */ + HAL_CAP_CHAN_QUARTERRATE = 24, /* hardware can support quarter rate channels */ + HAL_CAP_RFSILENT = 25, /* hardware has rfsilent support */ + HAL_CAP_TPC_ACK = 26, /* ack txpower with per-packet tpc */ + HAL_CAP_TPC_CTS = 27, /* cts txpower with per-packet tpc */ + HAL_CAP_11D = 28, /* 11d beacon support for changing cc */ } HAL_CAPABILITY_TYPE; /* * "States" for setting the LED. These correspond to * the possible 802.11 operational states and there may * be a many-to-one mapping between these states and the - * actual hardware states for the LED's (i.e. the hardware + * actual hardware state for the LED's (i.e. the hardware * may have fewer states). */ typedef enum { @@ -132,7 +144,7 @@ HAL_TX_QUEUE_DATA = 1, /* data xmit q's */ HAL_TX_QUEUE_BEACON = 2, /* beacon xmit q */ HAL_TX_QUEUE_CAB = 3, /* "crap after beacon" xmit q */ - HAL_TX_QUEUE_PSPOLL = 4, /* power-save poll xmit q */ + HAL_TX_QUEUE_UAPSD = 4, /* u-apsd power save xmit q */ } HAL_TX_QUEUE; #define HAL_NUM_TX_QUEUES 10 /* max possible # of queues */ @@ -148,6 +160,7 @@ HAL_WME_AC_VI = 2, /* video access category */ HAL_WME_AC_VO = 3, /* voice access category */ HAL_WME_UPSD = 4, /* uplink power save */ + HAL_XR_DATA = 5, /* uplink power save */ } HAL_TX_QUEUE_SUBTYPE; /* @@ -155,17 +168,83 @@ * operational parameters. */ typedef enum { - TXQ_FLAG_TXOKINT_ENABLE = 0x0001, /* enable TXOK interrupt */ - TXQ_FLAG_TXERRINT_ENABLE = 0x0001, /* enable TXERR interrupt */ - TXQ_FLAG_TXDESCINT_ENABLE = 0x0002, /* enable TXDESC interrupt */ - TXQ_FLAG_TXEOLINT_ENABLE = 0x0004, /* enable TXEOL interrupt */ - TXQ_FLAG_TXURNINT_ENABLE = 0x0008, /* enable TXURN interrupt */ - TXQ_FLAG_BACKOFF_DISABLE = 0x0010, /* disable Post Backoff */ - TXQ_FLAG_COMPRESSION_ENABLE = 0x0020, /* compression enabled */ - TXQ_FLAG_RDYTIME_EXP_POLICY_ENABLE = 0x0040, /* enable ready time - expiry policy */ - TXQ_FLAG_FRAG_BURST_BACKOFF_ENABLE = 0x0080, /* enable backoff while - sending fragment burst*/ + /* + * Per queue interrupt enables. When set the associated + * interrupt may be delivered for packets sent through + * the queue. Without these enabled no interrupts will + * be delivered for transmits through the queue. + */ + HAL_TXQ_TXOKINT_ENABLE = 0x0001, /* enable TXOK interrupt */ + HAL_TXQ_TXERRINT_ENABLE = 0x0001, /* enable TXERR interrupt */ + HAL_TXQ_TXDESCINT_ENABLE = 0x0002, /* enable TXDESC interrupt */ + HAL_TXQ_TXEOLINT_ENABLE = 0x0004, /* enable TXEOL interrupt */ + HAL_TXQ_TXURNINT_ENABLE = 0x0008, /* enable TXURN interrupt */ + /* + * Enable hardware compression for packets sent through + * the queue. The compression buffer must be setup and + * packets must have a key entry marked in the tx descriptor. + */ + HAL_TXQ_COMPRESSION_ENABLE = 0x0010, /* enable h/w compression */ + /* + * Disable queue when veol is hit or ready time expires. + * By default the queue is disabled only on reaching the + * physical end of queue (i.e. a null link ptr in the + * descriptor chain). + */ + HAL_TXQ_RDYTIME_EXP_POLICY_ENABLE = 0x0020, + /* + * Schedule frames on delivery of a DBA (DMA Beacon Alert) + * event. Frames will be transmitted only when this timer + * fires, e.g to transmit a beacon in ap or adhoc modes. + */ + HAL_TXQ_DBA_GATED = 0x0040, /* schedule based on DBA */ + /* + * Each transmit queue has a counter that is incremented + * each time the queue is enabled and decremented when + * the list of frames to transmit is traversed (or when + * the ready time for the queue expires). This counter + * must be non-zero for frames to be scheduled for + * transmission. The following controls disable bumping + * this counter under certain conditions. Typically this + * is used to gate frames based on the contents of another + * queue (e.g. CAB traffic may only follow a beacon frame). + * These are meaningful only when frames are scheduled + * with a non-ASAP policy (e.g. DBA-gated). + */ + HAL_TXQ_CBR_DIS_QEMPTY = 0x0080, /* disable on this q empty */ + HAL_TXQ_CBR_DIS_BEMPTY = 0x0100, /* disable on beacon q empty */ + + /* + * Fragment burst backoff policy. Normally the no backoff + * is done after a successful transmission, the next fragment + * is sent at SIFS. If this flag is set backoff is done + * after each fragment, regardless whether it was ack'd or + * not, after the backoff count reaches zero a normal channel + * access procedure is done before the next transmit (i.e. + * wait AIFS instead of SIFS). + */ + HAL_TXQ_FRAG_BURST_BACKOFF_ENABLE = 0x00800000, + /* + * Disable post-tx backoff following each frame. + */ + HAL_TXQ_BACKOFF_DISABLE = 0x00010000, /* disable post backoff */ + /* + * DCU arbiter lockout control. This controls how + * lower priority tx queues are handled with respect to + * to a specific queue when multiple queues have frames + * to send. No lockout means lower priority queues arbitrate + * concurrently with this queue. Intra-frame lockout + * means lower priority queues are locked out until the + * current frame transmits (e.g. including backoffs and bursting). + * Global lockout means nothing lower can arbitrary so + * long as there is traffic activity on this queue (frames, + * backoff, etc). + */ + HAL_TXQ_ARB_LOCKOUT_INTRA = 0x00020000, /* intra-frame lockout */ + HAL_TXQ_ARB_LOCKOUT_GLOBAL = 0x00040000, /* full lockout s */ + + HAL_TXQ_IGNORE_VIRTCOL = 0x00080000, /* ignore virt collisions */ + HAL_TXQ_SEQNUM_INC_DIS = 0x00100000, /* disable seqnum increment */ } HAL_TX_QUEUE_FLAGS; typedef struct { @@ -178,15 +257,24 @@ u_int32_t tqi_cwmax; /* cwMax */ u_int16_t tqi_shretry; /* rts retry limit */ u_int16_t tqi_lgretry; /* long retry limit (not used)*/ - u_int32_t tqi_cbrPeriod; - u_int32_t tqi_cbrOverflowLimit; - u_int32_t tqi_burstTime; - u_int32_t tqi_readyTime; + u_int32_t tqi_cbrPeriod; /* CBR period (us) */ + u_int32_t tqi_cbrOverflowLimit; /* threshold for CBROVF int */ + u_int32_t tqi_burstTime; /* max burst duration (us) */ + u_int32_t tqi_readyTime; /* frame schedule time (us) */ + u_int32_t tqi_compBuf; /* comp buffer phys addr */ } HAL_TXQ_INFO; +#define HAL_TQI_NONVAL 0xffff + /* token to use for aifs, cwmin, cwmax */ #define HAL_TXQ_USEDEFAULT ((u_int32_t) -1) +/* compression definitions */ +#define HAL_COMP_BUF_MAX_SIZE 9216 /* 9K */ +#define HAL_COMP_BUF_ALIGN_SIZE 512 +#define HAL_DECOMP_MASK_SIZE 128 + + /* * Transmit packet types. This belongs in ah_desc.h, but * is here so we can give a proper type to various parameters @@ -201,6 +289,8 @@ HAL_PKT_TYPE_PSPOLL = 2, >>> TRUNCATED FOR MAIL (1000 lines) <<<