From owner-p4-projects@FreeBSD.ORG Sun Feb 11 12:42:35 2007 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 7850616A407; Sun, 11 Feb 2007 12:42:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E903916A402 for ; Sun, 11 Feb 2007 12:42:34 +0000 (UTC) (envelope-from chibis@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BFDE113C461 for ; Sun, 11 Feb 2007 12:42:34 +0000 (UTC) (envelope-from chibis@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1BCgYfg060114 for ; Sun, 11 Feb 2007 12:42:34 GMT (envelope-from chibis@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1BCgYps060110 for perforce@freebsd.org; Sun, 11 Feb 2007 12:42:34 GMT (envelope-from chibis@freebsd.org) Date: Sun, 11 Feb 2007 12:42:34 GMT Message-Id: <200702111242.l1BCgYps060110@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chibis@freebsd.org using -f From: Yuriy Tsibizov To: Perforce Change Reviews Cc: Subject: PERFORCE change 114383 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, 11 Feb 2007 12:42:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=114383 Change 114383 by chibis@chibis_free on 2007/02/11 12:42:23 Pull man page from vendor branch Affected files ... .. //depot/projects/soundsystem/src/share/man/man4/snd_emu10kx.4#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Feb 11 14:18:36 2007 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 C50BE16A408; Sun, 11 Feb 2007 14:18:36 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 76A3C16A407 for ; Sun, 11 Feb 2007 14:18:36 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 65BAD13C4B4 for ; Sun, 11 Feb 2007 14:18:36 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1BEIaki085053 for ; Sun, 11 Feb 2007 14:18:36 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1BEIa37085050 for perforce@freebsd.org; Sun, 11 Feb 2007 14:18:36 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 11 Feb 2007 14:18:36 GMT Message-Id: <200702111418.l1BEIa37085050@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 114387 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, 11 Feb 2007 14:18:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=114387 Change 114387 by rdivacky@rdivacky_witten on 2007/02/11 14:18:34 Change emul_shared_lock back to an sx. We need sleepable lock because we need to hold this lock while doing pfind() which results in a LOR caused by rw -> sx -> mutex locking order. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysvec.c#10 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#36 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.h#10 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_sysvec.c#5 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysvec.c#10 (text+ko) ==== @@ -52,7 +52,6 @@ #include #include #include -#include #include #include #include @@ -1080,7 +1079,7 @@ SET_FOREACH(ldhp, linux_device_handler_set) linux_device_register_handler(*ldhp); mtx_init(&emul_lock, "emuldata lock", NULL, MTX_DEF); - rw_init(&emul_shared_lock, "emuldata->shared lock"); + sx_init(&emul_shared_lock, "emuldata->shared lock"); LIST_INIT(&futex_list); sx_init(&futex_sx, "futex protection lock"); linux_exit_tag = EVENTHANDLER_REGISTER(process_exit, linux_proc_exit, @@ -1111,7 +1110,7 @@ SET_FOREACH(ldhp, linux_device_handler_set) linux_device_unregister_handler(*ldhp); mtx_destroy(&emul_lock); - rw_destroy(&emul_shared_lock); + sx_destroy(&emul_shared_lock); sx_destroy(&futex_sx); EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag); EVENTHANDLER_DEREGISTER(schedtail, linux_schedtail_tag); ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#36 (text+ko) ==== @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include @@ -56,7 +55,7 @@ #include #endif -struct rwlock emul_shared_lock; +struct sx emul_shared_lock; struct mtx emul_lock; /* this returns locked reference to the emuldata entry (if found) */ ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.h#10 (text+ko) ==== @@ -60,10 +60,10 @@ #define EMUL_LOCK(l) mtx_lock(l) #define EMUL_UNLOCK(l) mtx_unlock(l) -#define EMUL_SHARED_RLOCK(l) rw_rlock(l) -#define EMUL_SHARED_RUNLOCK(l) rw_runlock(l) -#define EMUL_SHARED_WLOCK(l) rw_wlock(l) -#define EMUL_SHARED_WUNLOCK(l) rw_wunlock(l) +#define EMUL_SHARED_RLOCK(l) sx_slock(l) +#define EMUL_SHARED_RUNLOCK(l) sx_sunlock(l) +#define EMUL_SHARED_WLOCK(l) sx_xlock(l) +#define EMUL_SHARED_WUNLOCK(l) sx_xunlock(l) /* for em_find use */ #define EMUL_DOLOCK 1 @@ -74,7 +74,7 @@ void linux_schedtail(void *, struct proc *); void linux_proc_exec(void *, struct proc *, struct image_params *); -extern struct rwlock emul_shared_lock; +extern struct sx emul_shared_lock; extern struct mtx emul_lock; #endif /* !_LINUX_EMUL_H_ */ ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_sysvec.c#5 (text+ko) ==== @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include @@ -919,7 +918,7 @@ SET_FOREACH(ldhp, linux_device_handler_set) linux_device_register_handler(*ldhp); mtx_init(&emul_lock, "emuldata lock", NULL, MTX_DEF); - rw_init(&emul_shared_lock, "emuldata->shared lock"); + sx_init(&emul_shared_lock, "emuldata->shared lock"); LIST_INIT(&futex_list); sx_init(&futex_sx, "futex protection lock"); linux_exit_tag = EVENTHANDLER_REGISTER(process_exit, linux_proc_exit, @@ -950,7 +949,7 @@ SET_FOREACH(ldhp, linux_device_handler_set) linux_device_unregister_handler(*ldhp); mtx_destroy(&emul_lock); - rw_destroy(&emul_shared_lock); + sx_destroy(&emul_shared_lock); sx_destroy(&futex_sx); EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag); EVENTHANDLER_DEREGISTER(schedtail, linux_schedtail_tag); From owner-p4-projects@FreeBSD.ORG Sun Feb 11 18:34:29 2007 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 D0FEC16A420; Sun, 11 Feb 2007 18:34:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A6A7316A401 for ; Sun, 11 Feb 2007 18:34:28 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 91ECA13C467 for ; Sun, 11 Feb 2007 18:34:28 +0000 (UTC) (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.6/8.13.6) with ESMTP id l1BIYSq5040391 for ; Sun, 11 Feb 2007 18:34:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1BIXgKV039617 for perforce@freebsd.org; Sun, 11 Feb 2007 18:33:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 11 Feb 2007 18:33:42 GMT Message-Id: <200702111833.l1BIXgKV039617@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 114392 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, 11 Feb 2007 18:34:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=114392 Change 114392 by rwatson@rwatson_zoo on 2007/02/11 18:32:21 Integrate FreeBSD CVS into TrustedBSD base branch: - more license tweaks than you can shake a stick at - libncurses 5.6 update. - More long-overdue a.out trimmage. - ip_encap removed. - BIND 9.3.4 update. - BSD gzip. - swapinfo fixed for core dumps. - tracing for rtld - ifconfg supports media instances - init_chroot kenv for init - nfs4 mount combined with nfs mount - many quota fixes - geom_part - if_watchdog replacement in many drivers - uipaq - rename after revoke panic fix - zoneli mbuf cluster / packet resource exhaustion work-around - significant sched_ule reworking - kqueue/mount LOR workaround - tap/tun cloning rework - multicast tunneling trimmage - TCP socket buffer auto-sizing - MAC Framework restructuring continues -- struct label now internal to the framework, accessor functions mac_label_get() and mac_label_set(); _label.h removed. Only mac.h left in src/sys/sys, others in src/sys/security/mac. - Many quota fixes. Affected files ... .. //depot/projects/trustedbsd/base/Makefile.inc1#82 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#18 integrate .. //depot/projects/trustedbsd/base/UPDATING#75 integrate .. //depot/projects/trustedbsd/base/bin/sh/exec.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/CHANGES#7 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/FAQ#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/FAQ.xml#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/README#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/api#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/validator.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/resolver.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/validator.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/version#7 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ANNOUNCE#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/AUTHORS#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/INSTALL#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/MANIFEST#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/Makefile.glibc#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/Makefile.os2#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/NEWS#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/README.emx#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/README.glibc#2 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/TO-DO#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/aclocal.m4#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/announce.html.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/c++/Makefile.in#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/c++/NEWS#2 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/c++/PROBLEMS#2 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/c++/README-first#2 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/c++/cursesapp.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/c++/cursesapp.h#2 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/c++/cursesf.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/c++/cursesf.h#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/c++/cursesm.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/c++/cursesm.h#2 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/c++/cursesmain.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/c++/cursesp.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/c++/cursesp.h#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/c++/cursespad.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/c++/cursesw.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/c++/cursesw.h#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/c++/cursslk.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/c++/cursslk.h#2 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/c++/demo.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/c++/edit_cfg.sh#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/c++/etip.h.in#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/c++/headers#2 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/c++/internal.h#2 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/c++/modules#2 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/config.guess#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/config.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/configure#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/configure.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/convert_configure.pl#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/dist.mk#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/doc/hackguide.doc#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/doc/html/NCURSES-Programming-HOWTO.html#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/doc/html/announce.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/doc/html/hackguide.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/doc/html/ncurses-intro.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/doc/ncurses-intro.doc#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/READ.ME#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/f_trace.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fld_arg.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fld_attr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fld_current.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fld_def.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fld_dup.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fld_ftchoice.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fld_ftlink.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fld_info.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fld_just.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fld_link.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fld_max.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fld_move.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fld_newftyp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fld_opts.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fld_pad.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fld_page.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fld_stat.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fld_type.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fld_user.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/form.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/form.priv.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/frm_cursor.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/frm_data.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/frm_def.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/frm_driver.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/frm_hook.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/frm_opts.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/frm_page.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/frm_post.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/frm_req_name.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/frm_scale.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/frm_sub.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/frm_user.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/frm_win.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fty_alnum.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fty_alpha.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fty_enum.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fty_int.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fty_ipv4.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fty_num.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fty_regex.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/llib-lform#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/llib-lformw#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/form/modules#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/Caps#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/Caps.aix4#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/Caps.hpux11#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/include/Caps.keys#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/Caps.osf1r5#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/Caps.uwin#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/MKhashsize.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/MKkey_defs.sh#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/MKncurses_def.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/MKparametrized.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/MKterm.h.awk.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/curses.h.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/curses.tail#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/curses.wide#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/hashed_db.h#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/include/nc_alloc.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/nc_tparm.h#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/include/ncurses_cfg.hin#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/ncurses_defs#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/ncurses_dll.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/term_entry.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/tic.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/install-sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/captoinfo.1m#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/clear.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_add_wch.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_add_wchstr.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_addch.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_addchstr.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_addstr.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_addwstr.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_attr.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_beep.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_bkgd.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_bkgrnd.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_border.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_border_set.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_clear.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_color.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_delch.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_deleteln.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_extend.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_get_wch.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_get_wstr.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_getcchar.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_getch.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_getstr.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_getyx.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_in_wch.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_in_wchstr.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_inch.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_inchstr.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_initscr.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_inopts.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_ins_wch.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_ins_wstr.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_insch.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_insstr.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_instr.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_inwstr.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_kernel.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_mouse.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_move.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_outopts.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_overlay.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_pad.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_print.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_printw.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_refresh.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_scanw.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_scr_dump.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_scroll.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_slk.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_termattrs.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_termcap.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_terminfo.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_touch.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_trace.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_util.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_window.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/default_colors.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/define_key.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_cursor.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_data.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_driver.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_field.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_field_attributes.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_field_buffer.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_field_info.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_field_just.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_field_new.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_field_opts.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_field_userptr.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_field_validation.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_fieldtype.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_hook.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_new.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_new_page.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_opts.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_page.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_post.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_requestname.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_userptr.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_win.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/infocmp.1m#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/infotocap.1m#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/key_defined.3x#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/man/keybound.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/keyok.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/legacy_coding.3x#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/man/make_sed.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/man_db.renames#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/manlinks.sed#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/menu.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/menu_attributes.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/menu_cursor.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/menu_driver.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/menu_format.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/menu_hook.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/menu_items.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/menu_mark.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/menu_new.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/menu_opts.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/menu_pattern.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/menu_post.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/menu_requestname.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/menu_spacing.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/menu_userptr.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/menu_win.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/mitem_current.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/mitem_name.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/mitem_new.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/mitem_opts.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/mitem_userptr.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/mitem_value.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/ncurses.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/panel.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/resizeterm.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/term.5#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/term.7#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/terminfo.head#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/terminfo.tail#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/tic.1m#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/toe.1m#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/tput.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/tset.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/wresize.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/READ.ME#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/eti.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/llib-lmenu#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/llib-lmenuw#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_attribs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_cursor.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_driver.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_format.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_global.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_hook.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_item_cur.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_item_nam.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_item_new.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_item_opt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_item_top.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_item_use.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_item_val.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_item_vis.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_items.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_new.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_opts.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_pad.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_pattern.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_post.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_req_name.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_scale.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_spacing.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_sub.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_trace.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_userptr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/m_win.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/menu.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/menu.priv.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/mf_common.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/menu/modules#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/misc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/misc/chkdef.cmd#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/misc/cleantic.cmd#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/misc/cmpdef.cmd#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/misc/csort#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/misc/emx.src#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/misc/gen_edit.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/misc/indent.pro#2 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/misc/jpf-indent#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/misc/makedef.cmd#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/misc/ncu-indent#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/misc/ncurses-config.in#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/misc/run_tic.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/misc/shlib#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/misc/terminfo.src#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/mk-0th.awk#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/mk-1st.awk#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/mk-2nd.awk#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/mkinstalldirs#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/README.IZ#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/SigAction.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/MKkeyname.awk#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/MKlib_gen.sh#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/MKunctrl.awk#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/define_key.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/key_defined.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/keybound.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/keyok.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/legacy_coding.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_addch.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_addstr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_beep.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_bkgd.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_box.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_chgat.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_clrbot.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_color.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_colorset.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_dft_fgbg.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_erase.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_freeall.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_getch.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_getstr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_hline.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_initscr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_insch.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_insdel.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_insnstr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_insstr.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_instr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_mouse.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_move.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_mvwin.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_newterm.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_newwin.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_overlay.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_pad.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_printw.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_redrawln.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_refresh.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_restart.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_screen.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_scroll.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_set_term.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_slk.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_slkatr_set.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_slkatrof.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_slkatron.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_slkatrset.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_slkattr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_slkclear.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_slkcolor.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_slklab.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_slkrefr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_slkset.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_ungetch.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_vline.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_wattroff.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_wattron.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/lib_window.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/resizeterm.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/safe_sprintf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/sigaction.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/tries.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/version.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/vsscanf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/base/wresize.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/curses.priv.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/llib-lncurses#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/llib-lncursesw#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/modules#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/MKcaptab.awk#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/MKfallback.sh#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/MKkeys_list.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/MKnames.awk#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/access.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/add_tries.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/alloc_entry.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/alloc_ttype.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/captoinfo.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/comp_error.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/comp_expand.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/comp_hash.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/comp_parse.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/comp_scan.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/db_iterator.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/doalloc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/free_ttype.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/hashed_db.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/home_terminfo.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/init_keytry.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/lib_acs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/lib_cur_term.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/lib_data.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/lib_has_cap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/lib_kernel.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/lib_napms.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/lib_options.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/lib_print.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/lib_raw.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/lib_setup.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/lib_termcap.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/lib_termname.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/lib_tgoto.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/lib_ti.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/lib_tparm.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/lib_tputs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/make_keys.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/name_match.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/parse_entry.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/read_entry.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/read_termcap.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/setbuf.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/strings.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/trim_sgr0.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/write_entry.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/trace/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/trace/lib_trace.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/trace/lib_traceatr.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/trace/lib_tracebits.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/trace/lib_tracechr.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/trace/lib_tracedmp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/trace/lib_tracemse.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/trace/trace_buf.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/trace/varargs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/trace/visbuf.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tty/MKexpanded.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tty/hashmap.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tty/lib_mvcur.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tty/lib_tstp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tty/lib_twait.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tty/lib_vidattr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tty/tty_display.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tty/tty_update.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/widechar/charable.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/widechar/lib_add_wch.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/widechar/lib_box_set.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/widechar/lib_cchar.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/widechar/lib_get_wch.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/widechar/lib_get_wstr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/widechar/lib_in_wch.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/widechar/lib_ins_nwstr.c#2 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/widechar/lib_ins_wch.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/widechar/lib_inwstr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/widechar/lib_pecho_wchar.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/widechar/lib_slk_wset.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/widechar/lib_wacs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/panel/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/panel/llib-lpanel#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/panel/llib-lpanelw#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/panel/p_above.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/panel/p_below.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/panel/p_bottom.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/panel/p_delete.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/panel/p_hidden.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/panel/p_hide.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/panel/p_move.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/panel/p_new.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/panel/p_replace.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/panel/p_show.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/panel/p_top.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/panel/p_update.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/panel/p_user.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/panel/p_win.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/panel/panel.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/panel/panel.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/panel/panel.priv.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/progs/MKtermsort.sh#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/progs/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/progs/capconvert#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/progs/clear.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/progs/clear.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/progs/dump_entry.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/progs/dump_entry.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/progs/infocmp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/progs/modules#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/progs/progs.priv.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/progs/tic.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/progs/toe.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/progs/tput.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/progs/tset.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/tack/COPYING#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/tack/HISTORY#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/tack/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/tack/ansi.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/tack/charset.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/tack/color.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/tack/control.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/tack/crum.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/tack/edit.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/tack/fun.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/tack/init.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/tack/menu.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/tack/modes.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/tack/modules#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/tack/output.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/tack/pad.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/tack/scan.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/tack/sync.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/tack/sysdep.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/tack/tack.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/tack/tack.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/tack/tack.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/tar-copy.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/test/Makefile.in#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/README#2 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/blue.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/bs.6#2 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/bs.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/cardfile.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/cardfile.dat#2 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/configure#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/configure.in#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/ditto.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/dots.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/filter.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/firework.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/firstlast.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/gdc.6#2 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/gdc.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/hanoi.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/hashtest.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/keynames.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/knight.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/lrtest.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/modules#2 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/ncurses.c#4 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/ncurses_tst.hin#2 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/newdemo.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/railroad.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/rain.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/tclock.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/test.priv.h#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/testaddch.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/testcurs.c#4 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/testscanw.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/tracemunch#2 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/view.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/worm.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ncurses/test/xmas.c#3 delete .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#64 integrate .. //depot/projects/trustedbsd/base/etc/etc.powerpc/ttys#4 integrate .. //depot/projects/trustedbsd/base/etc/periodic/security/800.loginfail#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/jail#17 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/power_profile#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/quota#6 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#59 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/Makefile#20 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/kthr.c#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/COPYING#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/Makefile#5 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/NEWS#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/README#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/THANKS#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/TODO#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/algorithm.doc#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/bits.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/crypt.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/crypt.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/deflate.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/gzexe#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/gzexe.1#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/gzip.1#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/gzip.c#4 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/gzip.h#4 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/inflate.c#4 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/lzw.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/lzw.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/match.S#4 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/revision.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/tailor.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/trees.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/unlzh.c#3 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/unlzw.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/unpack.c#3 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/unzip.c#3 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/util.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/zdiff#3 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/zdiff.1#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/zforce#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/zforce.1#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/zgrep#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/zgrep.1#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/zgrep.getopt#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/zgrep.libz#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/zip.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/zmore#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/zmore.1#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/znew#3 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/znew.1#2 delete .. //depot/projects/trustedbsd/base/include/Makefile#58 integrate .. //depot/projects/trustedbsd/base/include/objformat.h#2 delete .. //depot/projects/trustedbsd/base/include/rpc/auth_kerb.h#3 integrate .. //depot/projects/trustedbsd/base/include/tgmath.h#2 integrate .. //depot/projects/trustedbsd/base/lib/Makefile#47 integrate .. //depot/projects/trustedbsd/base/lib/bind/bind/config.h#5 integrate .. //depot/projects/trustedbsd/base/lib/bind/config.h#6 integrate .. //depot/projects/trustedbsd/base/lib/bind/dns/code.h#4 integrate .. //depot/projects/trustedbsd/base/lib/bind/dns/dns/enumclass.h#4 integrate .. //depot/projects/trustedbsd/base/lib/bind/dns/dns/enumtype.h#4 integrate .. //depot/projects/trustedbsd/base/lib/bind/dns/dns/rdatastruct.h#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/COPYING#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile#23 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive.h.in#14 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_check_magic.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.c#18 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.h#12 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_platform.h#15 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_private.h#16 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read.3#13 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read.c#15 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_data_into_buffer.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_data_into_fd.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_extract.c#17 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_open_fd.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_open_file.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_open_filename.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_open_memory.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_all.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_bzip2.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_compress.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_gzip.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_none.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_all.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_cpio.c#14 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_empty.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_iso9660.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tar.c#19 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_zip.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_string.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_string.h#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_string_sprintf.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_util.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_util.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write.3#11 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_open_fd.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_open_file.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_open_filename.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_open_memory.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_compression_bzip2.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_compression_gzip.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_compression_none.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_by_name.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_cpio.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_pax.c#19 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_shar.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_ustar.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/config_freebsd.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/libarchive-formats.5#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/libarchive.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/tar.5#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/SYS.h#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/_setjmp.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/ldexp.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/modf.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/setjmp.S#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/sigsetjmp.S#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/sys/brk.S#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/sys/cerror.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/sys/exect.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/sys/pipe.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/sys/ptrace.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/sys/reboot.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/sys/sbrk.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/sys/setlogin.S#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/sys/sigreturn.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/sys/vfork.S#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/creat.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/creat.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/gethostid.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/gethostid.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/getwd.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/killpg.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/killpg.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/sethostid.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/setpgrp.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/setrgid.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/setruid.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/setruid.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/sigcompat.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/sigpause.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/sigsetmask.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/sigvec.2#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/btree/bt_close.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/btree/bt_conv.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/btree/bt_debug.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/btree/bt_delete.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/btree/bt_get.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/btree/bt_open.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/btree/bt_overflow.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/btree/bt_page.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/btree/bt_put.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/btree/bt_search.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/btree/bt_seq.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/btree/bt_split.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/btree/bt_utils.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/btree/btree.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/btree/extern.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/db/db.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/hash/extern.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/hash/hash.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/hash/hash.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/hash/hash_bigkey.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/hash/hash_buf.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/hash/hash_func.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/hash/hash_log2.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/hash/hash_page.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/hash/ndbm.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/hash/page.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/man/btree.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/man/dbopen.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/man/hash.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/man/mpool.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/man/recno.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/mpool/mpool.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/recno/extern.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/recno/rec_close.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/recno/rec_delete.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/recno/rec_get.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/recno/rec_open.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/recno/rec_put.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/recno/rec_search.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/recno/rec_seq.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/recno/rec_utils.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/recno/recno.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/test/btree.tests/main.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/test/dbtest.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/test/hash.tests/driver2.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/test/hash.tests/tcreat3.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/test/hash.tests/tdel.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/test/hash.tests/thash4.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/test/hash.tests/tread2.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/test/hash.tests/tseq.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/test/hash.tests/tverify.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/Makefile.inc#29 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/Symbol.map#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/__xuname.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/_spinlock_stub.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/alarm.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/alarm.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/assert.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/clock.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/clock.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/closedir.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/confstr.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/confstr.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/crypt.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/ctermid.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/ctermid.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/daemon.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/daemon.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/devname.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/devname.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/directory.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/disklabel.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/err.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/err.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/errlst.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/exec.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/exec.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/fnmatch.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/fnmatch.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/frexp.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/fstab.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/fts.3#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/fts.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getbootfile.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getbootfile.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getbsize.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getbsize.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getcap.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getcap.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getcwd.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getcwd.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getdiskbyname.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getdomainname.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getdomainname.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getfsent.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getgrent.3#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getgrouplist.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getgrouplist.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/gethostname.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/gethostname.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getloadavg.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getloadavg.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getlogin.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getmntinfo.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getmntinfo.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getnetgrent.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getnetgrent.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getobjformat.3#5 delete .. //depot/projects/trustedbsd/base/lib/libc/gen/getobjformat.c#6 delete .. //depot/projects/trustedbsd/base/lib/libc/gen/getosreldate.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getpagesize.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getpagesize.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getpass.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getpwent.3#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getttyent.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getttyent.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getusershell.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getusershell.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getvfsbyname.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getvfsbyname.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/glob.3#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/glob.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/initgroups.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/initgroups.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/isatty.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/ldexp.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/modf.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/nice.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/nice.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/nlist.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/nlist.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/opendir.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/pause.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/pause.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/popen.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/popen.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/psignal.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/psignal.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/pw_scan.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/pw_scan.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/pwcache.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/pwcache.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/raise.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/raise.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/readdir.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/rewinddir.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/scandir.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/scandir.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/seekdir.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/setdomainname.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/sethostname.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/setjmp.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/setjmperr.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/setmode.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/setmode.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/siginterrupt.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/siginterrupt.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/siglist.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/signal.3#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/signal.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/sigsetops.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/sigsetops.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/sleep.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/sleep.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/stringlist.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/strtofflags.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/strtofflags.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/sysconf.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/sysconf.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/sysctl.3#13 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/sysctl.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/syslog.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/syslog.c#17 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/tcgetpgrp.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/tcsendbreak.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/tcsetattr.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/tcsetpgrp.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/telldir.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/termios.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/time.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/time.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/times.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/times.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/timezone.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/timezone.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/ttyname.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/ttyname.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/ttyslot.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/tzset.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/ualarm.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/ualarm.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/uname.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/uname.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/unvis.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/unvis.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/usleep.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/usleep.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/utime.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/utime.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/valloc.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/valloc.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/vis.3#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/vis.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/wait.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/wait3.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/waitpid.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gmon/gmon.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libc/gmon/mcount.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gmon/moncontrol.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/SYS.h#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/gen/_setjmp.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/gen/fabs.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/gen/ldexp.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/gen/modf.S#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/gen/setjmp.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/gen/sigsetjmp.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/stdlib/abs.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/stdlib/div.S#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/stdlib/labs.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/string/bcopy.S#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/Ovfork.S#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/brk.S#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/cerror.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/exect.S#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_get_ldt.2#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/pipe.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/ptrace.S#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/reboot.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/sbrk.S#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/setlogin.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/sigreturn.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/syscall.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/include/libc_private.h#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/include/spinlock.h#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/inet/inet_addr.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/inet/inet_lnaof.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/inet/inet_makeaddr.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/inet/inet_netof.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/inet/inet_network.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/inet/inet_ntoa.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/ctype.3#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/digittoint.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/euc.5#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/gbk.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isalnum.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isalpha.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isascii.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isblank.3#12 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/iscntrl.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isctype.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isdigit.3#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isgraph.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/islower.3#6 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Feb 11 19:00:10 2007 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 B205B16A407; Sun, 11 Feb 2007 19:00:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6C44F16A402 for ; Sun, 11 Feb 2007 19:00:10 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 493D113C46B for ; Sun, 11 Feb 2007 19:00:10 +0000 (UTC) (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.6/8.13.6) with ESMTP id l1BJ0AgV056994 for ; Sun, 11 Feb 2007 19:00:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1BJ02Pt056991 for perforce@freebsd.org; Sun, 11 Feb 2007 19:00:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 11 Feb 2007 19:00:02 GMT Message-Id: <200702111900.l1BJ02Pt056991@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 114394 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, 11 Feb 2007 19:00:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=114394 Change 114394 by rwatson@rwatson_zoo on 2007/02/11 18:59:36 Integrate TrustedBSD priv branch up to base@114392. Affected files ... .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/machdep.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/mptable_pci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/msi.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/nexus.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/clock.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/intr_machdep.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/setjmp.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/isa/clock.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_machdep.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/vm_machdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/at91_twi.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/if_ate.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/uart_dev_at91usart.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/conf/EP80219#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/include/bus_dma.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/include/md_var.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/include/pmap.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_mem.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425var.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/common/loader.8#4 integrate .. //depot/projects/trustedbsd/priv/sys/boot/common/pnp.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/common/pnpdata#2 delete .. //depot/projects/trustedbsd/priv/sys/boot/forth/loader.conf#4 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/coda/coda_vfsops.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_emul.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_emul.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_file.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_ipc.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_mib.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_misc.c#11 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_signal.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/conf/NOTES#8 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files#10 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files.powerpc#4 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files.sparc64#5 integrate .. //depot/projects/trustedbsd/priv/sys/conf/kmod.mk#4 integrate .. //depot/projects/trustedbsd/priv/sys/conf/options#6 integrate .. //depot/projects/trustedbsd/priv/sys/conf/options.sun4v#2 integrate .. //depot/projects/trustedbsd/priv/sys/ddb/db_command.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/ddb/db_thread.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aac/aac_cam.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_package.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_pcib_pci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_throttle.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/ath_rate/sample/sample.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/ath_rate/sample/sample.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/if_ath_pci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/if_athvar.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bce/if_bce.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bce/if_bcereg.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bge/if_bge.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bge/if_bgereg.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cy/cy_isa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/dpt/dpt.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/dpt/dpt_eisa.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/dpt/dpt_scsi.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/esp/esp_sbus.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/fb/boot_font.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/fb/creator.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/fb/creatorreg.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/fb/gallant12x22.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/fb/gfb.c#2 delete .. //depot/projects/trustedbsd/priv/sys/dev/fb/gfb.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/gfb/gfb_pci.c#2 delete .. //depot/projects/trustedbsd/priv/sys/dev/gfb/gfb_pci.h#2 delete .. //depot/projects/trustedbsd/priv/sys/dev/ichsmb/ichsmb.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/idt/idtreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_freebsd.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_freebsd.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_pci.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_sbus.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_target.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_target.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_tpublic.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/ispvar.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/iwi/if_iwi.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/le/if_le_cbus.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/le/if_le_isa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/le/if_le_lebuffer.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/le/if_le_ledma.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/le/if_le_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/le/lance.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/le/lebuffer_sbus.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/mc146818/mc146818reg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfi_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/acphy.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/acphyreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/amphy.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/brgphy.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/exphy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/gentbi.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/inphy.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/lxtphy.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/mii.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/mii_physubr.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/miidevs#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/miivar.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/nsphy.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/rlphy.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/ruephy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/ukphy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt_cam.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mxge/if_mxge.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mxge/if_mxge_var.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pci.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pci_if.m#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pci_pci.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pci_private.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pcib_if.m#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pcib_private.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pcireg.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pcivar.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/re/if_re.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/si/si.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sk/if_sk.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/driver.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/ad1816.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/ess.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/mss.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/mss.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/sb.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/sb16.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/sb8.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/midi.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/midi.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/midiq.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/mpu401.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/mpu401.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/mpu_if.m#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/mpufoi_if.m#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/sequencer.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/sequencer.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/synth_if.m#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/es137x.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/hda/hdac_private.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/ac97_patch.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/ac97_patch.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/buffer.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/buffer.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/dsp.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/sound.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/vchan.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/sbus/cs4231.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/usb/uaudio_pcm.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/stge/if_stge.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sym/sym_hipd.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/syscons/scvesactl.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ti/if_ti.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/uart/uart_cpu.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/uart/uart_dev_sab82532.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/uart/uart_dev_z8530.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/uart/uart_kbd_sun.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_aue.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_auereg.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ubsa.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uhub.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uipaq.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/usb/ums.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usb_ethersubr.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usb_ethersubr.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usb_subr.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uvisor.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/fs/deadfs/dead_vnops.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/msdosfs/denode.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/fs/msdosfs/msdosfs_fat.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/msdosfs/msdosfs_vfsops.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/fs/msdosfs/msdosfs_vnops.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/fs/procfs/procfs.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/fs/udf/udf_vnops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/geom/eli/g_eli.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/geom/geom_apple.c#2 delete .. //depot/projects/trustedbsd/priv/sys/geom/geom_gpt.c#3 delete .. //depot/projects/trustedbsd/priv/sys/geom/geom_io.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/geom/geom_vfs.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/part/g_part.c#1 branch .. //depot/projects/trustedbsd/priv/sys/geom/part/g_part.h#1 branch .. //depot/projects/trustedbsd/priv/sys/geom/part/g_part_apm.c#1 branch .. //depot/projects/trustedbsd/priv/sys/geom/part/g_part_gpt.c#1 branch .. //depot/projects/trustedbsd/priv/sys/geom/part/g_part_if.m#1 branch .. //depot/projects/trustedbsd/priv/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/trustedbsd/priv/sys/i386/cpufreq/powernow.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/machdep.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/mptable_pci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/msi.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/nexus.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/include/clock.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/include/intr_machdep.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/include/pcpu.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/include/setjmp.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/isa/clock.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_machdep.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/i386/pci/pci_bus.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/conf/DEFAULTS#4 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/include/exec.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/include/floatingpoint.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/include/reloc.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/imgact_elf.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/init_main.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_acct.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_acl.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_conf.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_fork.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_idle.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_intr.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_kse.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_kthread.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_ktrace.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_mbuf.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_ntptime.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_prot.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_resource.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_sig.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_subr.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_switch.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_thr.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/sched_4bsd.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/sched_core.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/sched_ule.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_firmware.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_witness.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/tty_pts.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_mbuf.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_socket.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_bio.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_export.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/modules/Makefile#7 integrate .. //depot/projects/trustedbsd/priv/sys/modules/ath/Makefile#3 integrate .. //depot/projects/trustedbsd/priv/sys/modules/ath_rate_sample/Makefile#3 integrate .. //depot/projects/trustedbsd/priv/sys/modules/geom/Makefile#4 integrate .. //depot/projects/trustedbsd/priv/sys/modules/ip_mroute_mod/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/le/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/msdosfs/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/sound/driver/emu10kx/Makefile#3 integrate .. //depot/projects/trustedbsd/priv/sys/modules/uipaq/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/net/bpf.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/net/bpf_compat.h#2 delete .. //depot/projects/trustedbsd/priv/sys/net/bpfdesc.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/net/bridgestp.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_loop.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_tap.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_tun.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/_ieee80211.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_freebsd.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_input.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_node.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_proto.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netatalk/COPYRIGHT#2 integrate .. //depot/projects/trustedbsd/priv/sys/netatalk/aarp.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netatalk/aarp.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netatalk/at.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netatalk/at_extern.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netatalk/at_proto.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netatalk/at_rmx.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netatalk/at_var.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netatalk/ddp.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netatalk/ddp_input.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netatalk/ddp_output.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netatalk/ddp_pcb.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netatalk/ddp_pcb.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netatalk/ddp_usrreq.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netatalk/ddp_var.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_deflate.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_ppp.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_pptpgre.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_pred1.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_tcpmss.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/if_ether.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/in.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/in.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_carp.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_fw2.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_input.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_mroute.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_mroute.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_asconf.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_asconf.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_auth.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_bsd_addr.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_constants.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_crc32.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_crc32.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_indata.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_indata.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_input.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_os.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_os_bsd.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_output.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_output.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_pcb.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_peeloff.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_peeloff.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_structs.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_timer.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_timer.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_uio.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_var.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctputil.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctputil.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_input.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_output.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_syncache.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_var.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/ah_core.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/esp_aesctr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/icmp6.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/in6_cksum.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/nd6.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/sctp6_var.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/ipx.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/ipx.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/ipx_cksum.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/ipx_if.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/ipx_input.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/ipx_ip.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/ipx_ip.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/ipx_outputfl.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/ipx_pcb.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/ipx_pcb.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/ipx_proto.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/ipx_usrreq.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/ipx_var.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/spx.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/spx_debug.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/spx_debug.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/spx_timer.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/spx_usrreq.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/spx_var.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netnatm/natm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netnatm/natm.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netnatm/natm_pcb.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netnatm/natm_proto.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netsmb/smb_dev.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/nfs4client/nfs4_vfs_subs.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/nfs4client/nfs4_vfsops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_vfsops.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_vnops.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/pc98/cbus/clock.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/trustedbsd/priv/sys/pc98/pc98/machdep.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/pci/alpm.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/pci/amdpm.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/pci/amdsmb.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/pci/if_pcn.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/pci/if_rl.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/pci/intpm.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/pci/intpmreg.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/pci/nfsmb.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/pci/viapm.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/conf/DEFAULTS#4 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/conf/NOTES#3 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/include/ipl.h#2 delete .. //depot/projects/trustedbsd/priv/sys/powerpc/include/reloc.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/cpu.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/machdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_framework.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_inet.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_internal.h#8 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_label.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_pipe.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_policy.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_posix_sem.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_system.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_sysv_msg.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_sysv_sem.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_sysv_shm.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_vfs.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_bsdextended/mac_bsdextended.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_ifoff/mac_ifoff.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_lomac/mac_lomac.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_mls/mac_mls.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_none/mac_none.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_partition/mac_partition.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_portacl/mac_portacl.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_seeotheruids/mac_seeotheruids.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_test/mac_test.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/creator/creator.h#2 delete .. //depot/projects/trustedbsd/priv/sys/sparc64/creator/creator_upa.c#2 delete .. //depot/projects/trustedbsd/priv/sys/sparc64/include/bus.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/include/cache.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/include/frame.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/include/fsr.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/include/intr_machdep.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/include/ofw_nexus.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sparc64/include/pcb.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/include/reloc.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/include/setjmp.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/include/tsb.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/isa/isa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/pci/ofw_pci_if.m#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/pci/ofw_pcibus.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/pci/psycho.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/pci/psychoreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sbus/dma_sbus.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/bus_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/genassym.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/interrupt.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/mp_exception.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/mp_locore.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/ofw_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/support.S#4 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/swtch.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/upa.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/conf/.cvsignore#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/bus.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/frame.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/fsr.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/intr_machdep.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/pcb.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/reloc.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/setjmp.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/smp.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/utrap.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/bus_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/exception.S#4 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/hv_pci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/interrupt.S#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/intr_machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/mp_locore.S#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/mp_machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/support.S#4 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/swtch.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/tte.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/wbuf.S#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/_label.h#2 delete .. //depot/projects/trustedbsd/priv/sys/sys/apm.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sys/ata.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/buf.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/bufobj.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/conf.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/copyright.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/lock.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/mac.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/sys/mbuf.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/sys/param.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/sys/priority.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/proc.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/sys/rtprio.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/sys/runq.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/sched.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/socketvar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/systm.h#8 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_alloc.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_extern.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_rawread.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_vfsops.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ufs/quota.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_acl.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_quota.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_vnops.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/vm/swap_pager.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/vm/swap_pager.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/vm/uma.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/vm/uma_core.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_contig.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_glue.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_object.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_page.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_pageq.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_zeroidle.c#4 integrate Differences ... ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/identcpu.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.148 2006/08/01 01:23:39 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.149 2007/01/09 19:23:21 jkim Exp $"); #include "opt_cpu.h" @@ -228,8 +228,8 @@ "\007" "\010EST" /* Enhanced SpeedStep */ "\011TM2" /* Thermal Monitor 2 */ - "\012" - "\013CNTX-ID" /* L1 context ID available */ + "\012SSSE3" /* SSSE3 */ + "\013CNXT-ID" /* L1 context ID available */ "\014" "\015" "\016CX16" /* CMPXCHG16B Instruction */ ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/machdep.c#6 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.667 2006/12/20 04:40:38 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.669 2007/01/27 18:13:24 jkoshy Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1176,7 +1176,6 @@ * under witness. */ mutex_init(); - mtx_init(&clock_lock, "clk", NULL, MTX_SPIN); mtx_init(&icu_lock, "icu", NULL, MTX_SPIN | MTX_NOWITNESS); /* exceptions */ @@ -1184,7 +1183,7 @@ setidt(x, &IDTVEC(rsvd), SDT_SYSIGT, SEL_KPL, 0); setidt(IDT_DE, &IDTVEC(div), SDT_SYSIGT, SEL_KPL, 0); setidt(IDT_DB, &IDTVEC(dbg), SDT_SYSIGT, SEL_KPL, 0); - setidt(IDT_NMI, &IDTVEC(nmi), SDT_SYSIGT, SEL_KPL, 0); + setidt(IDT_NMI, &IDTVEC(nmi), SDT_SYSIGT, SEL_KPL, 1); setidt(IDT_BP, &IDTVEC(bpt), SDT_SYSIGT, SEL_UPL, 0); setidt(IDT_OF, &IDTVEC(ofl), SDT_SYSIGT, SEL_KPL, 0); setidt(IDT_BR, &IDTVEC(bnd), SDT_SYSIGT, SEL_KPL, 0); @@ -1207,6 +1206,12 @@ lidt(&r_idt); /* + * Initialize the i8254 before the console so that console + * initialization can use DELAY(). + */ + i8254_init(); + + /* * Initialize the console before we print anything out. */ cninit(); ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/mp_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.278 2006/10/10 23:23:11 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.281 2007/02/08 16:49:58 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -632,6 +632,8 @@ continue; if (cpu_info[apic_id].cpu_bsp) continue; + if (cpu_info[apic_id].cpu_disabled) + continue; /* Don't let hyperthreads service interrupts. */ if (hyperthreading_cpus > 1 && @@ -948,20 +950,15 @@ ipi_bitmap = atomic_readandclear_int(&cpu_ipi_pending[cpu]); -#ifdef IPI_PREEMPTION - if (ipi_bitmap & IPI_PREEMPT) { + if (ipi_bitmap & (1 << IPI_PREEMPT)) { + struct thread *running_thread = curthread; mtx_lock_spin(&sched_lock); - /* Don't preempt the idle thread */ - if (curthread->td_priority < PRI_MIN_IDLE) { - struct thread *running_thread = curthread; - if (running_thread->td_critnest > 1) - running_thread->td_owepreempt = 1; - else - mi_switch(SW_INVOL | SW_PREEMPT, NULL); - } + if (running_thread->td_critnest > 1) + running_thread->td_owepreempt = 1; + else + mi_switch(SW_INVOL | SW_PREEMPT, NULL); mtx_unlock_spin(&sched_lock); } -#endif /* Nothing to do for AST */ } ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/mptable_pci.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.6 2006/12/12 19:27:00 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.7 2007/01/22 21:48:42 jhb Exp $"); #include #include @@ -120,6 +120,7 @@ DEVMETHOD(pcib_alloc_msi, mptable_hostb_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), DEVMETHOD(pcib_alloc_msix, mptable_hostb_alloc_msix), + DEVMETHOD(pcib_remap_msix, pcib_remap_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), { 0, 0 } @@ -176,6 +177,7 @@ DEVMETHOD(pcib_alloc_msi, pcib_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), DEVMETHOD(pcib_alloc_msix, pcib_alloc_msix), + DEVMETHOD(pcib_remap_msix, pcib_remap_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), {0, 0} ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/msi.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.2 2006/11/15 18:40:00 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.3 2007/01/22 21:48:42 jhb Exp $"); #include #include @@ -480,6 +480,30 @@ } int +msix_remap(int index, int irq) +{ + struct msi_intsrc *msi; + + sx_xlock(&msi_sx); + msi = (struct msi_intsrc *)intr_lookup_source(irq); + if (msi == NULL) { + sx_xunlock(&msi_sx); + return (ENOENT); + } + + /* Make sure this is an MSI-X message. */ + if (!msi->msi_msix) { + sx_xunlock(&msi_sx); + return (EINVAL); + } + + KASSERT(msi->msi_dev != NULL, ("unowned message")); + msi->msi_index = index; + sx_xunlock(&msi_sx); + return (0); +} + +int msix_release(int irq) { struct msi_intsrc *msi; ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/nexus.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.70 2006/11/13 22:23:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.72 2007/01/22 21:48:42 jhb Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -105,6 +105,7 @@ static int nexus_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, int *irqs); static int nexus_release_msi(device_t pcib, device_t dev, int count, int *irqs); static int nexus_alloc_msix(device_t pcib, device_t dev, int index, int *irq); +static int nexus_remap_msix(device_t pcib, device_t dev, int index, int irq); static int nexus_release_msix(device_t pcib, device_t dev, int irq); static device_method_t nexus_methods[] = { @@ -135,6 +136,7 @@ DEVMETHOD(pcib_alloc_msi, nexus_alloc_msi), DEVMETHOD(pcib_release_msi, nexus_release_msi), DEVMETHOD(pcib_alloc_msix, nexus_alloc_msix), + DEVMETHOD(pcib_remap_msix, nexus_remap_msix), DEVMETHOD(pcib_release_msix, nexus_release_msix), { 0, 0 } @@ -371,24 +373,9 @@ * If this is a memory resource, map it into the kernel. */ if (rman_get_bustag(r) == AMD64_BUS_SPACE_MEM) { - caddr_t vaddr = 0; + void *vaddr; - if (rman_get_end(r) < 1024 * 1024) { - /* - * The first 1Mb is mapped at KERNBASE. - */ - vaddr = (caddr_t)(uintptr_t)(KERNBASE + rman_get_start(r)); - } else { - u_int64_t paddr; - u_int64_t psize; - u_int32_t poffs; - - paddr = rman_get_start(r); - psize = rman_get_size(r); - - poffs = paddr - trunc_page(paddr); - vaddr = (caddr_t) pmap_mapdev(paddr-poffs, psize+poffs) + poffs; - } + vaddr = pmap_mapdev(rman_get_start(r), rman_get_size(r)); rman_set_virtual(r, vaddr); rman_set_bushandle(r, (bus_space_handle_t) vaddr); } @@ -402,12 +389,9 @@ /* * If this is a memory resource, unmap it. */ - if ((rman_get_bustag(r) == AMD64_BUS_SPACE_MEM) && - (rman_get_end(r) >= 1024 * 1024)) { - u_int32_t psize; - - psize = rman_get_size(r); - pmap_unmapdev((vm_offset_t)rman_get_virtual(r), psize); + if (rman_get_bustag(r) == AMD64_BUS_SPACE_MEM) { + pmap_unmapdev((vm_offset_t)rman_get_virtual(r), + rman_get_size(r)); } return (rman_deactivate_resource(r)); @@ -528,6 +512,13 @@ } static int +nexus_remap_msix(device_t pcib, device_t dev, int index, int irq) +{ + + return (msix_remap(index, irq)); +} + +static int nexus_release_msix(device_t pcib, device_t dev, int irq) { ==== //depot/projects/trustedbsd/priv/sys/amd64/conf/GENERIC#5 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.471 2006/12/13 03:41:47 yongari Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.472 2007/02/07 18:55:29 marcel Exp $ cpu HAMMER ident GENERIC @@ -43,7 +43,7 @@ options CD9660 # ISO 9660 Filesystem options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework -options GEOM_GPT # GUID Partition Tables. +options GEOM_PART_GPT # GUID Partition Tables. options COMPAT_43TTY # BSD 4.3 TTY compat [KEEP THIS!] options COMPAT_IA32 # Compatible with i386 binaries options COMPAT_FREEBSD4 # Compatible with FreeBSD4 ==== //depot/projects/trustedbsd/priv/sys/amd64/include/clock.h#3 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.53 2006/10/02 12:59:55 phk Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.54 2007/01/23 08:01:19 bde Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -22,7 +22,8 @@ extern int timer0_max_count; extern uint64_t tsc_freq; extern int tsc_is_broken; -extern struct mtx clock_lock; + +void i8254_init(void); /* * Driver to clock driver interface. ==== //depot/projects/trustedbsd/priv/sys/amd64/include/gdb_machdep.h#2 (text+ko) ==== @@ -23,13 +23,13 @@ * (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/amd64/include/gdb_machdep.h,v 1.5 2006/04/04 03:00:20 marcel Exp $ + * $FreeBSD: src/sys/amd64/include/gdb_machdep.h,v 1.6 2007/02/05 21:48:32 jhb Exp $ */ #ifndef _MACHINE_GDB_MACHDEP_H_ #define _MACHINE_GDB_MACHDEP_H_ -#define GDB_BUFSZ 500 +#define GDB_BUFSZ (GDB_NREGS * 16) #define GDB_NREGS 56 #define GDB_REG_PC 16 ==== //depot/projects/trustedbsd/priv/sys/amd64/include/intr_machdep.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.13 2006/12/12 19:24:45 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.14 2007/01/22 21:48:42 jhb Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -152,6 +152,7 @@ void msi_init(void); int msi_release(int *irqs, int count); int msix_alloc(device_t dev, int index, int *irq, int *new); +int msix_remap(int index, int irq); int msix_release(int irq); #endif /* !LOCORE */ ==== //depot/projects/trustedbsd/priv/sys/amd64/include/md_var.h#2 (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/amd64/include/md_var.h,v 1.78 2006/06/19 22:36:01 davidxu Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.80 2007/01/18 05:46:32 rodrigc Exp $ */ #ifndef _MACHINE_MD_VAR_H_ ==== //depot/projects/trustedbsd/priv/sys/amd64/include/pcpu.h#2 (text+ko) ==== @@ -23,14 +23,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.44 2005/03/11 22:16:09 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.46 2007/02/06 18:04:02 bde Exp $ */ #ifndef _MACHINE_PCPU_H_ -#define _MACHINE_PCPU_H_ +#define _MACHINE_PCPU_H_ #ifndef _SYS_CDEFS_H_ -#error this file needs sys/cdefs.h as a prerequisite +#error "sys/cdefs.h is a prerequisite for this file" #endif #ifdef _KERNEL @@ -51,16 +51,15 @@ u_int pc_apic_id; \ u_int pc_acpi_id /* ACPI CPU id */ -#if defined(lint) - +#ifdef lint + extern struct pcpu *pcpup; - -#define PCPU_GET(member) (pcpup->pc_ ## member) -#define PCPU_PTR(member) (&pcpup->pc_ ## member) -#define PCPU_SET(member,value) (pcpup->pc_ ## member = (value)) - -#elif defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE___TYPEOF) \ - && defined(__GNUCLIKE___OFFSETOF) + +#define PCPU_GET(member) (pcpup->pc_ ## member) +#define PCPU_PTR(member) (&pcpup->pc_ ## member) +#define PCPU_SET(member, val) (pcpup->pc_ ## member = (val)) + +#elif defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE___TYPEOF) /* * Evaluates to the byte offset of the per-cpu variable name. @@ -92,69 +91,39 @@ * Evaluates to the value of the per-cpu variable name. */ #define __PCPU_GET(name) __extension__ ({ \ - __pcpu_type(name) __result; \ + __pcpu_type(name) __res; \ + struct __s { \ + u_char __b[MIN(sizeof(__pcpu_type(name)), 8)]; \ + } __s; \ \ - if (sizeof(__result) == 1) { \ - u_char __b; \ - __asm __volatile("movb %%gs:%1,%0" \ - : "=r" (__b) \ - : "m" (*(u_char *)(__pcpu_offset(name)))); \ - __result = *(__pcpu_type(name) *)&__b; \ - } else if (sizeof(__result) == 2) { \ - u_short __w; \ - __asm __volatile("movw %%gs:%1,%0" \ - : "=r" (__w) \ - : "m" (*(u_short *)(__pcpu_offset(name)))); \ - __result = *(__pcpu_type(name) *)&__w; \ - } else if (sizeof(__result) == 4) { \ - u_int __i; \ - __asm __volatile("movl %%gs:%1,%0" \ - : "=r" (__i) \ - : "m" (*(u_int *)(__pcpu_offset(name)))); \ - __result = *(__pcpu_type(name) *)&__i; \ - } else if (sizeof(__result) == 8) { \ - u_long __l; \ - __asm __volatile("movq %%gs:%1,%0" \ - : "=r" (__l) \ - : "m" (*(u_long *)(__pcpu_offset(name)))); \ - __result = *(__pcpu_type(name) *)&__l; \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 12 16:45:35 2007 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 8CB2B16A47E; Mon, 12 Feb 2007 16:45:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4B47816A46B for ; Mon, 12 Feb 2007 16:45:35 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3881213C491 for ; Mon, 12 Feb 2007 16:45:35 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1CGjZbK047995 for ; Mon, 12 Feb 2007 16:45:35 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1CGjY4R047990 for perforce@freebsd.org; Mon, 12 Feb 2007 16:45:34 GMT (envelope-from piso@freebsd.org) Date: Mon, 12 Feb 2007 16:45:34 GMT Message-Id: <200702121645.l1CGjY4R047990@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 114415 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, 12 Feb 2007 16:45:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=114415 Change 114415 by piso@piso_newluxor on 2007/02/12 16:45:25 Max packet size affects only user land side of libalias. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_ftp.c#18 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_ftp.c#18 (text+ko) ==== @@ -105,9 +105,12 @@ fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) { - if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL || - ah->maxpktsize == 0) + if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL) + return (-1); +#ifndef _KERNEL + if (ah->maxpktsize == 0) return (-1); +#endif if (ntohs(*ah->dport) == FTP_CONTROL_PORT_NUMBER || ntohs(*ah->sport) == FTP_CONTROL_PORT_NUMBER) return (0); From owner-p4-projects@FreeBSD.ORG Mon Feb 12 16:48:40 2007 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 67FD416A408; Mon, 12 Feb 2007 16:48:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2539E16A400 for ; Mon, 12 Feb 2007 16:48:40 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 106F413C4B6 for ; Mon, 12 Feb 2007 16:48:40 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1CGmdNV056297 for ; Mon, 12 Feb 2007 16:48:39 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1CGmdPU056293 for perforce@freebsd.org; Mon, 12 Feb 2007 16:48:39 GMT (envelope-from piso@freebsd.org) Date: Mon, 12 Feb 2007 16:48:39 GMT Message-Id: <200702121648.l1CGmdPU056293@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 114416 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, 12 Feb 2007 16:48:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=114416 Change 114416 by piso@piso_newluxor on 2007/02/12 16:48:14 Maxpacket size affetcs only the user land side of libalias. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#18 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#18 (text+ko) ==== @@ -90,9 +90,12 @@ fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) { - if (ah->dport == NULL || ah->dport == NULL || ah->lnk == NULL || - ah->maxpktsize == 0) + if (ah->dport == NULL || ah->dport == NULL || ah->lnk == NULL) + return (-1); +#ifndef _KERNEL + if (ah->maxpktsize == 0) return (-1); +#endif if (ntohs(*ah->dport) == IRC_CONTROL_PORT_NUMBER_1 || ntohs(*ah->dport) == IRC_CONTROL_PORT_NUMBER_2) return (0); From owner-p4-projects@FreeBSD.ORG Tue Feb 13 13:40:02 2007 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 4322D16A402; Tue, 13 Feb 2007 13:40:02 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 16E5E16A400 for ; Tue, 13 Feb 2007 13:40:02 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 03B6013C47E for ; Tue, 13 Feb 2007 13:40:02 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1DDe1jr030097 for ; Tue, 13 Feb 2007 13:40:01 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1DDe1LB030094 for perforce@freebsd.org; Tue, 13 Feb 2007 13:40:01 GMT (envelope-from zec@FreeBSD.org) Date: Tue, 13 Feb 2007 13:40:01 GMT Message-Id: <200702131340.l1DDe1LB030094@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 114450 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, 13 Feb 2007 13:40:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=114450 Change 114450 by zec@zec_tinderbox on 2007/02/13 13:39:56 Fix compilation problems with options gif anod nooptions INET6. Affected files ... .. //depot/projects/vimage/src/sys/netinet/in_gif.c#4 edit .. //depot/projects/vimage/src/sys/netinet/in_gif.h#3 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#9 edit .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#6 edit .. //depot/projects/vimage/src/sys/netinet/vinet.h#10 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/in_gif.c#4 (text+ko) ==== @@ -86,7 +86,7 @@ }; #ifndef VIMAGE -static int ip_gif_ttl; +int ip_gif_ttl; #endif SYSCTL_V_INT(V_NET, vnet_gif, _net_inet_ip, IPCTL_GIF_TTL, gifttl, CTLFLAG_RW, ip_gif_ttl, 0, ""); ==== //depot/projects/vimage/src/sys/netinet/in_gif.h#3 (text+ko) ==== @@ -35,6 +35,9 @@ #define GIF_TTL 30 +#ifndef VIMAGE +extern int ip_gif_ttl; +#endif struct gif_softc; void in_gif_input(struct mbuf *, int); int in_gif_output(struct ifnet *, int, struct mbuf *); ==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#9 (text+ko) ==== @@ -307,13 +307,14 @@ SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, dyn_keepalive, CTLFLAG_RW, dyn_keepalive, 0, "Enable keepalives for dyn. rules"); +#ifndef VIMAGE +static int fw_deny_unknown_exthdrs; +#endif + #ifdef INET6 /* * IPv6 specific variables */ -#ifndef VIMAGE -static int fw_deny_unknown_exthdrs; -#endif SYSCTL_DECL(_net_inet6_ip6); SYSCTL_NODE(_net_inet6_ip6, OID_AUTO, fw, CTLFLAG_RW | CTLFLAG_SECURE, ==== //depot/projects/vimage/src/sys/netinet/tcp_input.c#6 (text+ko) ==== @@ -443,7 +443,9 @@ int off0; { INIT_VNET_INET(curvnetb); +#ifdef INET6 INIT_VNET_INET6(curvnetb); +#endif register struct tcphdr *th; register struct ip *ip = NULL; register struct ipovly *ipov; ==== //depot/projects/vimage/src/sys/netinet/vinet.h#10 (text+ko) ==== @@ -104,8 +104,6 @@ int _rtq_timeout; struct callout _rtq_timer; - - int _ip_gif_ttl; }; extern struct vnet_inet vnet_inet_0; @@ -169,6 +167,4 @@ #define V_rtq_timeout VNET_INET(rtq_timeout) #define V_rtq_timer VNET_INET(rtq_timer) -#define V_ip_gif_ttl VNET_INET(ip_gif_ttl) - #endif /* !_NETINET_VINET_H_ */ From owner-p4-projects@FreeBSD.ORG Tue Feb 13 13:42:05 2007 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 B278516A407; Tue, 13 Feb 2007 13:42:05 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7EF7C16A400 for ; Tue, 13 Feb 2007 13:42:05 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6A5DC13C4AA for ; Tue, 13 Feb 2007 13:42:05 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1DDg5RW030988 for ; Tue, 13 Feb 2007 13:42:05 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1DDg4bu030984 for perforce@freebsd.org; Tue, 13 Feb 2007 13:42:04 GMT (envelope-from zec@FreeBSD.org) Date: Tue, 13 Feb 2007 13:42:04 GMT Message-Id: <200702131342.l1DDg4bu030984@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 114451 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, 13 Feb 2007 13:42:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=114451 Change 114451 by zec@zec_tca51 on 2007/02/13 13:41:31 Iterate through all vnets in tcp_drain() and in_rtqdrain(). Affected files ... .. //depot/projects/vimage/src/sys/netinet/igmp.c#7 edit .. //depot/projects/vimage/src/sys/netinet/in_rmx.c#4 edit .. //depot/projects/vimage/src/sys/netinet/ip_input.c#8 edit .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#8 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#10 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/igmp.c#7 (text+ko) ==== @@ -464,7 +464,7 @@ IGMP_PRINTF("[igmp.c,_slowtimo] -- > entering \n"); mtx_lock(&igmp_mtx); VNETB_ITERLOOP_BEGIN() - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(vnetb_iter); SLIST_FOREACH(rti, &V_router_info_head, rti_list) { if (rti->rti_type == IGMP_V1_ROUTER) { rti->rti_time++; ==== //depot/projects/vimage/src/sys/netinet/in_rmx.c#4 (text+ko) ==== @@ -319,7 +319,8 @@ void in_rtqdrain(void) { - INIT_VNET_NET(curvnetb); + VNETB_ITERLOOP_BEGIN(); + INIT_VNET_NET(vnetb_iter); struct radix_node_head *rnh = V_rt_tables[AF_INET]; struct rtqk_arg arg; @@ -331,6 +332,7 @@ RADIX_NODE_HEAD_LOCK(rnh); rnh->rnh_walktree(rnh, in_rtqkill, &arg); RADIX_NODE_HEAD_UNLOCK(rnh); + VNETB_ITERLOOP_END(); } /* ==== //depot/projects/vimage/src/sys/netinet/ip_input.c#8 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#8 (text+ko) ==== @@ -635,7 +635,7 @@ int i; VNETB_ITERLOOP_BEGIN() - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(vnetb_iter); if (V_tcp_hostcache.purgeall) { all = 1; V_tcp_hostcache.purgeall = 0; ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#10 (text+ko) ==== @@ -887,7 +887,8 @@ void tcp_drain(void) { - INIT_VNET_INET(curvnetb); + VNETB_ITERLOOP_BEGIN(); + INIT_VNET_INET(vnetb_iter); if (do_tcpdrain) { struct inpcb *inpb; @@ -922,6 +923,8 @@ } INP_INFO_RUNLOCK(&V_tcbinfo); } + + VNETB_ITERLOOP_END(); } /* From owner-p4-projects@FreeBSD.ORG Tue Feb 13 14:54:36 2007 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 9D7EB16A408; Tue, 13 Feb 2007 14:54:36 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3B09E16A407 for ; Tue, 13 Feb 2007 14:54:36 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2FC9B13C478 for ; Tue, 13 Feb 2007 14:54:36 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1DEsaqA043210 for ; Tue, 13 Feb 2007 14:54:36 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1DEsZI6043207 for perforce@freebsd.org; Tue, 13 Feb 2007 14:54:35 GMT (envelope-from sephe@FreeBSD.org) Date: Tue, 13 Feb 2007 14:54:35 GMT Message-Id: <200702131454.l1DEsZI6043207@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 114452 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, 13 Feb 2007 14:54:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=114452 Change 114452 by sephe@sephe_zealot:sam_wifi on 2007/02/13 14:54:08 For DLT_IEEE802_11 / DLT_IEEE802_11_RADIO packet injection, "header complete" option has a side effect: It will change sa_family to non-AF_IEEE80211, thus ieee80211_output() will fallback to ether_output(), but the buffers injected are actually an 802.11 MAC frames. So ignore "header complete" option if sa_family is AF_IEEE80211. Affected files ... .. //depot/projects/wifi/sys/net/bpf.c#21 edit Differences ... ==== //depot/projects/wifi/sys/net/bpf.c#21 (text+ko) ==== @@ -623,7 +623,7 @@ if (error) return (error); - if (d->bd_hdrcmplt) + if (d->bd_hdrcmplt && dst.sa_family != AF_IEEE80211) dst.sa_family = pseudo_AF_HDRCMPLT; #ifdef MAC From owner-p4-projects@FreeBSD.ORG Tue Feb 13 15:00:44 2007 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 A582116A478; Tue, 13 Feb 2007 15:00:44 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7405916A476 for ; Tue, 13 Feb 2007 15:00:44 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 68ECB13C4B3 for ; Tue, 13 Feb 2007 15:00:44 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1DF0iP5043544 for ; Tue, 13 Feb 2007 15:00:44 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1DF0ih5043541 for perforce@freebsd.org; Tue, 13 Feb 2007 15:00:44 GMT (envelope-from sephe@FreeBSD.org) Date: Tue, 13 Feb 2007 15:00:44 GMT Message-Id: <200702131500.l1DF0ih5043541@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 114453 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, 13 Feb 2007 15:00:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=114453 Change 114453 by sephe@sephe_zealot:sam_wifi on 2007/02/13 15:00:22 - Avoid 'goto' within 'switch' statement. - Strip trailing white space. - Correct two typos, which leads to possible NULL dereference. Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#83 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#83 (text+ko) ==== @@ -2467,6 +2467,7 @@ u_int16_t capinfo, lintval; struct ieee80211_rsnparms rsnparms; u_int8_t reason; + int badwparsn; if (ic->ic_opmode != IEEE80211_M_HOSTAP || ic->ic_state != IEEE80211_S_RUN) { @@ -2549,20 +2550,22 @@ return; } /* assert right association security credentials */ + badwparsn = 0; switch (ic->ic_flags & IEEE80211_F_WPA) { case IEEE80211_F_WPA1: if (wpa == NULL) - goto badwparsn; + badwparsn = 1; break; case IEEE80211_F_WPA2: if (rsn == NULL) - goto badwparsn; + badwparsn = 1; break; case IEEE80211_F_WPA1|IEEE80211_F_WPA2: - if (wpa != NULL || rsn != NULL) - break; - /* fall thru... */ - badwparsn: + if (wpa == NULL && rsn == NULL) + badwparsn = 1; + break; + } + if (badwparsn) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC | IEEE80211_MSG_WPA, "[%s] no WPA/RSN IE in association request\n", @@ -2572,7 +2575,7 @@ IEEE80211_REASON_RSN_REQUIRED); ieee80211_node_leave(ic, ni); ic->ic_stats.is_rx_assoc_badwpaie++; - return; + return; } if (wpa != NULL || rsn != NULL) { /* @@ -2586,7 +2589,7 @@ if (wpa != NULL) reason = ieee80211_parse_wpa(ic, wpa, &rsnparms, wh); else - reason = ieee80211_parse_rsn(ic, wpa, &rsnparms, wh); + reason = ieee80211_parse_rsn(ic, rsn, &rsnparms, wh); if (reason != 0) { IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_DEAUTH, reason); @@ -2673,7 +2676,7 @@ */ ni->ni_rsn = rsnparms; ieee80211_saveie(&ni->ni_rsn_ie, rsn); - } else if (ni->ni_wpa_ie != NULL) { + } else if (ni->ni_rsn_ie != NULL) { /* * Flush any state from a previous association. */ From owner-p4-projects@FreeBSD.ORG Tue Feb 13 16:16:20 2007 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 98FF116A401; Tue, 13 Feb 2007 16:16:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 552AE16A420 for ; Tue, 13 Feb 2007 16:16:20 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 32FDB13C48E for ; Tue, 13 Feb 2007 16:16:20 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1DGGKhI064061 for ; Tue, 13 Feb 2007 16:16:20 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1DGGJIX064058 for perforce@freebsd.org; Tue, 13 Feb 2007 16:16:19 GMT (envelope-from piso@freebsd.org) Date: Tue, 13 Feb 2007 16:16:19 GMT Message-Id: <200702131616.l1DGGJIX064058@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 114456 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, 13 Feb 2007 16:16:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=114456 Change 114456 by piso@piso_newluxor on 2007/02/13 16:15:24 Make irc module (almost) groks mbuf: unfortunately, using a normal mbuf was too much of a pain with the current code, so i had to resort to a contiguous buffer of memory. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#19 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#19 (text+ko) ==== @@ -170,6 +170,9 @@ struct ip *pip; struct tcphdr *tc; int i; /* Iterator through the source */ +#ifdef _KERNEL + char mpkt[65536]; +#endif /* Calculate data length of TCP packet */ PULLUP_TCPHDR(pip, ptr); @@ -188,9 +191,34 @@ return; /* Place string pointer at beginning of data */ - // XXX broken +#ifdef _KERNEL + /* + * XXX first we copy the entire mbuf chain content (minus ip+tcp hdr) + * into a contiguos buffer of memory and later, when we've finished + * to operate on the buffer, we copy back buffer's content into + * the mbuf. + * In case the copy operations are too expensive, we could avoid + * one using the mbuf as the contiguos buffer of memory: + * + * o pkt < MHLEN: pullup the entire pkt in the mbuf data sect + * o MHLEN < pkt < 2k: use a normal mbuf cluster + * o 2k < pkt < 4k: use a 4k mbuf cluster (jumbo) + * o 4k < pkt < 9k: use a 9k mbuf cluster (jumbo9) + * o 9k < pkt < 16k: use a 16k mbuf cluster (jumbo16) + * o pkt > 16k: use mpkt buffer (worst case) + * + * WATCH OUT: pkt could grow, so beware of boundaries in case + * an mbuf/mbuf cluster is used, check maxsize. + */ + + // XXX so far only the worst case is implemented... + m_copydata(*ptr, hlen, m_length(*ptr, NULL), mpkt); + sptr = mpkt; + maxsize = 65536; /* size of mpkt */ +#else sptr = (char *)pip; sptr += hlen; +#endif maxsize -= hlen; /* We're interested in maximum size of * data, not packet */ @@ -433,6 +461,9 @@ lPACKET_DONE: iCopy = iCopy > maxsize - copyat ? maxsize - copyat : iCopy; memcpy(sptr + copyat, newpacket, iCopy); +#ifdef _KERNEL + m_copyback(*ptr, hlen, iCopy + copyat, sptr); +#endif /* Save information regarding modified seq and ack numbers */ { From owner-p4-projects@FreeBSD.ORG Wed Feb 14 01:40:08 2007 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 C9ACA16A407; Wed, 14 Feb 2007 01:40:07 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6725716A402 for ; Wed, 14 Feb 2007 01:40:07 +0000 (UTC) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4DADF13C481 for ; Wed, 14 Feb 2007 01:40:07 +0000 (UTC) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1E1e7lB096480 for ; Wed, 14 Feb 2007 01:40:07 GMT (envelope-from adamartin@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1E1e6F6096477 for perforce@freebsd.org; Wed, 14 Feb 2007 01:40:06 GMT (envelope-from adamartin@FreeBSD.org) Date: Wed, 14 Feb 2007 01:40:06 GMT Message-Id: <200702140140.l1E1e6F6096477@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to adamartin@FreeBSD.org using -f From: Adam Martin To: Perforce Change Reviews Cc: Subject: PERFORCE change 114464 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, 14 Feb 2007 01:40:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=114464 Change 114464 by adamartin@adamartin_hobbes on 2007/02/14 01:39:33 Fixed panics on mount, mostly. TemplateFS seems to be complete now, but for accurately placing the lookup interceptor. Mount_autofs checks if the device is named "autofs", to avoid panics, on mounting non autofs devices. Added a makefile to the "root" dir, but forgot to make it work. (Will fix in next submission.) Affected files ... .. //depot/projects/soc2006/adamartin_autofs/Makefile#4 add .. //depot/projects/soc2006/adamartin_autofs/autofs/Makefile#8 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs.h#10 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_ctl.c#10 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_ctl.h#8 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_tfsops.c#4 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_types.h#5 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_user.h#1 add .. //depot/projects/soc2006/adamartin_autofs/autofs/protocol.c#9 edit .. //depot/projects/soc2006/adamartin_autofs/mount_autofs/mount_autofs.c#3 edit .. //depot/projects/soc2006/adamartin_autofs/templatefs/templatefs.c#4 edit .. //depot/projects/soc2006/adamartin_autofs/templatefs/templatefs.h#3 edit .. //depot/projects/soc2006/adamartin_autofs/templatefs/templatefs_vnops.c#2 edit Differences ... ==== //depot/projects/soc2006/adamartin_autofs/autofs/Makefile#8 (text+ko) ==== @@ -27,7 +27,7 @@ AUTOFS_DEV_SOURCE=autofs_ctl.c autofs_dev.c -AUTOFS_FS_SOURCE=autofs_tfsops.c vnode_if.h +AUTOFS_FS_SOURCE=autofs_tfsops.c autofs_tfsinit.c vnode_if.h AUTOFS_CORE_SOURCE=autofs.c protocol.c AUTOFS_SUPPORT_SOURCE=autofs_subr.c SRCS=$(AUTOFS_CORE_SOURCE) $(AUTOFS_FS_SOURCE) $(AUTOFS_DEV_SOURCE) $(AUTOFS_SUPPORT_SOURCE) ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs.h#10 (text+ko) ==== ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs_ctl.c#10 (text+ko) ==== @@ -181,7 +181,7 @@ */ device= make_dev( devsw, num, UID_ROOT, GID_WHEEL, 0600, - "autofs%d", num ); + AUTOFS_DEV_FORMAT"%d", num ); /* Possible race? Locking the device? */ /* How to lock it? */ @@ -196,6 +196,7 @@ buffers->this_instance= instance; ti->ti_priv= (void *) instance; device->si_priv= (struct cdev_priv *) instance; + instance->templatefs_info= ti; /* * Don't deallocate the resources -- ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs_ctl.h#8 (text+ko) ==== @@ -48,6 +48,7 @@ #include #include +#include "autofs_user.h" ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs_tfsops.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006 + * Copyright (c) 2006,2007 * Adam Martin, Erez Zadok. All rights reserved. * * This code is derived from software in FreeBSD, and 4.4BSD. @@ -57,26 +57,25 @@ #include "../templatefs/templatefs.h" #include +#include + #include "protocol.h" #include "debug.h" #include "autofs_ctl.h" #include "autofs_dev.h" +#include "autofs_templatefs.h" -MALLOC_DEFINE( M_AUTOFS_MOUNTBUF, "AutoFS mntbuf", - "AutoFS mountpoint data, to simulate filesystem contents."); -struct tfs_node *foo; - -static int +int autofs_vis( TFS_VIS_ARGS ) { KPRINTF( "autofs visibility called\n" ); return 0; } -static int +int autofs_attr( TFS_ATTR_ARGS ) { KPRINTF( "autofs attr called\n" ); @@ -99,7 +98,7 @@ } -static int +int autofs_lookup( TFS_LOOKUP_ARGS ) { struct componentname c= *cnp; @@ -110,16 +109,18 @@ autofs_instance_t *instance; autofs_dev_bufs_t *buffers; + DEBUG1 EPRINTF( "autofs lookup called\n" ); ti= tn->tn_info; - instance= AUTOFS_GET_INSTANCE( NODE, tn ); - buffers= AUTOFS_GET_BUFFERS( NODE, tn ); + DEBUG1 EPRINTF( "Templatefs info: %p\n", ti ); + + instance= AUTOFS_GET_INSTANCE( ROOT, ti ); + buffers= AUTOFS_GET_BUFFERS( ROOT, ti ); - DEBUG1 KPRINTF( "autofs lookup called\n" ); - DEBUG7 KPRINTF( "cn_nameptr= %s, cn_pnbuf= %s\n", c.cn_nameptr, + DEBUG7 EPRINTF( "cn_nameptr= %s, cn_pnbuf= %s\n", c.cn_nameptr, c.cn_pnbuf ); - DEBUG7 KPRINTF( "cn_namelen= %ld, cn_consume= %ld\n", c.cn_namelen, + DEBUG7 EPRINTF( "cn_namelen= %ld, cn_consume= %ld\n", c.cn_namelen, c.cn_consume ); /* Prepare a mount message */ @@ -132,6 +133,11 @@ mr.mountpoint_len= c.cn_namelen; strlcpy( mr.mountpoint, c.cn_nameptr, c.cn_namelen ); + if( strcmp( mr.mountpoint, ".." ) ) + { + return 0; + } + /* Take a lock and if it's not taken yet fire off the request. */ //if( take_autofs_lock( instance, node ) ) @@ -143,100 +149,3 @@ } -static int -autofs_mount_handler( TFS_MOUNT_HANDLER_ARGS ) -{ - struct vnode *devvp; - struct cdev *dev; - struct nameidata nd; - struct nameidata *ndp; - int error; - char *dev_name; - int dev_name_len; - struct vfsoptlist *opts; - - error= 0; - - ndp= &nd; - opts= mp->mnt_optnew; - - error= vfs_getopt( opts, MNT_DEVICE, (void **) &dev_name, - &dev_name_len ); - - if( !error && dev_name[ dev_name_len - 1 ] != '\0' ) - { - return ( EINVAL ); - } - - NDINIT( ndp, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE, dev_name, td ); - if( ( error= namei( ndp ) ) ) - { - return ( error ); - } - NDFREE( ndp, NDF_ONLY_PNBUF ); - devvp= ndp->ni_vp; - - /** Take the lock here, and get the struct cdev out of it, and use the - private data there, to assign the instance. **/ - - dev= devvp->v_rdev; - - /** Now we have the dev object. Work with it. **/ - - ti->ti_priv= (void *) AUTOFS_GET_INSTANCE( DEV, dev ); - - return error; -} - -static int -autofs_init(struct tfs_info *ti, struct vfsconf *vfc) -{ - struct vnode *devvp; - struct cdev *dev; - struct nameidata nd, *ndp= &nd; - struct thread *td; - int error; - - td= curthread; - - - /** Get the fake device vnode from name **/ - - NDINIT( ndp, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE, ti->ti_name, td ); - if( ( error= namei( ndp ) ) != 0 ) - { - return error; - } - NDFREE( ndp, NDF_ONLY_PNBUF ); - devvp= ndp->ni_vp; - - /** Verify that the vnode is a device **/ - if( devvp->v_type != VCHR ) - { - panic( "Can't mount from non-char device for Autofs!\n" ); - } - - /* Get out the cdev object, and store in the private field for the - pfs_info object (I think we need to release the vnode too!)*/ - - dev= devvp->v_rdev; - ti->ti_priv= (void *) dev; - VOP_UNLOCK( devvp, LK_RELEASE, td ); - - - /** Make some fake files... **/ - - foo= tfs_create_dir( ti->ti_root, "foo", autofs_attr, autofs_vis, 0 ); - foo->tn_lookup= autofs_lookup; - return 0; -} - - -static int -autofs_uninit(struct tfs_info *ti, struct vfsconf *vfc) -{ - return 0; -} - - -TEMPLATEFS( autofs, AUTOFS_VERSION, autofs_mount_handler ); ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs_types.h#5 (text+ko) ==== @@ -43,8 +43,8 @@ -/* This is needed as there's no true private field on pfs_node */ -#define pn_priv pn_data +/* This is needed as there's no true private field on tfs_node */ +#define tn_priv tn_data struct autofs_instance @@ -58,6 +58,8 @@ transactions **/ autofs_protocol_state_t *protocol_state; + struct tfs_info *templatefs_info; + void *extensions; }; @@ -74,7 +76,7 @@ int state; unsigned long long int flags; - struct pfs_node *mount_file; /* The pn_priv field points to + struct tfs_node *mount_file; /* The pn_priv field points to the autofs mount structure */ int timeout; /* Timeout in seconds */ @@ -149,7 +151,7 @@ E.G.: AUTOFS_GET_TXNS( DEV, autofs_cdevsw ) one can get: - BUFFERS, DEV, TXNS, INSTANCE, PROTOCOL + BUFFERS, DEV, TXNS, INSTANCE, PROTOCOL, ROOT ****************************************************************************/ @@ -173,6 +175,10 @@ ( (struct autofs_protocol_state *) ( AUTOFS_GET_INSTANCE( TYPE, \ __datum__ )->protocol_state ) ) +#define AUTOFS_GET_ROOT( TYPE, __datum__ )\ + ( (struct tfs_info *) ( AUTOFS_GET_INSTANCE( TYPE, \ + __datum__ )->templatefs_info ) ) + #define AUTOFS_DEV_GET_INSTANCE( dev )\ ( ( dev )->si_priv ) @@ -189,7 +195,7 @@ #define AUTOFS_PROTOCOL_GET_INSTANCE( protocol )\ ( ( protocol )->instance ) -#define AUTOFS_BUFFERS_GET_INSTANCE( protocol )\ - ( ( protocol )->this_instance ) +#define AUTOFS_BUFFERS_GET_INSTANCE( buffers )\ + ( ( buffers )->this_instance ) #endif /*** __AUTOFS_TYPES_H__ ***/ ==== //depot/projects/soc2006/adamartin_autofs/autofs/protocol.c#9 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006 + * Copyright (c) 2006,2007 * Adam Martin, Erez Zadok. All rights reserved. * * This code is derived from software in FreeBSD, and 4.4BSD. @@ -87,7 +87,7 @@ * XXX: FIXME: This is a big nasty. (ADAM) * This parses input from the data buffers (queues), * and dispatches out the results to complete command handlers. - * This could DEFINATELY be fixed up by somebody at some point. + * This could DEFINITELY be fixed up by somebody at some point. */ void @@ -206,10 +206,11 @@ static void command_dispatch( autofs_protocol_state_t *protocol ) { - autofs_instance_t *instance; - int cnt; + autofs_instance_t *instance; + int cnt; + - cnt= 0; + cnt= 0; instance= AUTOFS_GET_INSTANCE( PROTOCOL, protocol ); if( protocol->bytes_read < protocol->max_bytes_to_read ) ==== //depot/projects/soc2006/adamartin_autofs/mount_autofs/mount_autofs.c#3 (text+ko) ==== @@ -57,6 +57,8 @@ #include "mntopts.h" +#include "../autofs/autofs_user.h" + #define FSTYPE "autofs" #define FSTYPE_HANDLE "fstype" @@ -93,6 +95,14 @@ strcpy(target, argv[1]); (void)checkpath(argv[2], source); + if( strncmp( "/dev/"AUTOFS_DEV_FORMAT, target, + strlen( "/dev/"AUTOFS_DEV_FORMAT ) ) ) + { + fprintf( stderr, "Not an autofs device!\n" ); + return 2; + } + + iov[0].iov_base = FSTYPE_HANDLE; iov[0].iov_len = strlen(FSTYPE_HANDLE) + 1; iov[1].iov_base = FSTYPE; ==== //depot/projects/soc2006/adamartin_autofs/templatefs/templatefs.c#4 (text+ko) ==== @@ -75,6 +75,9 @@ #include "templatefs.h" #include "templatefs_internal.h" +#define FREEBSD_SYS +#include "../autofs/debug.h" + static MALLOC_DEFINE(M_TFSNODES, "tfs_nodes", "templatefs nodes"); MALLOC_DECLARE(M_TFSINFO); @@ -294,18 +297,33 @@ * Mount a templatefs instance */ int -tfs_mount(struct tfs_info *ti, struct mount *mp, struct thread *td) +tfs_mount(struct tfs_info *global_ti, struct mount *mp, struct thread *td) { struct statfs *sbp; + struct tfs_info *ti; + DEBUG EPRINTF( "TFS_MOUNT: tfs_info is %llx\n", + (unsigned long long int) global_ti ); + if (mp->mnt_flag & MNT_UPDATE) return (EOPNOTSUPP); + + if (global_ti->ti_mount_handler == NULL) + panic("Need a mount handler for templatefs!\n"); + + /* Tell the instance to do its thing, and also get the ti from them */ + ti= global_ti->ti_mount_handler(global_ti, mp, td); + + if (ti == NULL) + panic("Unable to get templatefs instance data!\n"); + mp->mnt_flag |= MNT_LOCAL; mp->mnt_data = (qaddr_t)ti; vfs_getnewfsid(mp); sbp = &mp->mnt_stat; + /** Make the mounted from be according to the ti of the instance */ vfs_mountedfrom(mp, ti->ti_name); sbp->f_bsize = PAGE_SIZE; sbp->f_iosize = PAGE_SIZE; @@ -315,9 +333,11 @@ sbp->f_files = 1; sbp->f_ffree = 0; + /** Create the root vnode, for use by vfs_root(8) **/ + + + /** Mount intercept handler, by ADAM **/ - if( ti->ti_mount_handler != NULL ) - ti->ti_mount_handler( ti, mp, td ); return (0); } @@ -335,6 +355,13 @@ /* XXX do stuff with pi... */ + /* + * ADAM -- FIXME: need to get the specific ti instance data. + * Maybe implementors need their own tfs_unmount too? + * What are we using ti for? Can we unmount on the in-use filesystem? + * (What happens if AMD is still using the afs devices?) + */ + error = vflush(mp, 0, (mntflags & MNT_FORCE) ? FORCECLOSE : 0, td); return (error); } @@ -348,9 +375,23 @@ /** ADAM: TODO: Make this handle multiple clients of the same type **/ struct tfs_info *ti; + int rv; + + //printf("Entered tfs_root()\n"); + //printf("Getting mount data...\n"); ti = (struct tfs_info *)mp->mnt_data; - return tfs_vncache_alloc(mp, vpp, ti->ti_root, NO_PID); + //printf("Returning templatefs root: %llx\n", (unsigned long long int) ti->ti_root); + + if( ti->ti_root == NULL ) + { + return 0; + } + + rv = tfs_vncache_alloc(mp, vpp, ti->ti_root, NO_PID); + + //printf("Returning templatefs root: %llx\n", (unsigned long long int) *vpp); + return rv; } /* @@ -375,6 +416,7 @@ struct tfs_info *ti; int error; + printf("Entered tfs_create_instance()\n"); error= 0; /* Insulate against returning free'd memory in case of error. */ @@ -421,6 +463,8 @@ /* struct tfs_node *root; */ int error; + printf("tfs_init called...\n"); + error = 0; mtx_init(&ti->ti_mutex, "templatefs", NULL, MTX_DEF); ==== //depot/projects/soc2006/adamartin_autofs/templatefs/templatefs.h#3 (text+ko) ==== @@ -56,8 +56,8 @@ * $FreeBSD: src/sys/fs/pseudofs/pseudofs.h,v 1.30 2005/03/24 07:36:15 jeff Exp $ */ -#ifndef _PSEUDOFS_H_INCLUDED -#define _PSEUDOFS_H_INCLUDED +#ifndef _TEMPLATE_H_INCLUDED +#define _TEMPLATE_H_INCLUDED /* * Opaque structures @@ -123,10 +123,10 @@ * Mount callback (ADAM) */ #define TFS_MOUNT_HANDLER_ARGS \ - struct tfs_info *ti, struct mount *mp, struct thread *td + struct tfs_info *global_ti, struct mount *mp, struct thread *td #define TFS_MOUNT_HANDLER_PROTO(name) \ - int name(TFS_MOUNT_HANDLER_ARGS); -typedef int (*tfs_mount_handler_t)(TFS_MOUNT_HANDLER_ARGS); + struct tfs_info *name(TFS_MOUNT_HANDLER_ARGS); +typedef struct tfs_info *(*tfs_mount_handler_t)(TFS_MOUNT_HANDLER_ARGS); /* * Filler callback @@ -296,9 +296,9 @@ /* * Now for some initialization magic... - * (call with mount_func == NULL, should you not need a mount function.) + * Must have a non-NULL mount_func. Failure to do so causes panics. */ -#define TEMPLATEFS(name, version, mount_func) \ +#define TEMPLATEFS(name, version, mount_func) \ \ static struct tfs_info name##_info = { \ .ti_name= #name, \ @@ -306,15 +306,17 @@ .ti_uninit= name##_uninit, \ .ti_mount_handler= mount_func, \ }; \ -/* FIXME: Drop this (tfs_mount): */ \ +/* TODO: Perhaps handle this differently? (passes global tfs_info) */ \ static int \ -_##name##_mount(struct mount *mp, struct thread *td) { \ +_##name##_mount(struct mount *mp, struct thread *td) \ +{ \ return tfs_mount(&name##_info, mp, td); \ } \ \ static int \ _##name##_init(struct vfsconf *vfc) { \ - return tfs_init(&name##_info, vfc); \ + /*return tfs_init(&name##_info, vfc);*/ \ + return 0; \ } \ \ static int \ ==== //depot/projects/soc2006/adamartin_autofs/templatefs/templatefs_vnops.c#2 (text+ko) ==== @@ -453,11 +453,14 @@ // LOOKUP_ENABLE (to drop this whole section change // to /*) if (td->tn_lookup != 0) + { + printf( "Calling templatefs lookup handler...\n" ); #ifdef USE_TFSRETURN_ON_LOOKUP_CALLBACK TFS_RETURN (td->tn_lookup(curthread, pfind(pid), td, cnp)); #else td->tn_lookup(curthread, pfind(pid), td, cnp); #endif + } /**/ From owner-p4-projects@FreeBSD.ORG Wed Feb 14 01:42:10 2007 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 8E37316A402; Wed, 14 Feb 2007 01:42:10 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6765216A400 for ; Wed, 14 Feb 2007 01:42:10 +0000 (UTC) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5A17213C491 for ; Wed, 14 Feb 2007 01:42:10 +0000 (UTC) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1E1gA2I097369 for ; Wed, 14 Feb 2007 01:42:10 GMT (envelope-from adamartin@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1E1gAmN097364 for perforce@freebsd.org; Wed, 14 Feb 2007 01:42:10 GMT (envelope-from adamartin@FreeBSD.org) Date: Wed, 14 Feb 2007 01:42:10 GMT Message-Id: <200702140142.l1E1gAmN097364@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to adamartin@FreeBSD.org using -f From: Adam Martin To: Perforce Change Reviews Cc: Subject: PERFORCE change 114465 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, 14 Feb 2007 01:42:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=114465 Change 114465 by adamartin@adamartin_hobbes on 2007/02/14 01:41:34 Forgot some files. Also fixed makefile. Affected files ... .. //depot/projects/soc2006/adamartin_autofs/Makefile#5 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_templatefs.h#1 add .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_tfsinit.c#1 add Differences ... ==== //depot/projects/soc2006/adamartin_autofs/Makefile#5 (text+ko) ==== @@ -1,14 +1,12 @@ -# @(#)Makefile 8.3 (Berkeley) 3/27/94 -# $FreeBSD: src/sbin/mount_nullfs/Makefile,v 1.11 2004/02/23 20:13:54 johan Exp $ -PROG= mount_autofs -SRCS= mount_autofs.c getmntopts.c -MAN= mount_autofs.8 +all: + cd templatefs; make + cd autofs; make + cd mount_autofs; make + cd afsconfig; make -MOUNT= /usr/src/sbin/mount -CFLAGS+=-I${MOUNT} -WARNS?= 0 - -.PATH: ${MOUNT} - -.include +clean: + cd templatefs; make clean + cd autofs; make clean + cd mount_autofs; make clean + cd afsconfig; make clean From owner-p4-projects@FreeBSD.ORG Wed Feb 14 09:39:18 2007 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 C995716A468; Wed, 14 Feb 2007 09:39:17 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8257116A420 for ; Wed, 14 Feb 2007 09:39:17 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7024213C471 for ; Wed, 14 Feb 2007 09:39:17 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1E9dHkQ097364 for ; Wed, 14 Feb 2007 09:39:17 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1E9dFq0097361 for perforce@freebsd.org; Wed, 14 Feb 2007 09:39:15 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 14 Feb 2007 09:39:15 GMT Message-Id: <200702140939.l1E9dFq0097361@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 114478 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, 14 Feb 2007 09:39:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=114478 Change 114478 by rdivacky@rdivacky_witten on 2007/02/14 09:38:49 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC#9 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/cpufunc.c#5 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/db_interface.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/mem.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/sys_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/if_ate.c#6 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/if_npe.c#5 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#9 edit .. //depot/projects/linuxolator/src/sys/conf/NOTES#18 integrate .. //depot/projects/linuxolator/src/sys/conf/files#18 integrate .. //depot/projects/linuxolator/src/sys/conf/options#17 integrate .. //depot/projects/linuxolator/src/sys/dev/aac/aac.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bge.c#12 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bgereg.h#10 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_pci.c#10 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/brgphy.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/brgphyreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/rlphy.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci.c#16 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ubsa.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/linuxolator/src/sys/fs/cd9660/TODO#1 branch .. //depot/projects/linuxolator/src/sys/fs/cd9660/TODO.hibler#1 branch .. //depot/projects/linuxolator/src/sys/fs/cd9660/cd9660_bmap.c#1 branch .. //depot/projects/linuxolator/src/sys/fs/cd9660/cd9660_iconv.c#1 branch .. //depot/projects/linuxolator/src/sys/fs/cd9660/cd9660_lookup.c#1 branch .. //depot/projects/linuxolator/src/sys/fs/cd9660/cd9660_mount.h#1 branch .. //depot/projects/linuxolator/src/sys/fs/cd9660/cd9660_node.c#1 branch .. //depot/projects/linuxolator/src/sys/fs/cd9660/cd9660_node.h#1 branch .. //depot/projects/linuxolator/src/sys/fs/cd9660/cd9660_rrip.c#1 branch .. //depot/projects/linuxolator/src/sys/fs/cd9660/cd9660_rrip.h#1 branch .. //depot/projects/linuxolator/src/sys/fs/cd9660/cd9660_util.c#1 branch .. //depot/projects/linuxolator/src/sys/fs/cd9660/cd9660_vfsops.c#1 branch .. //depot/projects/linuxolator/src/sys/fs/cd9660/cd9660_vnops.c#1 branch .. //depot/projects/linuxolator/src/sys/fs/cd9660/iso.h#1 branch .. //depot/projects/linuxolator/src/sys/fs/cd9660/iso_rrip.h#1 branch .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_vfsops.c#8 integrate .. //depot/projects/linuxolator/src/sys/geom/part/g_part_if.m#2 integrate .. //depot/projects/linuxolator/src/sys/i386/conf/GENERIC#7 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/mp_machdep.c#6 integrate .. //depot/projects/linuxolator/src/sys/ia64/conf/GENERIC#5 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/linuxolator/src/sys/isofs/cd9660/TODO#2 delete .. //depot/projects/linuxolator/src/sys/isofs/cd9660/TODO.hibler#2 delete .. //depot/projects/linuxolator/src/sys/isofs/cd9660/cd9660_bmap.c#2 delete .. //depot/projects/linuxolator/src/sys/isofs/cd9660/cd9660_iconv.c#2 delete .. //depot/projects/linuxolator/src/sys/isofs/cd9660/cd9660_lookup.c#2 delete .. //depot/projects/linuxolator/src/sys/isofs/cd9660/cd9660_mount.h#2 delete .. //depot/projects/linuxolator/src/sys/isofs/cd9660/cd9660_node.c#2 delete .. //depot/projects/linuxolator/src/sys/isofs/cd9660/cd9660_node.h#3 delete .. //depot/projects/linuxolator/src/sys/isofs/cd9660/cd9660_rrip.c#2 delete .. //depot/projects/linuxolator/src/sys/isofs/cd9660/cd9660_rrip.h#2 delete .. //depot/projects/linuxolator/src/sys/isofs/cd9660/cd9660_util.c#2 delete .. //depot/projects/linuxolator/src/sys/isofs/cd9660/cd9660_vfsops.c#4 delete .. //depot/projects/linuxolator/src/sys/isofs/cd9660/cd9660_vnops.c#2 delete .. //depot/projects/linuxolator/src/sys/isofs/cd9660/iso.h#2 delete .. //depot/projects/linuxolator/src/sys/isofs/cd9660/iso_rrip.h#2 delete .. //depot/projects/linuxolator/src/sys/kern/Make.tags.inc#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_ktrace.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_sig.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_switch.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/sched_ule.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_usrreq.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_mount.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_vnops.c#5 integrate .. //depot/projects/linuxolator/src/sys/modules/cd9660/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/cd9660_iconv/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/geom/Makefile#4 integrate .. //depot/projects/linuxolator/src/sys/modules/ip_mroute_mod/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/net/if_loop.c#3 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/in_proto.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_mroute.c#7 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_mroute.h#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_asconf.c#7 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_auth.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_auth.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_constants.h#6 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_crc32.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_indata.c#7 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_input.c#7 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_os.h#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_os_bsd.h#6 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_output.c#7 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_pcb.c#7 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_peeloff.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_structs.h#7 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_timer.c#5 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_uio.h#5 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_usrreq.c#7 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_var.h#5 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctputil.c#7 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctputil.h#6 integrate .. //depot/projects/linuxolator/src/sys/netinet6/icmp6.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet6/sctp6_usrreq.c#7 integrate .. //depot/projects/linuxolator/src/sys/netsmb/smb_dev.c#2 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/nfs_socket.c#5 integrate .. //depot/projects/linuxolator/src/sys/nfsserver/nfs_serv.c#4 integrate .. //depot/projects/linuxolator/src/sys/pc98/conf/GENERIC#6 integrate .. //depot/projects/linuxolator/src/sys/powerpc/conf/GENERIC#6 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/machdep.c#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac_biba/mac_biba.c#7 integrate .. //depot/projects/linuxolator/src/sys/sparc64/conf/GENERIC#6 integrate .. //depot/projects/linuxolator/src/sys/sun4v/conf/GENERIC#7 integrate .. //depot/projects/linuxolator/src/sys/sys/runq.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/systm.h#7 integrate .. //depot/projects/linuxolator/src/sys/ufs/ufs/ufs_vnops.c#8 integrate .. //depot/projects/linuxolator/src/sys/vm/uma.h#4 integrate .. //depot/projects/linuxolator/src/sys/vm/uma_core.c#6 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_page.c#8 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_zeroidle.c#6 integrate Differences ... ==== //depot/projects/linuxolator/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.280 2007/01/23 08:38:39 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.281 2007/02/08 16:49:58 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -632,6 +632,8 @@ continue; if (cpu_info[apic_id].cpu_bsp) continue; + if (cpu_info[apic_id].cpu_disabled) + continue; /* Don't let hyperthreads service interrupts. */ if (hyperthreading_cpus > 1 && ==== //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC#9 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.472 2007/02/07 18:55:29 marcel Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.473 2007/02/09 19:03:17 brooks Exp $ cpu HAMMER ident GENERIC @@ -44,6 +44,7 @@ options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework options GEOM_PART_GPT # GUID Partition Tables. +options GEOM_LABEL # Provides labelization options COMPAT_43TTY # BSD 4.3 TTY compat [KEEP THIS!] options COMPAT_IA32 # Compatible with i386 binaries options COMPAT_FREEBSD4 # Compatible with FreeBSD4 ==== //depot/projects/linuxolator/src/sys/arm/arm/busdma_machdep.c#3 (text+ko) ==== @@ -29,10 +29,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.28 2007/01/17 00:53:05 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.29 2007/02/13 07:19:26 kevlo Exp $"); /* - * MacPPC bus dma support routines + * ARM bus dma support routines */ #define _ARM32_BUS_DMA_PRIVATE ==== //depot/projects/linuxolator/src/sys/arm/arm/cpufunc.c#5 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.15 2006/11/30 23:34:07 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.16 2007/02/11 22:24:54 cognet Exp $"); #include #include @@ -58,6 +58,7 @@ #include #include +#include #include #include @@ -799,7 +800,7 @@ cpu_reset_needs_v4_MMU_disable = 0; get_cachetype_cp15(); pmap_pte_init_generic(); - return 0; + goto out; } #endif #ifdef CPU_ARM8 @@ -809,7 +810,7 @@ cpu_reset_needs_v4_MMU_disable = 0; /* XXX correct? */ get_cachetype_cp15(); pmap_pte_init_arm8(); - return 0; + goto out; } #endif /* CPU_ARM8 */ #ifdef CPU_ARM9 @@ -829,7 +830,7 @@ #else pmap_pte_init_generic(); #endif - return 0; + goto out; } #endif /* CPU_ARM9 */ #ifdef CPU_ARM10 @@ -849,7 +850,7 @@ arm10_dcache_index_inc = 1U << (32 - arm_dcache_l2_assoc); arm10_dcache_index_max = 0U - arm10_dcache_index_inc; pmap_pte_init_generic(); - return 0; + goto out; } #endif /* CPU_ARM10 */ #ifdef CPU_SA110 @@ -858,7 +859,7 @@ cpu_reset_needs_v4_MMU_disable = 1; /* SA needs it */ get_cachetype_table(); pmap_pte_init_sa1(); - return 0; + goto out; } #endif /* CPU_SA110 */ #ifdef CPU_SA1100 @@ -870,7 +871,7 @@ /* Use powersave on this CPU. */ cpu_do_powersave = 1; - return 0; + goto out; } #endif /* CPU_SA1100 */ #ifdef CPU_SA1110 @@ -882,7 +883,7 @@ /* Use powersave on this CPU. */ cpu_do_powersave = 1; - return 0; + goto out; } #endif /* CPU_SA1110 */ #ifdef CPU_IXP12X0 @@ -891,7 +892,7 @@ cpu_reset_needs_v4_MMU_disable = 1; get_cachetype_table(); pmap_pte_init_sa1(); - return 0; + goto out; } #endif /* CPU_IXP12X0 */ #ifdef CPU_XSCALE_80200 @@ -948,7 +949,7 @@ cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */ get_cachetype_cp15(); pmap_pte_init_xscale(); - return 0; + goto out; } #endif /* CPU_XSCALE_80200 */ #if defined(CPU_XSCALE_80321) || defined(CPU_XSCALE_80219) @@ -975,7 +976,7 @@ cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */ get_cachetype_cp15(); pmap_pte_init_xscale(); - return 0; + goto out; } #endif /* CPU_XSCALE_80321 */ @@ -989,7 +990,7 @@ cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */ get_cachetype_cp15(); pmap_pte_init_xscale(); - return 0; + goto out; } #endif /* CPU_XSCALE_81342 */ #ifdef CPU_XSCALE_PXA2X0 @@ -1009,7 +1010,7 @@ /* Use powersave on this CPU. */ cpu_do_powersave = 1; - return 0; + goto out; } #endif /* CPU_XSCALE_PXA2X0 */ #ifdef CPU_XSCALE_IXP425 @@ -1025,7 +1026,7 @@ get_cachetype_cp15(); pmap_pte_init_xscale(); - return 0; + goto out; } #endif /* CPU_XSCALE_IXP425 */ /* @@ -1033,6 +1034,9 @@ */ panic("No support for this CPU type (%08x) in kernel", cputype); return(ARCHITECTURE_NOT_PRESENT); +out: + uma_set_align(arm_dcache_align_mask); + return (0); } /* ==== //depot/projects/linuxolator/src/sys/arm/arm/db_interface.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/db_interface.c,v 1.5 2005/06/23 11:38:47 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/db_interface.c,v 1.6 2007/02/14 01:25:41 kevlo Exp $"); #include "opt_ddb.h" #include @@ -109,7 +109,7 @@ *valp = get_stackptr(PSR_UND32_MODE); return (1); } - return(0); + return (0); } int @@ -120,7 +120,7 @@ *valp = get_stackptr(PSR_ABT32_MODE); return (1); } - return(0); + return (0); } int @@ -131,7 +131,7 @@ *valp = get_stackptr(PSR_IRQ32_MODE); return (1); } - return(0); + return (0); } int db_frame(struct db_variable *vp, db_expr_t *valp, int rw) @@ -146,7 +146,7 @@ *valp = *reg; else *reg = *valp; - return(1); + return (1); } void @@ -339,4 +339,3 @@ panic("branch_taken: botch"); } } - ==== //depot/projects/linuxolator/src/sys/arm/arm/machdep.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.23 2006/05/15 10:40:37 benno Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.25 2007/02/14 04:41:28 kevlo Exp $"); #include #include @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include @@ -106,26 +107,38 @@ ksiginfo_t *ksi; sigset_t *mask; { - struct thread *td = curthread; - struct proc *p = td->td_proc; - struct trapframe *tf = td->td_frame; + struct thread *td; + struct proc *p; + struct trapframe *tf; struct sigframe *fp, frame; - struct sigacts *psp = td->td_proc->p_sigacts; + struct sigacts *psp; int onstack; int sig; int code; - onstack = sigonstack(td->td_frame->tf_usr_sp); - + td = curthread; + p = td->td_proc; + PROC_LOCK_ASSERT(p, MA_OWNED); sig = ksi->ksi_signo; code = ksi->ksi_code; - if ((td->td_flags & TDP_ALTSTACK) && - !(onstack) && - SIGISMEMBER(td->td_proc->p_sigacts->ps_sigonstack, sig)) { - fp = (void*)(td->td_sigstk.ss_sp + td->td_sigstk.ss_size); + psp = p->p_sigacts; + mtx_assert(&psp->ps_mtx, MA_OWNED); + tf = td->td_frame; + onstack = sigonstack(tf->tf_usr_sp); + + CTR4(KTR_SIG, "sendsig: td=%p (%s) catcher=%p sig=%d", td, p->p_comm, + catcher, sig); + + /* Allocate and validate space for the signal handler context. */ + if ((td->td_flags & TDP_ALTSTACK) != 0 && !(onstack) && + SIGISMEMBER(psp->ps_sigonstack, sig)) { + fp = (struct sigframe *)(td->td_sigstk.ss_sp + + td->td_sigstk.ss_size); +#if defined(COMPAT_43) td->td_sigstk.ss_flags |= SS_ONSTACK; +#endif } else - fp = (void*)td->td_frame->tf_usr_sp; + fp = (struct sigframe *)td->td_frame->tf_usr_sp; /* make room on the stack */ fp--; @@ -133,18 +146,27 @@ /* make the stack aligned */ fp = (struct sigframe *)STACKALIGN(fp); /* Populate the siginfo frame. */ + get_mcontext(td, &frame.sf_uc.uc_mcontext, 0); frame.sf_si = ksi->ksi_info; frame.sf_uc.uc_sigmask = *mask; - frame.sf_uc.uc_link = NULL; - frame.sf_uc.uc_flags = (td->td_pflags & TDP_ALTSTACK ) + frame.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK ) ? ((onstack) ? SS_ONSTACK : 0) : SS_DISABLE; frame.sf_uc.uc_stack = td->td_sigstk; - memset(&frame.sf_uc.uc_stack, 0, sizeof(frame.sf_uc.uc_stack)); - get_mcontext(td, &frame.sf_uc.uc_mcontext, 0); + mtx_unlock(&psp->ps_mtx); PROC_UNLOCK(td->td_proc); - mtx_unlock(&psp->ps_mtx); - if (copyout(&frame, (void*)fp, sizeof(frame)) != 0) + + /* Copy the sigframe out to the user's stack. */ + if (copyout(&frame, fp, sizeof(*fp)) != 0) { + /* Process has trashed its stack. Kill it. */ + CTR2(KTR_SIG, "sendsig: sigexit td=%p fp=%p", td, fp); + PROC_LOCK(p); sigexit(td, SIGILL); + } + + /* Translate the signal if appropriate. */ + if (p->p_sysent->sv_sigtbl && sig <= p->p_sysent->sv_sigsize) + sig = p->p_sysent->sv_sigtbl[_SIG_IDX(sig)]; + /* * Build context to run handler in. We invoke the handler * directly, only returning via the trampoline. Note the @@ -153,15 +175,19 @@ */ tf->tf_r0 = sig; - tf->tf_r1 = (int)&fp->sf_si; - tf->tf_r2 = (int)&fp->sf_uc; + tf->tf_r1 = (register_t)&fp->sf_si; + tf->tf_r2 = (register_t)&fp->sf_uc; /* the trampoline uses r5 as the uc address */ - tf->tf_r5 = (int)&fp->sf_uc; - tf->tf_pc = (int)catcher; - tf->tf_usr_sp = (int)fp; - tf->tf_usr_lr = (int)(PS_STRINGS - *(p->p_sysent->sv_szsigcode)); - PROC_LOCK(td->td_proc); + tf->tf_r5 = (register_t)&fp->sf_uc; + tf->tf_pc = (register_t)catcher; + tf->tf_usr_sp = (register_t)fp; + tf->tf_usr_lr = (register_t)(PS_STRINGS - *(p->p_sysent->sv_szsigcode)); + + CTR3(KTR_SIG, "sendsig: return td=%p pc=%#x sp=%#x", td, tf->tf_usr_lr, + tf->tf_usr_sp); + + PROC_LOCK(p); mtx_lock(&psp->ps_mtx); } ==== //depot/projects/linuxolator/src/sys/arm/arm/mem.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/mem.c,v 1.4 2006/08/15 16:43:07 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/mem.c,v 1.5 2007/02/13 15:35:57 cognet Exp $"); /* * Memory special file @@ -92,8 +92,21 @@ continue; } if (minor(dev) == CDEV_MINOR_MEM) { + int i; + int address_valid = 0; + v = uio->uio_offset; v &= ~PAGE_MASK; + for (i = 0; dump_avail[i] || dump_avail[i + 1]; + i += 2) { + if (v >= dump_avail[i] && + v < dump_avail[i + 1]) { + address_valid = 1; + break; + } + } + if (!address_valid) + return (EINVAL); pmap_kenter((vm_offset_t)_tmppt, v); o = (int)uio->uio_offset & PAGE_MASK; c = (u_int)(PAGE_SIZE - ((int)iov->iov_base & PAGE_MASK)); ==== //depot/projects/linuxolator/src/sys/arm/arm/sys_machdep.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/sys_machdep.c,v 1.4 2005/02/25 22:56:16 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/sys_machdep.c,v 1.5 2007/02/14 01:25:41 kevlo Exp $"); #include #include @@ -68,7 +68,7 @@ cpu_icache_sync_range(ua.addr, ua.len); td->td_retval[0] = 0; - return(0); + return (0); } static int @@ -78,7 +78,7 @@ td->td_retval[0] = 0; cpu_drain_writebuf(); - return(0); + return (0); } static int @@ -108,7 +108,6 @@ case ARM_SYNC_ICACHE : error = arm32_sync_icache(td, uap->parms); break; - case ARM_DRAIN_WRITEBUF : error = arm32_drain_writebuf(td, uap->parms); break; @@ -124,4 +123,3 @@ } return (error); } - ==== //depot/projects/linuxolator/src/sys/arm/at91/if_ate.c#6 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.16 2007/02/03 07:46:26 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.18 2007/02/10 15:43:57 mlaier Exp $"); #include #include @@ -146,7 +146,7 @@ static void ate_deactivate(device_t dev); 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 int ate_get_mac(struct ate_softc *sc, u_char *eaddr); static void ate_set_mac(struct ate_softc *sc, u_char *eaddr); /* @@ -179,7 +179,6 @@ sc->use_rmii = (RD4(sc, ETH_CFG) & ETH_CFG_RMII) == ETH_CFG_RMII; - /*Sysctls*/ sctx = device_get_sysctl_ctx(dev); soid = device_get_sysctl_tree(dev); @@ -191,7 +190,10 @@ ATE_LOCK_INIT(sc); callout_init_mtx(&sc->tick_ch, &sc->sc_mtx, 0); - ate_get_mac(sc, eaddr); + if ((err = ate_get_mac(sc, eaddr)) != 0) { + device_printf(dev, "No MAC address set"); + goto out; + } ate_set_mac(sc, eaddr); sc->ifp = ifp = if_alloc(IFT_ETHER); @@ -211,7 +213,7 @@ ifp->if_init = ateinit; ifp->if_baudrate = 10000000; IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); - ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; IFQ_SET_READY(&ifp->if_snd); ifp->if_timer = 0; ifp->if_linkmib = &sc->mibdata; @@ -582,24 +584,27 @@ } -static void +static int ate_get_mac(struct ate_softc *sc, u_char *eaddr) { - uint32_t low, high; + uint32_t low, high; - /* - * The boot loader setup the MAC with an address, if one is set in - * the loader. The TSC loader will also set the MAC address in a - * similar way. Grab the MAC address from the SA1[HL] registers. - */ - low = RD4(sc, ETH_SA1L); - high = RD4(sc, ETH_SA1H); - eaddr[0] = (high >> 8) & 0xff; - eaddr[1] = high & 0xff; - eaddr[2] = (low >> 24) & 0xff; - eaddr[3] = (low >> 16) & 0xff; - eaddr[4] = (low >> 8) & 0xff; - eaddr[5] = low & 0xff; + /* + * The boot loader setup the MAC with an address, if one is set in + * the loader. The TSC loader will also set the MAC address in a + * similar way. Grab the MAC address from the SA1[HL] registers. + */ + low = RD4(sc, ETH_SA1L); + high = RD4(sc, ETH_SA1H); + if ((low | (high & 0xffff)) == 0) + return (ENXIO); + eaddr[0] = (high >> 8) & 0xff; + eaddr[1] = high & 0xff; + eaddr[2] = (low >> 24) & 0xff; + eaddr[3] = (low >> 16) & 0xff; + eaddr[4] = (low >> 8) & 0xff; + eaddr[5] = low & 0xff; + return (0); } static void ==== //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/if_npe.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.4 2007/02/03 07:46:26 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.5 2007/02/10 15:43:58 mlaier Exp $"); /* * Intel XScale NPE Ethernet driver. @@ -330,7 +330,7 @@ ifp->if_ioctl = npeioctl; ifp->if_init = npeinit; IFQ_SET_MAXLEN(&ifp->if_snd, sc->txdma.nbuf - 1); - ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; IFQ_SET_READY(&ifp->if_snd); ifp->if_linkmib = &sc->mibdata; ifp->if_linkmiblen = sizeof(sc->mibdata); ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#9 (text+ko) ==== @@ -308,7 +308,8 @@ * as the number of retries, so any large number will * be ok. */ - op_ret += futex_wake(f2, 0x7fffffff, NULL); + op_ret += futex_wake(f2, (int) (unsigned long) args->timeout, NULL); +// op_ret += futex_wake(f2, 0xffffffff, NULL); ret += op_ret; } futex_put(f2); ==== //depot/projects/linuxolator/src/sys/conf/NOTES#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1409 2007/02/07 18:55:29 marcel Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1410 2007/02/10 13:59:13 bms Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -807,11 +807,8 @@ # Internet family options: # # MROUTING enables the kernel multicast packet forwarder, which works -# with mrouted(8). +# with mrouted and XORP. # -# PIM enables Protocol Independent Multicast in the kernel. -# Requires MROUTING enabled. -# # IPFIREWALL enables support for IP firewall construction, in # conjunction with the `ipfw' program. IPFIREWALL_VERBOSE sends # logged packets to the system logger. IPFIREWALL_VERBOSE_LIMIT @@ -854,7 +851,6 @@ # using the trpt(8) utility. # options MROUTING # Multicast routing -options PIM # Protocol Independent Multicast options IPFIREWALL #firewall options IPFIREWALL_VERBOSE #enable logging to syslogd(8) options IPFIREWALL_VERBOSE_LIMIT=100 #limit verbosity ==== //depot/projects/linuxolator/src/sys/conf/files#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1175 2007/02/07 18:55:29 marcel Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1176 2007/02/11 14:01:32 rodrigc Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1305,14 +1305,14 @@ isa/orm.c optional isa isa/pnp.c optional isa isapnp isa/pnpparse.c optional isa isapnp -isofs/cd9660/cd9660_bmap.c optional cd9660 -isofs/cd9660/cd9660_lookup.c optional cd9660 -isofs/cd9660/cd9660_node.c optional cd9660 -isofs/cd9660/cd9660_rrip.c optional cd9660 -isofs/cd9660/cd9660_util.c optional cd9660 -isofs/cd9660/cd9660_vfsops.c optional cd9660 -isofs/cd9660/cd9660_vnops.c optional cd9660 -isofs/cd9660/cd9660_iconv.c optional cd9660_iconv +fs/cd9660/cd9660_bmap.c optional cd9660 +fs/cd9660/cd9660_lookup.c optional cd9660 +fs/cd9660/cd9660_node.c optional cd9660 +fs/cd9660/cd9660_rrip.c optional cd9660 +fs/cd9660/cd9660_util.c optional cd9660 +fs/cd9660/cd9660_vfsops.c optional cd9660 +fs/cd9660/cd9660_vnops.c optional cd9660 +fs/cd9660/cd9660_iconv.c optional cd9660_iconv kern/bus_if.m standard kern/clock_if.m optional genclock kern/cpufreq_if.m standard ==== //depot/projects/linuxolator/src/sys/conf/options#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.575 2007/02/07 18:55:29 marcel Exp $ +# $FreeBSD: src/sys/conf/options,v 1.576 2007/02/10 13:59:13 bms Exp $ # # On the handling of kernel options # @@ -352,7 +352,6 @@ ETHER_8022 opt_ef.h ETHER_SNAP opt_ef.h MROUTING opt_mrouting.h -PIM opt_mrouting.h INET opt_inet.h INET6 opt_inet6.h IPSEC opt_ipsec.h ==== //depot/projects/linuxolator/src/sys/dev/aac/aac.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.118 2006/04/08 06:05:29 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.119 2007/02/14 09:10:37 luoqi Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -2982,7 +2982,7 @@ switch (event->ev_type) { case AAC_EVENT_CMFREE: mtx_lock(&sc->aac_io_lock); - if (aac_alloc_command(sc, (struct aac_command **)arg) == 0) { + if (aac_alloc_command(sc, (struct aac_command **)arg)) { aac_add_event(sc, event); mtx_unlock(&sc->aac_io_lock); return; ==== //depot/projects/linuxolator/src/sys/dev/ata/ata-chipset.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.180 2007/02/03 20:12:00 rink Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.181 2007/02/12 17:17:31 sos Exp $"); #include "opt_ata.h" #include @@ -315,9 +315,8 @@ /* clear SATA error register */ ATA_IDX_OUTL(ch, ATA_SERROR, ATA_IDX_INL(ch, ATA_SERROR)); - /* find out what type device we got poll for spec'd 31 seconds */ + /* poll 31 seconds for device ready */ /* XXX SOS 10 secs for now as I have little patience */ - ch->devices = 0; for (timeout = 0; timeout < 1000; timeout++) { if (ATA_IDX_INB(ch, ATA_STATUS) & ATA_S_BUSY) DELAY(10000); @@ -326,16 +325,9 @@ } if (bootverbose) device_printf(ch->dev, "SATA connect ready time=%dms\n", timeout * 10); - if (timeout < 1000) { - if ((ATA_IDX_INB(ch, ATA_CYL_LSB) == ATAPI_MAGIC_LSB) && - (ATA_IDX_INB(ch, ATA_CYL_MSB) == ATAPI_MAGIC_MSB)) - ch->devices = ATA_ATAPI_MASTER; - else - ch->devices = ATA_ATA_MASTER; - } - if (bootverbose) - device_printf(ch->dev, "sata_connect devices=0x%b\n", - ch->devices, "\20\3ATAPI_MASTER\1ATA_MASTER"); + + /* do a reset and find out what type device we've got */ + ata_generic_reset(ch->dev); return 1; } ==== //depot/projects/linuxolator/src/sys/dev/bge/if_bge.c#12 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.173 2007/01/15 21:43:43 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.176 2007/02/12 23:58:52 jkim Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -111,8 +111,8 @@ #include -#define BGE_CSUM_FEATURES (CSUM_IP | CSUM_TCP | CSUM_UDP) -#define ETHER_MIN_NOPAD (ETHER_MIN_LEN - ETHER_CRC_LEN) /* i.e., 60 */ +#define BGE_CSUM_FEATURES (CSUM_IP | CSUM_TCP | CSUM_UDP) +#define ETHER_MIN_NOPAD (ETHER_MIN_LEN - ETHER_CRC_LEN) /* i.e., 60 */ MODULE_DEPEND(bge, pci, 1, 1, 1); MODULE_DEPEND(bge, ether, 1, 1, 1); @@ -286,11 +286,11 @@ { 0, NULL } }; -#define BGE_IS_JUMBO_CAPABLE(sc) ((sc)->bge_flags & BGE_FLAG_JUMBO) -#define BGE_IS_5700_FAMILY(sc) ((sc)->bge_flags & BGE_FLAG_5700_FAMILY) -#define BGE_IS_5705_PLUS(sc) ((sc)->bge_flags & BGE_FLAG_5705_PLUS) -#define BGE_IS_5714_FAMILY(sc) ((sc)->bge_flags & BGE_FLAG_5714_FAMILY) -#define BGE_IS_575X_PLUS(sc) ((sc)->bge_flags & BGE_FLAG_575X_PLUS) +#define BGE_IS_JUMBO_CAPABLE(sc) ((sc)->bge_flags & BGE_FLAG_JUMBO) +#define BGE_IS_5700_FAMILY(sc) ((sc)->bge_flags & BGE_FLAG_5700_FAMILY) +#define BGE_IS_5705_PLUS(sc) ((sc)->bge_flags & BGE_FLAG_5705_PLUS) +#define BGE_IS_5714_FAMILY(sc) ((sc)->bge_flags & BGE_FLAG_5714_FAMILY) +#define BGE_IS_575X_PLUS(sc) ((sc)->bge_flags & BGE_FLAG_575X_PLUS) const struct bge_revision * bge_lookup_rev(uint32_t); const struct bge_vendor * bge_lookup_vendor(uint16_t); @@ -359,8 +359,8 @@ static void bge_poll(struct ifnet *ifp, enum poll_cmd cmd, int count); #endif -#define BGE_RESET_START 1 -#define BGE_RESET_STOP 2 +#define BGE_RESET_START 1 +#define BGE_RESET_STOP 2 static void bge_sig_post_reset(struct bge_softc *, int); static void bge_sig_legacy(struct bge_softc *, int); static void bge_sig_pre_reset(struct bge_softc *, int); @@ -1120,9 +1120,9 @@ /* Set up the PCI DMA control register. */ if (sc->bge_flags & BGE_FLAG_PCIE) { /* PCI Express bus */ - dma_rw_ctl = BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD | - (0xf << BGE_PCIDMARWCTL_RD_WAT_SHIFT) | - (0x2 << BGE_PCIDMARWCTL_WR_WAT_SHIFT); + dma_rw_ctl = BGE_PCI_READ_CMD | BGE_PCI_WRITE_CMD | + BGE_PCIDMARWCTL_RD_WAT_SHIFT(0xf) | + BGE_PCIDMARWCTL_WR_WAT_SHIFT(0x2); } else if (sc->bge_flags & BGE_FLAG_PCIX) { /* PCI-X bus */ if (BGE_IS_5714_FAMILY(sc)) { @@ -1140,14 +1140,14 @@ * The 5704 uses a different encoding of read/write * watermarks. */ - dma_rw_ctl = BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD | - (0x7 << BGE_PCIDMARWCTL_RD_WAT_SHIFT) | - (0x3 << BGE_PCIDMARWCTL_WR_WAT_SHIFT); + dma_rw_ctl = BGE_PCI_READ_CMD | BGE_PCI_WRITE_CMD | + BGE_PCIDMARWCTL_RD_WAT_SHIFT(0x7) | + BGE_PCIDMARWCTL_WR_WAT_SHIFT(0x3); else - dma_rw_ctl = BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD | - (0x3 << BGE_PCIDMARWCTL_RD_WAT_SHIFT) | - (0x3 << BGE_PCIDMARWCTL_WR_WAT_SHIFT) | - (0x0F); + dma_rw_ctl = BGE_PCI_READ_CMD | BGE_PCI_WRITE_CMD | + BGE_PCIDMARWCTL_RD_WAT_SHIFT(0x3) | + BGE_PCIDMARWCTL_WR_WAT_SHIFT(0x3) | + 0x0f; /* * 5703 and 5704 need ONEDMA_AT_ONCE as a workaround @@ -1163,10 +1163,10 @@ } } else /* Conventional PCI bus */ - dma_rw_ctl = BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD | - (0x7 << BGE_PCIDMARWCTL_RD_WAT_SHIFT) | - (0x7 << BGE_PCIDMARWCTL_WR_WAT_SHIFT) | - (0x0F); + dma_rw_ctl = BGE_PCI_READ_CMD | BGE_PCI_WRITE_CMD | + BGE_PCIDMARWCTL_RD_WAT_SHIFT(0x7) | + BGE_PCIDMARWCTL_WR_WAT_SHIFT(0x7) | + 0x0f; if (sc->bge_asicrev == BGE_ASICREV_BCM5703 || sc->bge_asicrev == BGE_ASICREV_BCM5704 || @@ -1687,6 +1687,8 @@ device_set_desc_copy(dev, buf); if (pci_get_subvendor(dev) == DELL_VENDORID) sc->bge_flags |= BGE_FLAG_NO_3LED; + if (did == BCOM_DEVICEID_BCM5755M) + sc->bge_flags |= BGE_FLAG_ADJUST_TRIM; return (0); } t++; @@ -2214,12 +2216,16 @@ } /* Set various bug flags. */ + if (sc->bge_chipid == BGE_CHIPID_BCM5701_A0 || + sc->bge_chipid == BGE_CHIPID_BCM5701_B0) + sc->bge_flags |= BGE_FLAG_CRC_BUG; if (sc->bge_chiprev == BGE_CHIPREV_5703_AX || sc->bge_chiprev == BGE_CHIPREV_5704_AX) sc->bge_flags |= BGE_FLAG_ADC_BUG; if (sc->bge_chipid == BGE_CHIPID_BCM5704_A0) sc->bge_flags |= BGE_FLAG_5704_A0_BUG; - if (BGE_IS_5705_PLUS(sc)) { + if (BGE_IS_5705_PLUS(sc) && + !(sc->bge_flags & BGE_FLAG_ADJUST_TRIM)) { if (sc->bge_asicrev == BGE_ASICREV_BCM5755 || sc->bge_asicrev == BGE_ASICREV_BCM5787) sc->bge_flags |= BGE_FLAG_JITTER_BUG; @@ -3182,7 +3188,7 @@ stats = BGE_MEMWIN_START + BGE_STATS_BLOCK; -#define READ_STAT(sc, stats, stat) \ +#define READ_STAT(sc, stats, stat) \ CSR_READ_4(sc, stats + offsetof(struct bge_stats, stat)) cnt = READ_STAT(sc, stats, txstats.etherStatsCollisions.bge_addr_lo); @@ -3197,7 +3203,7 @@ ifp->if_oerrors += (uint32_t)(cnt - sc->bge_tx_discards); sc->bge_tx_discards = cnt; -#undef READ_STAT >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Feb 14 22:37:54 2007 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 8AD5016A408; Wed, 14 Feb 2007 22:37:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6160D16A406 for ; Wed, 14 Feb 2007 22:37:54 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5203513C4A7 for ; Wed, 14 Feb 2007 22:37:54 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1EMbsLv019848 for ; Wed, 14 Feb 2007 22:37:54 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1EMbsrQ019845 for perforce@freebsd.org; Wed, 14 Feb 2007 22:37:54 GMT (envelope-from sam@freebsd.org) Date: Wed, 14 Feb 2007 22:37:54 GMT Message-Id: <200702142237.l1EMbsrQ019845@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 114512 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, 14 Feb 2007 22:37:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=114512 Change 114512 by sam@sam_ebb on 2007/02/14 22:37:18 11n media defs Affected files ... .. //depot/projects/wifi/sys/net/if_media.h#6 edit Differences ... ==== //depot/projects/wifi/sys/net/if_media.h#6 (text+ko) ==== @@ -208,12 +208,16 @@ #define IFM_IEEE80211_IBSSMASTER 0x00000800 /* Operate as an IBSS master */ #define IFM_IEEE80211_TURBO 0x00001000 /* Operate in turbo mode */ #define IFM_IEEE80211_MONITOR 0x00002000 /* Operate in monitor mode */ +#define IFM_IEEE80211_HT40PLUS 0x00004000 /* Operate in 11n HT40+ mode */ +#define IFM_IEEE80211_HT40MINUS 0x00008000 /* Operate in 11n HT40- mode */ /* operating mode for multi-mode devices */ #define IFM_IEEE80211_11A 0x00010000 /* 5Ghz, OFDM mode */ #define IFM_IEEE80211_11B 0x00020000 /* Direct Sequence mode */ #define IFM_IEEE80211_11G 0x00030000 /* 2Ghz, CCK mode */ #define IFM_IEEE80211_FH 0x00040000 /* 2Ghz, GFSK mode */ +#define IFM_IEEE80211_11NA 0x00050000 /* 5Ghz, HT mode */ +#define IFM_IEEE80211_11NG 0x00060000 /* 2Ghz, HT mode */ /* * ATM From owner-p4-projects@FreeBSD.ORG Wed Feb 14 22:44:03 2007 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 8BED016A402; Wed, 14 Feb 2007 22:44:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 43C0E16A400 for ; Wed, 14 Feb 2007 22:44:03 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 335E313C4B4 for ; Wed, 14 Feb 2007 22:44:03 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1EMi3Jw021444 for ; Wed, 14 Feb 2007 22:44:03 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1EMi3GR021441 for perforce@freebsd.org; Wed, 14 Feb 2007 22:44:03 GMT (envelope-from sam@freebsd.org) Date: Wed, 14 Feb 2007 22:44:03 GMT Message-Id: <200702142244.l1EMi3GR021441@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 114514 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, 14 Feb 2007 22:44:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=114514 Change 114514 by sam@sam_ebb on 2007/02/14 22:43:36 expose some stuff we'll use for 11n Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#84 edit .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#63 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#29 edit .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#46 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#84 (text+ko) ==== @@ -73,38 +73,8 @@ return 1; } -/* - * Emit a debug message about discarding a frame or information - * element. One format is for extracting the mac address from - * the frame header; the other is for when a header is not - * available or otherwise appropriate. - */ -#define IEEE80211_DISCARD(_ic, _m, _wh, _type, _fmt, ...) do { \ - if ((_ic)->ic_debug & (_m)) \ - ieee80211_discard_frame(_ic, _wh, _type, _fmt, __VA_ARGS__);\ -} while (0) -#define IEEE80211_DISCARD_IE(_ic, _m, _wh, _type, _fmt, ...) do { \ - if ((_ic)->ic_debug & (_m)) \ - ieee80211_discard_ie(_ic, _wh, _type, _fmt, __VA_ARGS__);\ -} while (0) -#define IEEE80211_DISCARD_MAC(_ic, _m, _mac, _type, _fmt, ...) do { \ - if ((_ic)->ic_debug & (_m)) \ - ieee80211_discard_mac(_ic, _mac, _type, _fmt, __VA_ARGS__);\ -} while (0) - static const u_int8_t *ieee80211_getbssid(struct ieee80211com *, const struct ieee80211_frame *); -static void ieee80211_discard_frame(struct ieee80211com *, - const struct ieee80211_frame *, const char *type, const char *fmt, ...); -static void ieee80211_discard_ie(struct ieee80211com *, - const struct ieee80211_frame *, const char *type, const char *fmt, ...); -static void ieee80211_discard_mac(struct ieee80211com *, - const u_int8_t mac[IEEE80211_ADDR_LEN], const char *type, - const char *fmt, ...); -#else -#define IEEE80211_DISCARD(_ic, _m, _wh, _type, _fmt, ...) -#define IEEE80211_DISCARD_IE(_ic, _m, _wh, _type, _fmt, ...) -#define IEEE80211_DISCARD_MAC(_ic, _m, _mac, _type, _fmt, ...) #endif /* IEEE80211_DEBUG */ static struct mbuf *ieee80211_defrag(struct ieee80211com *, @@ -112,8 +82,6 @@ static struct mbuf *ieee80211_decap(struct ieee80211com *, struct mbuf *, int); static void ieee80211_send_error(struct ieee80211com *, struct ieee80211_node *, const u_int8_t *mac, int subtype, int arg); -static void ieee80211_deliver_data(struct ieee80211com *, - struct ieee80211_node *, struct mbuf *); static struct mbuf *ieee80211_decap_fastframe(struct ieee80211com *, struct ieee80211_node *, struct mbuf *); static void ieee80211_recv_pspoll(struct ieee80211com *, @@ -690,7 +658,7 @@ return mfrag; } -static void +void ieee80211_deliver_data(struct ieee80211com *ic, struct ieee80211_node *ni, struct mbuf *m) { @@ -861,7 +829,7 @@ /* * Decap a frame encapsulated in a fast-frame. */ -static struct mbuf * +struct mbuf * ieee80211_decap1(struct mbuf *m, int *framelen) { #define FF_LLC_SIZE (sizeof(struct ether_header) + sizeof(struct llc)) @@ -3059,7 +3027,7 @@ if_printf(ic->ic_ifp, "[%s] %s\n", ether_sprintf(mac), buf); } -static void +void ieee80211_discard_frame(struct ieee80211com *ic, const struct ieee80211_frame *wh, const char *type, const char *fmt, ...) @@ -3078,7 +3046,7 @@ printf("\n"); } -static void +void ieee80211_discard_ie(struct ieee80211com *ic, const struct ieee80211_frame *wh, const char *type, const char *fmt, ...) @@ -3097,7 +3065,7 @@ printf("\n"); } -static void +void ieee80211_discard_mac(struct ieee80211com *ic, const u_int8_t mac[IEEE80211_ADDR_LEN], const char *type, const char *fmt, ...) ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#63 (text+ko) ==== @@ -155,7 +155,7 @@ * dispatched to the driver, then it is responsible for freeing the * reference (and potentially free'ing up any associated storage). */ -static int +int ieee80211_mgmt_output(struct ieee80211com *ic, struct ieee80211_node *ni, struct mbuf *m, int type) { ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.h#29 (text+ko) ==== @@ -59,12 +59,17 @@ struct ieee80211_node; int ieee80211_input(struct ieee80211com *, struct mbuf *, struct ieee80211_node *, int, int, u_int32_t); +void ieee80211_deliver_data(struct ieee80211com *, + struct ieee80211_node *, struct mbuf *); +struct mbuf *ieee80211_decap1(struct mbuf *, int *); int ieee80211_setup_rates(struct ieee80211_node *ni, const u_int8_t *rates, const u_int8_t *xrates, int flags); void ieee80211_saveie(u_int8_t **, const u_int8_t *); void ieee80211_saveath(struct ieee80211_node *, u_int8_t *); void ieee80211_recv_mgmt(struct ieee80211com *, struct mbuf *, struct ieee80211_node *, int, int, int, u_int32_t); +int ieee80211_mgmt_output(struct ieee80211com *, struct ieee80211_node *, + struct mbuf *, int type); struct ieee80211_bpf_params; int ieee80211_raw_xmit(struct ieee80211_node *, struct mbuf *, const struct ieee80211_bpf_params *); ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#46 (text+ko) ==== @@ -477,12 +477,43 @@ ((_ic)->ic_debug & IEEE80211_MSG_SCAN) #define ieee80211_msg_assoc(_ic) \ ((_ic)->ic_debug & IEEE80211_MSG_ASSOC) + +/* + * Emit a debug message about discarding a frame or information + * element. One format is for extracting the mac address from + * the frame header; the other is for when a header is not + * available or otherwise appropriate. + */ +#define IEEE80211_DISCARD(_ic, _m, _wh, _type, _fmt, ...) do { \ + if ((_ic)->ic_debug & (_m)) \ + ieee80211_discard_frame(_ic, _wh, _type, _fmt, __VA_ARGS__);\ +} while (0) +#define IEEE80211_DISCARD_IE(_ic, _m, _wh, _type, _fmt, ...) do { \ + if ((_ic)->ic_debug & (_m)) \ + ieee80211_discard_ie(_ic, _wh, _type, _fmt, __VA_ARGS__);\ +} while (0) +#define IEEE80211_DISCARD_MAC(_ic, _m, _mac, _type, _fmt, ...) do { \ + if ((_ic)->ic_debug & (_m)) \ + ieee80211_discard_mac(_ic, _mac, _type, _fmt, __VA_ARGS__);\ +} while (0) + +void ieee80211_discard_frame(struct ieee80211com *, + const struct ieee80211_frame *, const char *type, const char *fmt, ...); +void ieee80211_discard_ie(struct ieee80211com *, + const struct ieee80211_frame *, const char *type, const char *fmt, ...); +void ieee80211_discard_mac(struct ieee80211com *, + const u_int8_t mac[IEEE80211_ADDR_LEN], const char *type, + const char *fmt, ...); #else #define IEEE80211_DPRINTF(_ic, _m, _fmt, ...) #define IEEE80211_NOTE_FRAME(_ic, _m, _wh, _fmt, ...) #define IEEE80211_NOTE_MAC(_ic, _m, _mac, _fmt, ...) #define ieee80211_msg_dumppkts(_ic) 0 #define ieee80211_msg(_ic, _m) 0 + +#define IEEE80211_DISCARD(_ic, _m, _wh, _type, _fmt, ...) +#define IEEE80211_DISCARD_IE(_ic, _m, _wh, _type, _fmt, ...) +#define IEEE80211_DISCARD_MAC(_ic, _m, _mac, _type, _fmt, ...) #endif #endif /* _NET80211_IEEE80211_VAR_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Feb 14 22:48:09 2007 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 17B5716A407; Wed, 14 Feb 2007 22:48:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D088716A400 for ; Wed, 14 Feb 2007 22:48:08 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A8DC913C4B6 for ; Wed, 14 Feb 2007 22:48:08 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1EMm8dh021611 for ; Wed, 14 Feb 2007 22:48:08 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1EMm8ME021608 for perforce@freebsd.org; Wed, 14 Feb 2007 22:48:08 GMT (envelope-from sam@freebsd.org) Date: Wed, 14 Feb 2007 22:48:08 GMT Message-Id: <200702142248.l1EMm8ME021608@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 114515 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, 14 Feb 2007 22:48:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=114515 Change 114515 by sam@sam_ebb on 2007/02/14 22:48:02 missed string equivalents for 11n modes Affected files ... .. //depot/projects/wifi/sys/net/if_media.h#7 edit Differences ... ==== //depot/projects/wifi/sys/net/if_media.h#7 (text+ko) ==== @@ -504,6 +504,8 @@ { IFM_IEEE80211_11B, "11b" }, \ { IFM_IEEE80211_11G, "11g" }, \ { IFM_IEEE80211_FH, "fh" }, \ + { IFM_IEEE80211_11NA, "11na" }, \ + { IFM_IEEE80211_11NG, "11ng" }, \ { 0, NULL }, \ } From owner-p4-projects@FreeBSD.ORG Wed Feb 14 22:54:17 2007 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 8A96716A406; Wed, 14 Feb 2007 22:54:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 456E416A400 for ; Wed, 14 Feb 2007 22:54:17 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 35FF013C48D for ; Wed, 14 Feb 2007 22:54:17 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1EMsHCp022976 for ; Wed, 14 Feb 2007 22:54:17 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1EMsGCt022973 for perforce@freebsd.org; Wed, 14 Feb 2007 22:54:16 GMT (envelope-from sam@freebsd.org) Date: Wed, 14 Feb 2007 22:54:16 GMT Message-Id: <200702142254.l1EMsGCt022973@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 114516 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, 14 Feb 2007 22:54:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=114516 Change 114516 by sam@sam_ebb on 2007/02/14 22:53:30 start of 11n defs Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211.h#16 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211.h#16 (text+ko) ==== @@ -172,6 +172,8 @@ #define IEEE80211_QOS_TXOP 0x00ff /* bit 8 is reserved */ +#define IEEE80211_QOS_AMSDU 0x80 +#define IEEE80211_QOS_AMSDU_S 7 #define IEEE80211_QOS_ACKPOLICY 0x60 #define IEEE80211_QOS_ACKPOLICY_S 5 #define IEEE80211_QOS_ESOP 0x10 @@ -370,7 +372,7 @@ /* BA - DELBA */ struct ieee80211_action_ba_delba { struct ieee80211_action dl_header; - u_int16_t dl_delbaparamset; + u_int16_t dl_baparamset; u_int16_t dl_reasoncode; } __packed; @@ -499,6 +501,137 @@ } __packed; /* + * 802.11n HT Capability IE + * NB: these reflect D1.10 + */ +struct ieee80211_ie_htcap { + u_int8_t hc_id; /* element ID */ + u_int8_t hc_len; /* length in bytes */ + u_int16_t hc_cap; /* HT caps (see below) */ + u_int8_t hc_param; /* HT params (see below) */ + u_int8_t hc_mcsset[16]; /* supported MCS set */ + u_int16_t hc_extcap; /* extended HT capabilities */ + u_int32_t hc_txbf; /* txbf capabilities */ + u_int8_t hc_antenna; /* antenna capabilities */ +} __packed; + +/* HT capability flags (ht_cap) */ +#define IEEE80211_HTCAP_LDPC 0x0001 /* LDPC supported */ +#define IEEE80211_HTCAP_CHWIDTH40 0x0002 /* 20/40 supported */ +#define IEEE80211_HTCAP_SMPS 0x000c /* SM Power Save mode */ +#define IEEE80211_HTCAP_SMPS_OFF 0x0000 /* none (static mode) */ +#define IEEE80211_HTCAP_SMPS_DYNAMIC 0x0004 /* send RTS first */ +#define IEEE80211_HTCAP_SMPS_NA 0x0008 /* not applicable */ +#define IEEE80211_HTCAP_SMPS_ALL 0x000c /* no limitation */ +#define IEEE80211_HTCAP_GREENFIELD 0x0010 /* Greenfield supported */ +#define IEEE80211_HTCAP_SHORTGI20 0x0020 /* Short GI in 20MHz */ +#define IEEE80211_HTCAP_SHORTGI40 0x0040 /* Short GI in 40MHz */ +#define IEEE80211_HTCAP_TXSTBC 0x0080 /* STBC tx ok */ +#define IEEE80211_HTCAP_RXSTBC 0x0300 /* STBC rx support */ +#define IEEE80211_HTCAP_RXSTBC_S 8 +#define IEEE80211_HTCAP_RXSTBC_1STREAM 0x0100 /* 1 spatial stream */ +#define IEEE80211_HTCAP_RXSTBC_2STREAM 0x0200 /* 1-2 spatial streams*/ +#define IEEE80211_HTCAP_RXSTBC_3STREAM 0x0300 /* 1-3 spatial streams*/ +#define IEEE80211_HTCAP_DELBA 0x0400 /* HT DELBA supported */ +#define IEEE80211_HTCAP_MAXAMSDU 0x0800 /* max A-MSDU length */ +#define IEEE80211_HTCAP_MAXAMSDU_7935 0x0800 /* 7935 octets */ +#define IEEE80211_HTCAP_MAXAMSDU_3839 0x0000 /* 3839 octets */ +#define IEEE80211_HTCAP_DSSSCCK40 0x1000 /* DSSS/CCK in 40MHz */ +#define IEEE80211_HTCAP_PSMP 0x2000 /* PSMP supported */ +#define IEEE80211_HTCAP_40INTOLERANT 0x4000 /* 40MHz intolerant */ +#define IEEE80211_HTCAP_LSIGTXOPPROT 0x8000 /* L-SIG TXOP prot */ + +/* HT parameters (hc_param) */ +#define IEEE80211_HTCAP_MAXRXAMPDU 0x03 /* max rx A-MPDU factor */ +#define IEEE80211_HTCAP_MAXRXAMPDU_S 0 +#define IEEE80211_HTCAP_MAXRXAMPDU_8K 0x00 +#define IEEE80211_HTCAP_MAXRXAMPDU_16K 0x01 +#define IEEE80211_HTCAP_MAXRXAMPDU_32K 0x02 +#define IEEE80211_HTCAP_MAXRXAMPDU_64K 0x03 +#define IEEE80211_HTCAP_MPDUDENSITY 0x1c /* min MPDU start spacing */ +#define IEEE80211_HTCAP_MPDUDENSITY_S 2 +#define IEEE80211_HTCAP_MPDUDENSITY_NA 0x00 /* no time restriction */ +#define IEEE80211_HTCAP_MPDUDENSITY_025 0x04 /* 1/4 us */ +#define IEEE80211_HTCAP_MPDUDENSITY_05 0x08 /* 1/2 us */ +#define IEEE80211_HTCAP_MPDUDENSITY_1 0x0c /* 1 us */ +#define IEEE80211_HTCAP_MPDUDENSITY_2 0x10 /* 2 us */ +#define IEEE80211_HTCAP_MPDUDENSITY_4 0x14 /* 4 us */ +#define IEEE80211_HTCAP_MPDUDENSITY_8 0x18 /* 8 us */ +#define IEEE80211_HTCAP_MPDUDENSITY_16 0x1c /* 16 us */ + +/* HT extended capabilities (hc_extcap) */ +#define IEEE80211_HTCAP_PCO 0x0001 /* PCO capable */ +#define IEEE80211_HTCAP_PCOTRANS 0x0006 /* PCO transition time */ +#define IEEE80211_HTCAP_PCOTRANS_S 1 +#define IEEE80211_HTCAP_PCOTRANS_04 0x0002 /* 400 us */ +#define IEEE80211_HTCAP_PCOTRANS_15 0x0004 /* 1.5 ms */ +#define IEEE80211_HTCAP_PCOTRANS_5 0x0006 /* 5 ms */ +/* bits 3-7 reserved */ +#define IEEE80211_HTCAP_MCSFBACK 0x0300 /* MCS feedback */ +#define IEEE80211_HTCAP_MCSFBACK_S 8 +#define IEEE80211_HTCAP_MCSFBACK_NONE 0x0000 /* nothing provided */ +#define IEEE80211_HTCAP_MCSFBACK_UNSOL 0x0200 /* unsolicited feedback */ +#define IEEE80211_HTCAP_MCSFBACK_MRQ 0x0300 /* " "+respond to MRQ */ +#define IEEE80211_HTCAP_HTC 0x0400 /* +HTC support */ +#define IEEE80211_HTCAP_RDR 0x0800 /* reverse direction responder*/ +/* bits 12-15 reserved */ + +/* + * 802.11n HT Information IE + */ +struct ieee80211_ie_htinfo { + u_int8_t hi_id; /* element ID */ + u_int8_t hi_len; /* length in bytes */ + u_int8_t hi_ctrlchannel; /* primary channel */ + u_int8_t hi_byte1; /* ht ie byte 1 */ + u_int16_t hi_byte23; /* ht ie bytes 2+3 */ + u_int16_t hi_byte45; /* ht ie bytes 4+5 */ + u_int8_t hi_basicmcsset[16]; /* basic MCS set */ +} __packed; + +/* byte1 */ +#define IEEE80211_HTINFO_2NDCHAN 0x03 /* secondary/ext chan offset */ +#define IEEE80211_HTINFO_2NDCHAN_S 0 +#define IEEE80211_HTINFO_2NDCHAN_NONE 0x00 /* no secondary/ext channel */ +#define IEEE80211_HTINFO_2NDCHAN_ABOVE 0x01 /* above private channel */ +/* NB: 2 is reserved */ +#define IEEE80211_HTINFO_2NDCHAN_BELOW 0x03 /* below primary channel */ +#define IEEE80211_HTINFO_TXWIDTH 0x04 /* tx channel width */ +#define IEEE80211_HTINFO_TXWIDTH_20 0x00 /* 20MHz width */ +#define IEEE80211_HTINFO_TXWIDTH_2040 0x04 /* any supported width */ +#define IEEE80211_HTINFO_RIFSMODE 0x08 /* Reduced IFS (RIFS) use */ +#define IEEE80211_HTINFO_RIFSMODE_PROH 0x00 /* RIFS use prohibited */ +#define IEEE80211_HTINFO_RIFSMODE_PERM 0x08 /* RIFS use permitted */ +#define IEEE80211_HTINFO_PMSPONLY 0x10 /* PSMP required to associate */ +#define IEEE80211_HTINFO_SIGRAN 0xe0 /* shortest Service Interval */ +#define IEEE80211_HTINFO_SIGRAN_S 5 +#define IEEE80211_HTINFO_SIGRAN_5 0x00 /* 5 ms */ +/* XXX add rest */ + +/* bytes 2+3 */ +#define IEEE80211_HTINFO_OPMODE 0x03 /* operating mode */ +#define IEEE80211_HTINFO_OPMODE_S 0 +#define IEEE80211_HTINFO_OPMODE_PURE 0x00 /* no protection */ +#define IEEE80211_HTINFO_OPMODE_MIXED 0x01 /* protection required */ +#define IEEE80211_HTINFO_OPMODE_PROTOPT 0x02 /* protection optional */ +#define IEEE80211_HTINFO_OPMODE_TBD 0x03 +#define IEEE80211_HTINFO_NONGF_PRESENT 0x04 /* non-GF sta's present */ +#define IEEE80211_HTINFO_TXBL 0x08 /* transmit burst limit */ +#define IEEE80211_HTINFO_NONHT_PRESENT 0x10 /* non-HT sta's present */ +/* bits 5-15 reserved */ + +/* bytes 4+5 */ +#define IEEE80211_HTINFO_2NDARYBEACON 0x01 +#define IEEE80211_HTINFO_LSIGTXOPPROT 0x02 +#define IEEE80211_HTINFO_PCO_ACTIVE 0x04 +#define IEEE80211_HTINFO_40MHZPHASE 0x08 + +/* byte5 */ +#define IEEE80211_HTINFO_BASIC_STBCMCS 0x7f +#define IEEE80211_HTINFO_BASIC_STBCMCS_S 0 +#define IEEE80211_HTINFO_DUALPROTECTED 0x80 + +/* * Management information element payloads. */ @@ -513,9 +646,23 @@ IEEE80211_ELEMID_COUNTRY = 7, IEEE80211_ELEMID_CHALLENGE = 16, /* 17-31 reserved for challenge text extension */ + IEEE80211_ELEMID_PWRCNSTR = 32, + IEEE80211_ELEMID_PWRCAP = 33, + IEEE80211_ELEMID_TPCREQ = 34, + IEEE80211_ELEMID_TPCREP = 35, + IEEE80211_ELEMID_SUPPCHAN = 36, + IEEE80211_ELEMID_CHANSWITCHANN = 37, + IEEE80211_ELEMID_MEASREQ = 38, + IEEE80211_ELEMID_MEASREP = 39, + IEEE80211_ELEMID_QUIET = 40, + IEEE80211_ELEMID_IBSSDFS = 41, IEEE80211_ELEMID_ERP = 42, + IEEE80211_ELEMID_HTCAP_ANA = 45, IEEE80211_ELEMID_RSN = 48, IEEE80211_ELEMID_XRATES = 50, + IEEE80211_ELEMID_HTCAP = 51, + IEEE80211_ELEMID_HTINFO = 52, + IEEE80211_ELEMID_HTINFO_ANA = 61, IEEE80211_ELEMID_TPC = 150, IEEE80211_ELEMID_CCKM = 156, IEEE80211_ELEMID_VENDOR = 221, /* vendor private */ From owner-p4-projects@FreeBSD.ORG Wed Feb 14 23:01:26 2007 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 9E1A416A409; Wed, 14 Feb 2007 23:01:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6F93D16A406 for ; Wed, 14 Feb 2007 23:01:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5FBA713C474 for ; Wed, 14 Feb 2007 23:01:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1EN1QwX024028 for ; Wed, 14 Feb 2007 23:01:26 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1EN1Q43024013 for perforce@freebsd.org; Wed, 14 Feb 2007 23:01:26 GMT (envelope-from sam@freebsd.org) Date: Wed, 14 Feb 2007 23:01:26 GMT Message-Id: <200702142301.l1EN1Q43024013@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 114517 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, 14 Feb 2007 23:01:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=114517 Change 114517 by sam@sam_ebb on 2007/02/14 23:01:14 Introduce IEEE80211_NONQOS_TID as the index in the tx/rx sequence number arrays for non-QoS traffic and define it to be the last entry. This insures we don't collide with QoS usage though the spec says you're not allowed to mix QoS and non-QoS traffic. Obtained from: Atheros Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#85 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#66 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#81 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#40 edit .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#64 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#85 (text+ko) ==== @@ -232,7 +232,7 @@ ic->ic_wme.wme_hipri_traffic++; tid++; } else - tid = 0; + tid = IEEE80211_NONQOS_TID; rxseq = le16toh(*(u_int16_t *)wh->i_seq); if ((wh->i_fc[1] & IEEE80211_FC1_RETRY) && SEQ_LEQ(rxseq, ni->ni_rxseqs[tid])) { ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#66 (text+ko) ==== @@ -590,8 +590,8 @@ memcpy(si->isi_txseqs, ni->ni_txseqs, sizeof(ni->ni_txseqs)); memcpy(si->isi_rxseqs, ni->ni_rxseqs, sizeof(ni->ni_rxseqs)); } else { - si->isi_txseqs[0] = ni->ni_txseqs[0]; - si->isi_rxseqs[0] = ni->ni_rxseqs[0]; + si->isi_txseqs[0] = ni->ni_txseqs[IEEE80211_NONQOS_TID]; + si->isi_rxseqs[0] = ni->ni_rxseqs[IEEE80211_NONQOS_TID]; } /* NB: leave all cases in case we relax ni_associd == 0 check */ if (ieee80211_node_is_authorized(ni)) ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#81 (text+ko) ==== @@ -1584,9 +1584,9 @@ printf("\tassocid 0x%x txpower %u vlan %u\n", ni->ni_associd, ni->ni_txpower, ni->ni_vlan); printf("\ttxseq %u rxseq %u fragno %u rxfragstamp %u\n", - ni->ni_txseqs[0], - ni->ni_rxseqs[0] >> IEEE80211_SEQ_SEQ_SHIFT, - ni->ni_rxseqs[0] & IEEE80211_SEQ_FRAG_MASK, + ni->ni_txseqs[IEEE80211_NONQOS_TID], + ni->ni_rxseqs[IEEE80211_NONQOS_TID] >> IEEE80211_SEQ_SEQ_SHIFT, + ni->ni_rxseqs[IEEE80211_NONQOS_TID] & IEEE80211_SEQ_FRAG_MASK, ni->ni_rxfragstamp); printf("\trstamp %u rssi %d noise %d intval %u capinfo 0x%x\n", ni->ni_rstamp, ni->ni_rssi, ni->ni_noise, ==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#40 (text+ko) ==== @@ -119,6 +119,7 @@ u_int8_t *ni_rsn_ie; /* captured RSN ie */ u_int8_t *ni_wme_ie; /* captured WME ie */ u_int8_t *ni_ath_ie; /* captured Atheros ie */ +#define IEEE80211_NONQOS_TID 16 /* index for non-QoS sta */ u_int16_t ni_txseqs[17]; /* tx seq per-tid */ u_int16_t ni_rxseqs[17]; /* rx seq previous per-tid*/ u_int32_t ni_rxfragstamp; /* time stamp of last rx frag */ ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#64 (text+ko) ==== @@ -143,8 +143,8 @@ *(u_int16_t *)&wh->i_dur[0] = 0; /* NB: use non-QoS tid */ *(u_int16_t *)&wh->i_seq[0] = - htole16(ni->ni_txseqs[0] << IEEE80211_SEQ_SEQ_SHIFT); - ni->ni_txseqs[0]++; + htole16(ni->ni_txseqs[IEEE80211_NONQOS_TID] << IEEE80211_SEQ_SEQ_SHIFT); + ni->ni_txseqs[IEEE80211_NONQOS_TID]++; #undef WH4 } @@ -807,8 +807,8 @@ ni->ni_txseqs[tid]++; } else { *(u_int16_t *)wh->i_seq = - htole16(ni->ni_txseqs[0] << IEEE80211_SEQ_SEQ_SHIFT); - ni->ni_txseqs[0]++; + htole16(ni->ni_txseqs[IEEE80211_NONQOS_TID] << IEEE80211_SEQ_SEQ_SHIFT); + ni->ni_txseqs[IEEE80211_NONQOS_TID]++; } /* check if xmit fragmentation is required */ txfrag = (m->m_pkthdr.len > ic->ic_fragthreshold && From owner-p4-projects@FreeBSD.ORG Wed Feb 14 23:04:31 2007 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 CAADA16A4DE; Wed, 14 Feb 2007 23:04:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 93F0216A4B3 for ; Wed, 14 Feb 2007 23:04:30 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8446613C48D for ; Wed, 14 Feb 2007 23:04:30 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1EN4U7V025884 for ; Wed, 14 Feb 2007 23:04:30 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1EN4UMM025878 for perforce@freebsd.org; Wed, 14 Feb 2007 23:04:30 GMT (envelope-from sam@freebsd.org) Date: Wed, 14 Feb 2007 23:04:30 GMT Message-Id: <200702142304.l1EN4UMM025878@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 114518 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, 14 Feb 2007 23:04:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=114518 Change 114518 by sam@sam_ebb on 2007/02/14 23:04:16 extract some error handling into separate routines; they will be used multiple times when 11n support comes in Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#86 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#86 (text+ko) ==== @@ -1945,6 +1945,36 @@ time_after(ticks, ic->ic_lastdata + ic->ic_bgscanidle)); } +static void +ratesetmismatch(struct ieee80211_node *ni, const struct ieee80211_frame *wh, + int reassoc, int resp, const char *tag, int rate) +{ + struct ieee80211com *ic = ni->ni_ic; + + IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, + "[%s] deny %s request, %srate set mismatch, rate 0x%x\n", + ether_sprintf(wh->i_addr2), + reassoc ? "reassoc" : "assoc", tag, rate); + IEEE80211_SEND_MGMT(ic, ni, resp, IEEE80211_STATUS_BASIC_RATE); + ieee80211_node_leave(ic, ni); + ic->ic_stats.is_rx_assoc_norate++; +} + +static void +capinfomismatch(struct ieee80211_node *ni, const struct ieee80211_frame *wh, + int reassoc, int resp, const char *tag, int capinfo) +{ + struct ieee80211com *ic = ni->ni_ic; + + IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, + "[%s] deny %s request, %s mismatch 0x%x\n", + ether_sprintf(wh->i_addr2), + reassoc ? "reassoc" : "assoc", tag, capinfo); + IEEE80211_SEND_MGMT(ic, ni, resp, IEEE80211_STATUS_CAPINFO); + ieee80211_node_leave(ic, ni); + ic->ic_stats.is_rx_assoc_capmismatch++; +} + void ieee80211_recv_mgmt(struct ieee80211com *ic, struct mbuf *m0, struct ieee80211_node *ni, @@ -2582,14 +2612,8 @@ } /* NB: 802.11 spec says to ignore station's privacy bit */ if ((capinfo & IEEE80211_CAPINFO_ESS) == 0) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, - "[%s] deny %s request, capability mismatch 0x%x\n", - ether_sprintf(wh->i_addr2), - reassoc ? "reassoc" : "assoc", capinfo); - IEEE80211_SEND_MGMT(ic, ni, resp, - IEEE80211_STATUS_CAPINFO); - ieee80211_node_leave(ic, ni); - ic->ic_stats.is_rx_assoc_capmismatch++; + capinfomismatch(ni, wh, reassoc, resp, + "capability", capinfo); return; } rate = ieee80211_setup_rates(ni, rates, xrates, @@ -2603,14 +2627,7 @@ */ if ((rate & IEEE80211_RATE_BASIC) || ((ic->ic_flags & IEEE80211_F_PUREG) && rate < 48)) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, - "[%s] deny %s request, rate set mismatch, rate 0x%x\n", - ether_sprintf(wh->i_addr2), - reassoc ? "reassoc" : "assoc", rate); - IEEE80211_SEND_MGMT(ic, ni, resp, - IEEE80211_STATUS_BASIC_RATE); - ieee80211_node_leave(ic, ni); - ic->ic_stats.is_rx_assoc_norate++; + ratesetmismatch(ni, wh, reassoc, resp, "11g", rate); return; } ni->ni_rssi = rssi; From owner-p4-projects@FreeBSD.ORG Wed Feb 14 23:06:34 2007 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 3A4C616A402; Wed, 14 Feb 2007 23:06:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F411216A400 for ; Wed, 14 Feb 2007 23:06:33 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E4FAF13C441 for ; Wed, 14 Feb 2007 23:06:33 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1EN6Xsq026024 for ; Wed, 14 Feb 2007 23:06:33 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1EN6X0U026021 for perforce@freebsd.org; Wed, 14 Feb 2007 23:06:33 GMT (envelope-from sam@freebsd.org) Date: Wed, 14 Feb 2007 23:06:33 GMT Message-Id: <200702142306.l1EN6X0U026021@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 114519 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, 14 Feb 2007 23:06:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=114519 Change 114519 by sam@sam_ebb on 2007/02/14 23:06:03 reject stations re-associating with a mismatch'd slot time setting Obtained from: Atheros Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#87 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#87 (text+ko) ==== @@ -2616,6 +2616,16 @@ "capability", capinfo); return; } + /* + * Disallow re-associate w/ invalid slot time setting. + */ + if (ni->ni_associd != 0 && + IEEE80211_IS_CHAN_ANYG(ic->ic_bsschan) && + ((ni->ni_capinfo ^ capinfo) & IEEE80211_CAPINFO_SHORT_SLOTTIME)) { + capinfomismatch(ni, wh, reassoc, resp, + "slot time", capinfo); + return; + } rate = ieee80211_setup_rates(ni, rates, xrates, IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE | IEEE80211_F_DONEGO | IEEE80211_F_DODEL); From owner-p4-projects@FreeBSD.ORG Wed Feb 14 23:11:41 2007 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 258C916A420; Wed, 14 Feb 2007 23:11:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CC57716A402 for ; Wed, 14 Feb 2007 23:11:40 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BB8EB13C4A7 for ; Wed, 14 Feb 2007 23:11:40 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1ENBewg027126 for ; Wed, 14 Feb 2007 23:11:40 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1ENBeF4027123 for perforce@freebsd.org; Wed, 14 Feb 2007 23:11:40 GMT (envelope-from sam@freebsd.org) Date: Wed, 14 Feb 2007 23:11:40 GMT Message-Id: <200702142311.l1ENBeF4027123@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 114520 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, 14 Feb 2007 23:11:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=114520 Change 114520 by sam@sam_ebb on 2007/02/14 23:10:56 improve diagnostic when discarding a too-short ie Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#88 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#88 (text+ko) ==== @@ -1351,7 +1351,8 @@ IEEE80211_DISCARD(ic, IEEE80211_MSG_ELEMID, \ wh, ieee80211_mgt_subtype_name[subtype >> \ IEEE80211_FC0_SUBTYPE_SHIFT], \ - "%s", "ie too short"); \ + "ie too short, got %d, expected %d", \ + (_len), (_minlen)); \ ic->ic_stats.is_rx_elem_toosmall++; \ return; \ } \ From owner-p4-projects@FreeBSD.ORG Wed Feb 14 23:34:11 2007 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 69F5116A421; Wed, 14 Feb 2007 23:34:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3934616A401 for ; Wed, 14 Feb 2007 23:34:11 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 26D7D13C4A7 for ; Wed, 14 Feb 2007 23:34:11 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1ENYBT9033652 for ; Wed, 14 Feb 2007 23:34:11 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1ENYAkt033649 for perforce@freebsd.org; Wed, 14 Feb 2007 23:34:10 GMT (envelope-from sam@freebsd.org) Date: Wed, 14 Feb 2007 23:34:10 GMT Message-Id: <200702142334.l1ENYAkt033649@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 114522 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, 14 Feb 2007 23:34:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=114522 Change 114522 by sam@sam_ebb on 2007/02/14 23:34:08 reserve some debug msg bits for 11n Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#47 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#47 (text+ko) ==== @@ -409,6 +409,7 @@ return size; } +#define IEEE80211_MSG_11N 0x80000000 /* 11n mode debug */ #define IEEE80211_MSG_DEBUG 0x40000000 /* IFF_DEBUG equivalent */ #define IEEE80211_MSG_DUMPPKTS 0x20000000 /* IFF_LINK2 equivalant */ #define IEEE80211_MSG_CRYPTO 0x10000000 /* crypto work */ @@ -435,6 +436,7 @@ #define IEEE80211_MSG_INACT 0x00000080 /* inactivity handling */ #define IEEE80211_MSG_ROAM 0x00000040 /* sta-mode roaming */ #define IEEE80211_MSG_RATECTL 0x00000020 /* tx rate control */ +#define IEEE80211_MSG_ACTION 0x00000010 /* action frame handling */ #define IEEE80211_MSG_ANY 0xffffffff /* anything */ From owner-p4-projects@FreeBSD.ORG Thu Feb 15 01:39:52 2007 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 6ABFB16A406; Thu, 15 Feb 2007 01:39:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 429DE16A401 for ; Thu, 15 Feb 2007 01:39:52 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 30F5313C48E for ; Thu, 15 Feb 2007 01:39:52 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1F1dqxI003939 for ; Thu, 15 Feb 2007 01:39:52 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1F1dpNE003933 for perforce@freebsd.org; Thu, 15 Feb 2007 01:39:51 GMT (envelope-from jkim@freebsd.org) Date: Thu, 15 Feb 2007 01:39:51 GMT Message-Id: <200702150139.l1F1dpNE003933@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 114529 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, 15 Feb 2007 01:39:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=114529 Change 114529 by jkim@jkim_hammer on 2007/02/15 01:38:56 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#18 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#36 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#19 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#19 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#18 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#18 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bge.c#13 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/brgphy.c#9 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_pci.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci.c#17 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/envy24.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/envy24ht.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/spicds.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux.h#14 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#30 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_proto.h#19 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_syscall.h#18 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_sysent.c#18 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/syscalls.master#17 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_usrreq.c#7 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#18 (text+ko) ==== @@ -27,7 +27,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/amd64/linux32/linux.h,v 1.11 2007/02/01 13:36:19 kib Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.12 2007/02/15 00:54:40 jkim Exp $ */ #ifndef _AMD64_LINUX_LINUX_H_ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#36 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.30 2007/02/01 13:27:51 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.33 2007/02/15 01:20:43 jkim Exp $"); #include #include @@ -53,7 +53,10 @@ #include #include +#include +#include #include +#include #include #include @@ -63,15 +66,11 @@ #include #include -#include -#include #include #include #include #include -#include /* needed for pcb definition in linux_set_thread_area */ - /* * Memory and System segment descriptors */ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#19 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.29 2007/02/15 01:15:31 jkim Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.26 2007/02/15 01:13:36 jkim Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#19 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.29 2007/02/15 01:15:31 jkim Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.26 2007/02/15 01:13:36 jkim Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#18 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.29 2007/02/15 01:15:31 jkim Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.26 2007/02/15 01:13:36 jkim Exp */ #include @@ -130,7 +130,7 @@ { AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT, NULL, 0, 0 }, /* 107 = linux_newlstat */ { AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT, NULL, 0, 0 }, /* 108 = linux_newfstat */ { 0, (sy_call_t *)linux_uname, AUE_NULL, NULL, 0, 0 }, /* 109 = linux_uname */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 110 = iopl */ + { AS(linux_iopl_args), (sy_call_t *)linux_iopl, AUE_NULL, NULL, 0, 0 }, /* 110 = linux_iopl */ { 0, (sy_call_t *)linux_vhangup, AUE_NULL, NULL, 0, 0 }, /* 111 = linux_vhangup */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 112 = idle */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 113 = vm86old */ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#18 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.26 2007/02/15 01:13:36 jkim Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ==== //depot/projects/linuxolator/src/sys/dev/bge/if_bge.c#13 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.176 2007/02/12 23:58:52 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.178 2007/02/14 19:44:15 jkim Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -256,7 +256,7 @@ { BGE_CHIPID_BCM5714_B3, "BCM5714 B3" }, { BGE_CHIPID_BCM5715_A0, "BCM5715 A0" }, { BGE_CHIPID_BCM5715_A1, "BCM5715 A1" }, - /* 5784 and 5787 share the same ASIC ID */ + /* 5754 and 5787 share the same ASIC ID */ { BGE_CHIPID_BCM5787_A0, "BCM5754/5787 A0" }, { BGE_CHIPID_BCM5787_A1, "BCM5754/5787 A1" }, { BGE_CHIPID_BCM5787_A2, "BCM5754/5787 A2" }, @@ -280,7 +280,7 @@ { BGE_ASICREV_BCM5780, "unknown BCM5780" }, { BGE_ASICREV_BCM5714, "unknown BCM5714" }, { BGE_ASICREV_BCM5755, "unknown BCM5755" }, - /* 5784 and 5787 share the same ASIC ID */ + /* 5754 and 5787 share the same ASIC ID */ { BGE_ASICREV_BCM5787, "unknown BCM5754/5787" }, { 0, NULL } @@ -2593,7 +2593,7 @@ dev = sc->bge_dev; - if (BGE_IS_5705_PLUS(sc) && !BGE_IS_5714_FAMILY(sc)) { + if (BGE_IS_575X_PLUS(sc) && !BGE_IS_5714_FAMILY(sc)) { if (sc->bge_flags & BGE_FLAG_PCIE) write_op = bge_writemem_direct; else ==== //depot/projects/linuxolator/src/sys/dev/mii/brgphy.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.63 2007/02/13 00:34:32 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.64 2007/02/14 18:21:32 jkim Exp $"); /* * Driver for the Broadcom BCM54xx/57xx 1000baseTX PHY. @@ -619,7 +619,7 @@ int reg; uint16_t val; } dspcode[] = { - { BRGPHY_MII_DSP_ADDR_REG, 0x0a75 }, + { BRGPHY_MII_DSP_RW_PORT, 0x0a75 }, { 0x1c, 0x8c68 }, { 0x1c, 0x8d68 }, { 0x1c, 0x8c68 }, ==== //depot/projects/linuxolator/src/sys/dev/mpt/mpt_pci.c#6 (text+ko) ==== @@ -99,16 +99,17 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.46 2007/01/05 22:49:05 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.47 2007/02/14 22:31:21 jhb Exp $"); #include #include #include #if __FreeBSD_version < 700000 +#define pci_msix_count(x) 0 #define pci_msi_count(x) 0 -#define pci_msi_enable(x) 0 #define pci_alloc_msi(x, y) 1 +#define pci_alloc_msix(x, y) 1 #define pci_release_msi(x) do { ; } while (0) #endif @@ -527,14 +528,28 @@ /* Get a handle to the interrupt */ iqd = 0; - if (mpt->msi_enable && pci_msi_count(dev) == 1) { - mpt->pci_msi_count = 1; - if (pci_alloc_msi(dev, &mpt->pci_msi_count) == 0) { - iqd = 1; - } else { - mpt->pci_msi_count = 0; + if (mpt->msi_enable) { + /* + * First try to alloc an MSI-X message. If that + * fails, then try to alloc an MSI message instead. + */ + if (pci_msix_count(dev) == 1) { + mpt->pci_msi_count = 1; + if (pci_alloc_msix(dev, &mpt->pci_msi_count) == 0) { + iqd = 1; + } else { + mpt->pci_msi_count = 0; + } + } + if (iqd == 0 && pci_msi_count(dev) == 1) { + mpt->pci_msi_count = 1; + if (pci_alloc_msi(dev, &mpt->pci_msi_count) == 0) { + iqd = 1; + } else { + mpt->pci_msi_count = 0; + } } - } + } mpt->pci_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &iqd, RF_ACTIVE | RF_SHAREABLE); if (mpt->pci_irq == NULL) { ==== //depot/projects/linuxolator/src/sys/dev/pci/pci.c#17 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.339 2007/02/08 14:33:07 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.342 2007/02/14 22:36:27 jhb Exp $"); #include "opt_bus.h" @@ -217,6 +217,7 @@ struct devlist pci_devq; uint32_t pci_generation; uint32_t pci_numdevs = 0; +static int pcie_chipset, pcix_chipset; /* sysctl vars */ SYSCTL_NODE(_hw, OID_AUTO, pci, CTLFLAG_RD, 0, "PCI bus tuning parameters"); @@ -585,6 +586,28 @@ cfg->subvendor = val & 0xffff; cfg->subdevice = val >> 16; } + break; + case PCIY_PCIX: /* PCI-X */ + /* + * Assume we have a PCI-X chipset if we have + * at least one PCI-PCI bridge with a PCI-X + * capability. Note that some systems with + * PCI-express or HT chipsets might match on + * this check as well. + */ + if ((cfg->hdrtype & PCIM_HDRTYPE) == 1) + pcix_chipset = 1; + break; + case PCIY_EXPRESS: /* PCI-express */ + /* + * Assume we have a PCI-express chipset if we have + * at least one PCI-express root port. + */ + val = REG(ptr + PCIR_EXPRESS_FLAGS, 2); + if ((val & PCIM_EXP_FLAGS_TYPE) == + PCIM_EXP_TYPE_ROOT_PORT) + pcie_chipset = 1; + break; default: break; } @@ -1141,7 +1164,7 @@ /* Unfinished range? */ if (run) - printf("%d", irq); + printf("-%d", irq); printf(" for MSI-X\n"); } } @@ -1220,8 +1243,16 @@ for (i = 0; i < cfg->msix.msix_alloc; i++) { resource_list_add(&dinfo->resources, SYS_RES_IRQ, indices[i], irqs[i], irqs[i], 1); + + /* + * The indices in the backend code (PCIB_* methods and the + * MI helper routines for MD code such as pci_enable_msix()) + * are all zero-based. However, the indices passed to this + * function are 1-based so that the correspond 1:1 with the + * SYS_RES_IRQ resource IDs. + */ error = PCIB_REMAP_MSIX(device_get_parent(dev), child, - indices[i], irqs[i]); + indices[i] - 1, irqs[i]); KASSERT(error == 0, ("Failed to remap MSI-X message")); } if (bootverbose) { @@ -1395,6 +1426,10 @@ if (!pci_honor_msi_blacklist) return (0); + /* Blacklist all non-PCI-express and non-PCI-X chipsets. */ + if (!(pcie_chipset || pcix_chipset)) + return (1); + dev = pci_find_bsf(0, 0, 0); if (dev != NULL) return (pci_msi_device_blacklisted(dev)); ==== //depot/projects/linuxolator/src/sys/dev/sound/pci/envy24.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.5 2006/12/17 16:06:45 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.6 2007/02/14 15:23:44 ariff Exp $"); MALLOC_DEFINE(M_ENVY24, "envy24", "envy24 audio"); @@ -109,7 +109,7 @@ /* device private data */ struct sc_info { device_t dev; - void *lock; + struct mtx *lock; /* Control/Status registor */ struct resource *cs; ==== //depot/projects/linuxolator/src/sys/dev/sound/pci/envy24ht.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24ht.c,v 1.6 2006/12/17 16:06:45 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24ht.c,v 1.7 2007/02/14 15:23:44 ariff Exp $"); MALLOC_DEFINE(M_ENVY24HT, "envy24ht", "envy24ht audio"); @@ -110,7 +110,7 @@ /* device private data */ struct sc_info { device_t dev; - void *lock; + struct mtx *lock; /* Control/Status registor */ struct resource *cs; ==== //depot/projects/linuxolator/src/sys/dev/sound/pci/spicds.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/pci/spicds.c,v 1.4 2006/09/30 16:53:40 netchild Exp $ + * $FreeBSD: src/sys/dev/sound/pci/spicds.c,v 1.5 2007/02/14 15:23:44 ariff Exp $ */ #include @@ -45,7 +45,7 @@ unsigned int dvc; /* De-emphasis and Volume Control */ unsigned int left, right; char name[SPICDS_NAMELEN]; - void *lock; + struct mtx *lock; }; static void ==== //depot/projects/linuxolator/src/sys/i386/linux/linux.h#14 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/linux/linux.h,v 1.73 2007/02/01 13:36:19 kib Exp $ + * $FreeBSD: src/sys/i386/linux/linux.h,v 1.74 2007/02/15 00:54:40 jkim Exp $ */ #ifndef _I386_LINUX_LINUX_H_ ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#30 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.69 2007/02/01 13:27:52 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.70 2007/02/15 00:54:40 jkim Exp $"); #include #include ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_proto.h#19 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.85 2006/12/31 13:16:00 netchild Exp + * $FreeBSD: src/sys/i386/linux/linux_proto.h,v 1.91 2007/02/15 00:57:03 jkim Exp $ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.86 2007/02/15 00:54:40 jkim Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_syscall.h#18 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.85 2006/12/31 13:16:00 netchild Exp + * $FreeBSD: src/sys/i386/linux/linux_syscall.h,v 1.84 2007/02/15 00:57:04 jkim Exp $ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.86 2007/02/15 00:54:40 jkim Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_sysent.c#18 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.85 2006/12/31 13:16:00 netchild Exp + * $FreeBSD: src/sys/i386/linux/linux_sysent.c,v 1.91 2007/02/15 00:57:04 jkim Exp $ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.86 2007/02/15 00:54:40 jkim Exp */ #include ==== //depot/projects/linuxolator/src/sys/i386/linux/syscalls.master#17 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/i386/linux/syscalls.master,v 1.85 2006/12/31 13:16:00 netchild Exp $ + $FreeBSD: src/sys/i386/linux/syscalls.master,v 1.86 2007/02/15 00:54:40 jkim Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ==== //depot/projects/linuxolator/src/sys/kern/uipc_usrreq.c#7 (text+ko) ==== @@ -1,7 +1,7 @@ /*- * Copyright (c) 1982, 1986, 1989, 1991, 1993 * The Regents of the University of California. - * Copyright (c) 2004-2006 Robert N. M. Watson + * Copyright (c) 2004-2007 Robert N. M. Watson * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -47,10 +47,16 @@ * passing UNIX domain sockets over other UNIX domain sockets requires the * implementation of a simple garbage collector to find and tear down cycles * of disconnected sockets. + * + * TODO: + * SEQPACKET, RDM + * rethink name space problems + * need a proper out-of-band + * lock pushdown */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.192 2007/02/13 21:00:57 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.194 2007/02/14 15:05:40 rwatson Exp $"); #include "opt_mac.h" @@ -87,24 +93,23 @@ #include -static uma_zone_t unp_zone; -static unp_gen_t unp_gencnt; -static u_int unp_count; +static uma_zone_t unp_zone; +static unp_gen_t unp_gencnt; +static u_int unp_count; /* Count of local sockets. */ +static ino_t unp_ino; /* Prototype for fake inode numbers. */ +static int unp_rights; /* File descriptors in flight. */ +static struct unp_head unp_shead; /* List of local stream sockets. */ +static struct unp_head unp_dhead; /* List of local datagram sockets. */ -static struct unp_head unp_shead, unp_dhead; +static const struct sockaddr sun_noname = { sizeof(sun_noname), AF_LOCAL }; /* - * Unix communications domain. - * - * TODO: - * SEQPACKET, RDM - * rethink name space problems - * need a proper out-of-band - * lock pushdown + * Garbage collection of cyclic file descriptor/socket references occurs + * asynchronously in a taskqueue context in order to avoid recursion and + * reentrance in the UNIX domain socket, file descriptor, and socket layer + * code. See unp_gc() for a full description. */ -static const struct sockaddr sun_noname = { sizeof(sun_noname), AF_LOCAL }; -static ino_t unp_ino; /* prototype for fake inode numbers */ -struct mbuf *unp_addsockcred(struct thread *, struct mbuf *); +static struct task unp_gc_task; /* * Both send and receive buffers are allocated PIPSIZ bytes of buffering for @@ -123,8 +128,6 @@ static u_long unpdg_sendspace = 2*1024; /* really max datagram size */ static u_long unpdg_recvspace = 4*1024; -static int unp_rights; /* file descriptors in flight */ - SYSCTL_NODE(_net, PF_LOCAL, local, CTLFLAG_RW, 0, "Local domain"); SYSCTL_NODE(_net_local, SOCK_STREAM, stream, CTLFLAG_RW, 0, "SOCK_STREAM"); SYSCTL_NODE(_net_local, SOCK_DGRAM, dgram, CTLFLAG_RW, 0, "SOCK_DGRAM"); @@ -159,35 +162,29 @@ * and exposes weaknesses in the socket->protocol API by offering poor * failure modes. */ -static struct mtx unp_mtx; +static struct mtx unp_mtx; #define UNP_LOCK_INIT() \ - mtx_init(&unp_mtx, "unp", NULL, MTX_DEF) + mtx_init(&unp_mtx, "unp", NULL, MTX_DEF | MTX_RECURSE) #define UNP_LOCK() mtx_lock(&unp_mtx) #define UNP_UNLOCK() mtx_unlock(&unp_mtx) #define UNP_LOCK_ASSERT() mtx_assert(&unp_mtx, MA_OWNED) #define UNP_UNLOCK_ASSERT() mtx_assert(&unp_mtx, MA_NOTOWNED) -/* - * Garbage collection of cyclic file descriptor/socket references occurs - * asynchronously in a taskqueue context in order to avoid recursion and - * reentrance in the UNIX domain socket, file descriptor, and socket layer - * code. See unp_gc() for a full description. - */ -static struct task unp_gc_task; - -static int unp_connect(struct socket *,struct sockaddr *, struct thread *); -static int unp_connect2(struct socket *so, struct socket *so2, int); -static void unp_disconnect(struct unpcb *); -static void unp_shutdown(struct unpcb *); -static void unp_drop(struct unpcb *, int); -static void unp_gc(__unused void *, int); -static void unp_scan(struct mbuf *, void (*)(struct file *)); -static void unp_mark(struct file *); -static void unp_discard(struct file *); -static void unp_freerights(struct file **, int); -static int unp_internalize(struct mbuf **, struct thread *); -static int unp_listen(struct socket *, struct unpcb *, int, +static int unp_connect(struct socket *, struct sockaddr *, + struct thread *); +static int unp_connect2(struct socket *so, struct socket *so2, int); +static void unp_disconnect(struct unpcb *); +static void unp_shutdown(struct unpcb *); +static void unp_drop(struct unpcb *, int); +static void unp_gc(__unused void *, int); +static void unp_scan(struct mbuf *, void (*)(struct file *)); +static void unp_mark(struct file *); +static void unp_discard(struct file *); +static void unp_freerights(struct file **, int); +static int unp_internalize(struct mbuf **, struct thread *); +static int unp_listen(struct socket *, struct unpcb *, int, struct thread *); +struct mbuf *unp_addsockcred(struct thread *, struct mbuf *); /* * Definitions of protocols supported in the LOCAL domain. @@ -278,7 +275,7 @@ if (error) return (error); } - unp = uma_zalloc(unp_zone, M_WAITOK | M_ZERO); + unp = uma_zalloc(unp_zone, M_NOWAIT | M_ZERO); if (unp == NULL) return (ENOBUFS); LIST_INIT(&unp->unp_refs); @@ -988,17 +985,9 @@ goto bad2; } if (so->so_proto->pr_flags & PR_CONNREQUIRED) { - if (so2->so_options & SO_ACCEPTCONN) { - /* - * NB: drop locks here so unp_attach is entered w/o - * locks; this avoids a recursive lock of the head - * and holding sleep locks across a (potentially) - * blocking malloc. - */ - UNP_UNLOCK(); + if (so2->so_options & SO_ACCEPTCONN) so3 = sonewconn(so2, 0); - UNP_LOCK(); - } else + else so3 = NULL; if (so3 == NULL) { error = ECONNREFUSED; From owner-p4-projects@FreeBSD.ORG Thu Feb 15 11:55:59 2007 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 A4D3016A407; Thu, 15 Feb 2007 11:55:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7834216A400 for ; Thu, 15 Feb 2007 11:55:59 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6956E13C441 for ; Thu, 15 Feb 2007 11:55:59 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1FBtxYN039767 for ; Thu, 15 Feb 2007 11:55:59 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1FBtwJi039763 for perforce@freebsd.org; Thu, 15 Feb 2007 11:55:58 GMT (envelope-from piso@freebsd.org) Date: Thu, 15 Feb 2007 11:55:58 GMT Message-Id: <200702151155.l1FBtwJi039763@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 114553 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, 15 Feb 2007 11:56:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=114553 Change 114553 by piso@piso_newluxor on 2007/02/15 11:54:57 Teach mbuf to alias_pptp. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_pptp.c#15 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_pptp.c#15 (text+ko) ==== @@ -307,8 +307,15 @@ u_int16_t ctl_type; /* control message type */ struct ip *pip; struct tcphdr *tc; + int size; - PULLUP_IPHDR(pip, ptr); + PULLUP_IPTCPHDR(pip, ptr); + if (pip == NULL) + return; + tc = (struct tcphdr *)ip_next(pip); + size = ((pip->ip_hl + tc->th_off) << 2) + + (sizeof(struct pptpMsgHead) + sizeof(struct pptpCallIds)); + PULLUP_SIZE(pip, ptr, size); if (pip == NULL) return; /* Verify valid PPTP control message */ @@ -349,10 +356,6 @@ cptr->cid1 = GetAliasPort(pptp_lnk); /* Compute TCP checksum for revised packet */ - PULLUP_TCPHDR(pip ,ptr); - if (pip == NULL) - return; - tc = (struct tcphdr *)ip_next(pip); accumulate -= cptr->cid1; ADJUST_CHECKSUM(accumulate, tc->th_sum); @@ -386,8 +389,15 @@ u_int16_t ctl_type; /* control message type */ struct ip *pip; struct tcphdr *tc; + int size; - PULLUP_IPHDR(pip ,ptr); + PULLUP_IPTCPHDR(pip, ptr); + if (pip == NULL) + return; + tc = (struct tcphdr *)ip_next(pip); + size = ((pip->ip_hl + tc->th_off) << 2) + + (sizeof(struct pptpMsgHead) + sizeof(struct pptpCallIds)); + PULLUP_SIZE(pip, ptr, size); if (pip == NULL) return; /* Verify valid PPTP control message */ @@ -428,10 +438,6 @@ *pcall_id = GetOriginalPort(pptp_lnk); /* Compute TCP checksum for modified packet */ - PULLUP_TCPHDR(pip, ptr); - if (pip == NULL) - return; - tc = (struct tcphdr *)ip_next(pip); accumulate -= *pcall_id; ADJUST_CHECKSUM(accumulate, tc->th_sum); @@ -492,8 +498,10 @@ struct alias_link *lnk; struct ip *pip; - // XXX broken PULLUP_IPHDR(pip, ptr); + PULLUP_SIZE(pip, ptr, (pip->ip_hl << 2) + sizeof(GreHdr)); + if (pip == NULL) + return (-1); gr = (GreHdr *) ip_next(pip); /* Check GRE header bits. */ @@ -519,8 +527,10 @@ struct alias_link *lnk; struct ip *pip; - // XXX broken PULLUP_IPHDR(pip, ptr); + PULLUP_SIZE(pip, ptr, (pip->ip_hl << 2) + sizeof(GreHdr)); + if (pip == NULL) + return (-1); gr = (GreHdr *) ip_next(pip); /* Check GRE header bits. */ From owner-p4-projects@FreeBSD.ORG Thu Feb 15 14:32:19 2007 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 21E0516A408; Thu, 15 Feb 2007 14:32:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EBABA16A402 for ; Thu, 15 Feb 2007 14:32:18 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DAF1D13C481 for ; Thu, 15 Feb 2007 14:32:18 +0000 (UTC) (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.6/8.13.6) with ESMTP id l1FEWIDr076266 for ; Thu, 15 Feb 2007 14:32:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1FEWInO076258 for perforce@freebsd.org; Thu, 15 Feb 2007 14:32:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 15 Feb 2007 14:32:18 GMT Message-Id: <200702151432.l1FEWInO076258@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 114557 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, 15 Feb 2007 14:32:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=114557 Change 114557 by rwatson@rwatson_cinnamon on 2007/02/15 14:31:43 Generally, we allow PRIV_SEEOTHERUIDS in jail, so allow it in mac_seeotheruids policy also. Affected files ... .. //depot/projects/trustedbsd/priv/sys/security/mac_seeotheruids/mac_seeotheruids.c#6 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/security/mac_seeotheruids/mac_seeotheruids.c#6 (text+ko) ==== @@ -126,7 +126,8 @@ return (0); if (suser_privileged) { - if (priv_check_cred(u1, PRIV_SEEOTHERUIDS, 0) == 0) + if (priv_check_cred(u1, PRIV_SEEOTHERUIDS, SUSER_ALLOWJAIL) + == 0) return (0); } From owner-p4-projects@FreeBSD.ORG Thu Feb 15 14:35:23 2007 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 72A7216A41F; Thu, 15 Feb 2007 14:35:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4680716A408 for ; Thu, 15 Feb 2007 14:35:23 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3501613C4A6 for ; Thu, 15 Feb 2007 14:35:23 +0000 (UTC) (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.6/8.13.6) with ESMTP id l1FEZNvs076854 for ; Thu, 15 Feb 2007 14:35:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1FEZMMn076851 for perforce@freebsd.org; Thu, 15 Feb 2007 14:35:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 15 Feb 2007 14:35:22 GMT Message-Id: <200702151435.l1FEZMMn076851@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 114558 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, 15 Feb 2007 14:35:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=114558 Change 114558 by rwatson@rwatson_cinnamon on 2007/02/15 14:34:57 Make privilege check for differing uids setting process flags via procfs the same as using other debugging mechanisms: allow in jail. Affected files ... .. //depot/projects/trustedbsd/priv/sys/fs/procfs/procfs_ioctl.c#7 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/fs/procfs/procfs_ioctl.c#7 (text+ko) ==== @@ -110,11 +110,9 @@ * XXXRW: Is this specific check required here, as * p_candebug() should implement it, or other checks * are missing. - * - * XXXRW: Other debugging privileges are granted in - * jail, why isn't this? */ - error = priv_check(td, PRIV_DEBUG_SUGID); + error = priv_check_cred(td->td_ucred, + PRIV_DEBUG_SUGID, SUSER_ALLOWJAIL); if (error) break; } From owner-p4-projects@FreeBSD.ORG Thu Feb 15 14:36:25 2007 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 4B81916A407; Thu, 15 Feb 2007 14:36:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2A1A216A400 for ; Thu, 15 Feb 2007 14:36:25 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 189F013C442 for ; Thu, 15 Feb 2007 14:36:25 +0000 (UTC) (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.6/8.13.6) with ESMTP id l1FEaOhm076931 for ; Thu, 15 Feb 2007 14:36:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1FEaOaW076928 for perforce@freebsd.org; Thu, 15 Feb 2007 14:36:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 15 Feb 2007 14:36:24 GMT Message-Id: <200702151436.l1FEaOaW076928@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 114559 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, 15 Feb 2007 14:36:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=114559 Change 114559 by rwatson@rwatson_cinnamon on 2007/02/15 14:36:10 Make privilege check for audit privileves in jail match what is being done elsewhere: for now, no audit in jail. Affected files ... .. //depot/projects/trustedbsd/priv/sys/kern/kern_jail.c#15 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/kern/kern_jail.c#15 (text+ko) ==== @@ -542,6 +542,7 @@ */ case PRIV_KTRACE: +#if 0 /* * Allow jailed processes to configure audit identity and * submit audit records (login, etc). In the future we may @@ -551,6 +552,7 @@ case PRIV_AUDIT_GETAUDIT: case PRIV_AUDIT_SETAUDIT: case PRIV_AUDIT_SUBMIT: +#endif /* * Allow jailed processes to manipulate process UNIX From owner-p4-projects@FreeBSD.ORG Thu Feb 15 15:33:37 2007 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 CC7B616A407; Thu, 15 Feb 2007 15:33:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8CC3416A408 for ; Thu, 15 Feb 2007 15:33:36 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7CF3213C494 for ; Thu, 15 Feb 2007 15:33:36 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1FFXa2D087893 for ; Thu, 15 Feb 2007 15:33:36 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1FFXaaI087890 for perforce@freebsd.org; Thu, 15 Feb 2007 15:33:36 GMT (envelope-from piso@freebsd.org) Date: Thu, 15 Feb 2007 15:33:36 GMT Message-Id: <200702151533.l1FFXaaI087890@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 114561 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, 15 Feb 2007 15:33:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=114561 Change 114561 by piso@piso_newluxor on 2007/02/15 15:33:28 o Teach mbuf to skinny. o Axe an useless var. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_skinny.c#13 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_skinny.c#13 (text+ko) ==== @@ -63,7 +63,7 @@ if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL) return (-1); if (la->skinnyPort != 0 && (ntohs(*ah->sport) == la->skinnyPort || - ntohs(*ah->dport) == la->skinnyPort)) + ntohs(*ah->dport) == la->skinnyPort)) return (0); return (-1); } @@ -305,10 +305,13 @@ size_t hlen, tlen, dlen; struct ip *pip; struct tcphdr *tc; - u_int32_t msgId, t, len, lip; + u_int32_t msgId, len, lip; struct skinny_header *sd; size_t orig_len, skinny_hdr_len = sizeof(struct skinny_header); ConvDirection direction; +#ifdef _KERNEL + struct mbuf *m, *tmp_m; +#endif PULLUP_TCPHDR(pip, ptr); if (pip == NULL) @@ -318,8 +321,16 @@ tlen = ntohs(pip->ip_len); dlen = tlen - hlen; - // XXX broken +#ifdef _KERNEL + m = m_split(*ptr, hlen, M_TRYWAIT); + *ptr = m_pullup(*ptr, hlen); + pip = mtod(*ptr, struct ip *); + tc = (struct tcphdr *)ip_next(pip); + m = m_pullup(m, sizeof(struct skinny_header)); + sd = mtod(m, struct skinny_header *); +#else sd = (struct skinny_header *)tcp_next(tc); +#endif /* * XXX This direction is reserved for future use. I still need to @@ -335,7 +346,7 @@ fprintf(stderr, "PacketAlias/Skinny: Invalid port number, not a Skinny packet\n"); #endif - return; + goto getout; } orig_len = dlen; @@ -349,14 +360,23 @@ while (dlen >= skinny_hdr_len) { len = (sd->len); msgId = (sd->msgId); - t = len; - if (t > orig_len || t > dlen) { +#ifdef _KERNEL + /* + * After this pullup, we'll have a contiguos Skinny Packet + * Header + len of data. + */ + m = m_pullup(m, skinny_hdr_len + len); + if (m == NULL) + goto getout; + sd = mtod(m, struct skinny_header *); +#endif + if (len > orig_len || len > dlen) { #ifdef LIBALIAS_DEBUG fprintf(stderr, "PacketAlias/Skinny: Not a skinny packet, invalid length \n"); #endif - return; + goto getout; } switch (msgId) { case REG_MSG: { @@ -367,7 +387,7 @@ fprintf(stderr, "PacketAlias/Skinny: Not a skinny packet, bad registration message\n"); #endif - return; + goto getout; } reg_mesg = (struct RegisterMessage *)&sd->msgId; #ifdef LIBALIAS_DEBUG @@ -385,7 +405,7 @@ fprintf(stderr, "PacketAlias/Skinny: Not a skinny packet, port message\n"); #endif - return; + goto getout; } #ifdef LIBALIAS_DEBUG fprintf(stderr, @@ -403,7 +423,7 @@ fprintf(stderr, "PacketAlias/Skinny: Not a skinny packet, packet,OpnRcvChnAckMsg\n"); #endif - return; + goto getout; } #ifdef LIBALIAS_DEBUG fprintf(stderr, @@ -421,7 +441,7 @@ fprintf(stderr, "PacketAlias/Skinny: Not a skinny packet,StartMediaTx Message\n"); #endif - return; + goto getout; } #ifdef LIBALIAS_DEBUG fprintf(stderr, @@ -436,6 +456,19 @@ } /* Place the pointer at the next message in the packet. */ dlen -= len + (skinny_hdr_len - sizeof(msgId)); +#ifdef _KERNEL + /* Trim from the beginning of mbuf the data we already used */ + tmp_m = m_split(m, skinny_hdr_len + len, M_TRYWAIT); + m_cat(*ptr, m); + m = tmp_m; + sd = mtod(m, struct skinny_header *); +#else sd = (struct skinny_header *)(((char *)&sd->msgId) + len); +#endif } +getout: +#ifdef _KERNEL + m_cat(*ptr, m); +#endif + return; } From owner-p4-projects@FreeBSD.ORG Thu Feb 15 15:39:45 2007 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 CF07916A420; Thu, 15 Feb 2007 15:39:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9600016A406 for ; Thu, 15 Feb 2007 15:39:44 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8444813C478 for ; Thu, 15 Feb 2007 15:39:44 +0000 (UTC) (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.6/8.13.6) with ESMTP id l1FFdiZw088299 for ; Thu, 15 Feb 2007 15:39:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1FFdifu088296 for perforce@freebsd.org; Thu, 15 Feb 2007 15:39:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 15 Feb 2007 15:39:44 GMT Message-Id: <200702151539.l1FFdifu088296@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 114562 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, 15 Feb 2007 15:39:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=114562 Change 114562 by rwatson@rwatson_cinnamon on 2007/02/15 15:39:25 Do allow over-size messages in jail. Affected files ... .. //depot/projects/trustedbsd/priv/sys/kern/sysv_msg.c#7 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/kern/sysv_msg.c#7 (text+ko) ==== @@ -508,7 +508,8 @@ if ((error = ipcperm(td, &msqkptr->u.msg_perm, IPC_M))) goto done2; if (msqbuf->msg_qbytes > msqkptr->u.msg_qbytes) { - error = priv_check(td, PRIV_IPC_MSGSIZE); + error = priv_check_cred(td->td_ucred, + PRIV_IPC_MSGSIZE, SUSER_ALLOWJAIL); if (error) goto done2; } From owner-p4-projects@FreeBSD.ORG Thu Feb 15 16:01:13 2007 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 2891216A407; Thu, 15 Feb 2007 16:01:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EC0DB16A400 for ; Thu, 15 Feb 2007 16:01:12 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DA3BB13C4A8 for ; Thu, 15 Feb 2007 16:01:12 +0000 (UTC) (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.6/8.13.6) with ESMTP id l1FG1CP5091757 for ; Thu, 15 Feb 2007 16:01:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1FG1CBt091709 for perforce@freebsd.org; Thu, 15 Feb 2007 16:01:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 15 Feb 2007 16:01:12 GMT Message-Id: <200702151601.l1FG1CBt091709@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 114564 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, 15 Feb 2007 16:01:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=114564 Change 114564 by rwatson@rwatson_cinnamon on 2007/02/15 16:00:36 Remove a suser() check that got introduced during some or another CVS project. Need to turn suser() into panic() to discourage this. Affected files ... .. //depot/projects/trustedbsd/priv/sys/kern/kern_resource.c#8 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/kern/kern_resource.c#8 (text+ko) ==== @@ -330,7 +330,7 @@ break; /* Disallow setting rtprio in most cases if not superuser. */ - if (suser(td) != 0) { + if (priv_check(td, PRIV_SCHED_RTPRIO) != 0) { /* can't set realtime priority */ /* * Realtime priority has to be restricted for reasons which should be From owner-p4-projects@FreeBSD.ORG Thu Feb 15 16:25:06 2007 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 1519216A420; Thu, 15 Feb 2007 16:25:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E224216A409 for ; Thu, 15 Feb 2007 16:25:05 +0000 (UTC) (envelope-from brooks@lor.one-eyed-alien.net) Received: from lor.one-eyed-alien.net (grnl-static-02-0046.dsl.iowatelecom.net [69.66.56.110]) by mx1.freebsd.org (Postfix) with ESMTP id A256213C471 for ; Thu, 15 Feb 2007 16:25:05 +0000 (UTC) (envelope-from brooks@lor.one-eyed-alien.net) Received: from lor.one-eyed-alien.net (localhost [127.0.0.1]) by lor.one-eyed-alien.net (8.13.8/8.13.8) with ESMTP id l1FG6lMm097630; Thu, 15 Feb 2007 10:06:47 -0600 (CST) (envelope-from brooks@lor.one-eyed-alien.net) Received: (from brooks@localhost) by lor.one-eyed-alien.net (8.13.8/8.13.8/Submit) id l1FG6leC097629; Thu, 15 Feb 2007 10:06:47 -0600 (CST) (envelope-from brooks) Date: Thu, 15 Feb 2007 10:06:47 -0600 From: Brooks Davis To: Robert Watson Message-ID: <20070215160647.GB97047@lor.one-eyed-alien.net> References: <200702151601.l1FG1CBt091709@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="OwLcNYc0lM97+oe1" Content-Disposition: inline In-Reply-To: <200702151601.l1FG1CBt091709@repoman.freebsd.org> User-Agent: Mutt/1.5.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (lor.one-eyed-alien.net [127.0.0.1]); Thu, 15 Feb 2007 10:06:47 -0600 (CST) Cc: Perforce Change Reviews Subject: Re: PERFORCE change 114564 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, 15 Feb 2007 16:25:06 -0000 --OwLcNYc0lM97+oe1 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Feb 15, 2007 at 04:01:12PM +0000, Robert Watson wrote: > http://perforce.freebsd.org/chv.cgi?CH=3D114564 >=20 > Change 114564 by rwatson@rwatson_cinnamon on 2007/02/15 16:00:36 >=20 > Remove a suser() check that got introduced during some or another > CVS project. Need to turn suser() into panic() to discourage this. or remove/rename it so it's a compile error? -- Brooks --OwLcNYc0lM97+oe1 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (FreeBSD) iD8DBQFF1IUWXY6L6fI4GtQRAiYjAJ4uSxHXfqzAkfaAhnPugRkHuzCPJgCdHoLU K7ax/ymasBpAKlbs5tkiNm0= =pHK1 -----END PGP SIGNATURE----- --OwLcNYc0lM97+oe1-- From owner-p4-projects@FreeBSD.ORG Thu Feb 15 17:53:36 2007 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 765EC16A408; Thu, 15 Feb 2007 17:53:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 339FD16A400 for ; Thu, 15 Feb 2007 17:53:36 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2373D13C461 for ; Thu, 15 Feb 2007 17:53:36 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1FHra5M041285 for ; Thu, 15 Feb 2007 17:53:36 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1FHrZoj041282 for perforce@freebsd.org; Thu, 15 Feb 2007 17:53:35 GMT (envelope-from piso@freebsd.org) Date: Thu, 15 Feb 2007 17:53:35 GMT Message-Id: <200702151753.l1FHrZoj041282@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 114569 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, 15 Feb 2007 17:53:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=114569 Change 114569 by piso@piso_newluxor on 2007/02/15 17:52:53 don't pass down maxpacketsize if we don't use it. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_smedia.c#18 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_smedia.c#18 (text+ko) ==== @@ -129,8 +129,7 @@ #define TFTP_PORT_NUMBER 69 static void -AliasHandleRtspOut(struct libalias *, pkt_t ptr, struct alias_link *, - int maxpacketsize); +AliasHandleRtspOut(struct libalias *, pkt_t ptr, struct alias_link *); static int fingerprint(struct libalias *la, struct ip *pip, struct alias_data *ah) { @@ -138,8 +137,7 @@ if (ah->dport != NULL && ah->aport != NULL && ah->sport != NULL && ntohs(*ah->dport) == TFTP_PORT_NUMBER) return (0); - if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL || - ah->maxpktsize == 0) + if (ah->dport == NULL || ah->sport == NULL || ah->lnk == NULL) return (-1); if (ntohs(*ah->dport) == RTSP_CONTROL_PORT_NUMBER_1 || ntohs(*ah->sport) == RTSP_CONTROL_PORT_NUMBER_1 @@ -160,7 +158,7 @@ return (-1); FindRtspOut(la, pip->ip_src, pip->ip_dst, *ah->sport, *ah->aport, IPPROTO_UDP); - } else AliasHandleRtspOut(la, ptr, ah->lnk, ah->maxpktsize); + } else AliasHandleRtspOut(la, ptr, ah->lnk); return (0); } @@ -481,7 +479,7 @@ } static void -AliasHandleRtspOut(struct libalias *la, pkt_t ptr, struct alias_link *lnk, int maxpacketsize) +AliasHandleRtspOut(struct libalias *la, pkt_t ptr, struct alias_link *lnk) { int hlen, tlen, dlen; struct ip *pip; @@ -492,8 +490,6 @@ const char *server_port_str = "server_port"; int i, parseOk; - (void)maxpacketsize; - PULLUP_TCPHDR(pip, ptr); if (pip == NULL) return; From owner-p4-projects@FreeBSD.ORG Thu Feb 15 20:15:36 2007 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 A6E8F16A4C0; Thu, 15 Feb 2007 20:15:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 36CFB16A4B3 for ; Thu, 15 Feb 2007 20:15:36 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 25EBD13C46B for ; Thu, 15 Feb 2007 20:15:36 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1FKFZZ9067656 for ; Thu, 15 Feb 2007 20:15:36 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1FKFZKQ067653 for perforce@freebsd.org; Thu, 15 Feb 2007 20:15:35 GMT (envelope-from millert@freebsd.org) Date: Thu, 15 Feb 2007 20:15:35 GMT Message-Id: <200702152015.l1FKFZKQ067653@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 114573 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, 15 Feb 2007 20:15:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=114573 Change 114573 by millert@millert_p4 on 2007/02/15 20:15:33 Update to checkpolicy-1.34.0 from the SELinux web site. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/ChangeLog#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/VERSION#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/checkmodule.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/checkpolicy.c#12 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/checkpolicy.h#8 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/module_compiler.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/module_compiler.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/parse_util.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/parse_util.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/policy_parse.y#9 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/policy_scan.l#8 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/queue.c#5 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/queue.h#5 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/test/dismod.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/test/dispol.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,47 @@ +1.34.0 2007-01-18 + * Updated version for stable branch. + +1.33.1 2006-11-13 + * Collapse user identifiers and identifiers together. + +1.32 2006-10-17 + * Updated version for release. + +1.30.12 2006-09-28 + * Merged user and range_transition support for modules from + Darrel Goeddel + +1.30.11 2006-09-05 + * merged range_transition enhancements and user module format + changes from Darrel Goeddel + +1.30.10 2006-08-03 + * Merged symtab datum patch from Karl MacMillan. + +1.30.9 2006-06-29 + * Lindent. + +1.30.8 2006-06-29 + * Merged patch to remove TE rule conflict checking from the parser + from Joshua Brindle. This can only be done properly by the + expander. + +1.30.7 2006-06-27 + * Merged patch to make checkpolicy/checkmodule handling of + duplicate/conflicting TE rules the same as the expander + from Joshua Brindle. + +1.30.6 2006-06-26 + * Merged optionals in base take 2 patch set from Joshua Brindle. + +1.30.5 2006-05-05 + * Merged compiler cleanup patch from Karl MacMillan. + * Merged fix warnings patch from Karl MacMillan. + +1.30.4 2006-04-05 + * Changed require_class to reject permissions that have not been + declared if building a base module. + 1.30.3 2006-03-28 * Fixed checkmodule to call link_modules prior to expand_module to handle optionals. ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/Makefile#2 (text+ko) ==== @@ -12,12 +12,14 @@ override CFLAGS += -I. -I${INCLUDEDIR} -CHECKOBJS = y.tab.o lex.yy.o queue.o module_compiler.o +CHECKOBJS = y.tab.o lex.yy.o queue.o module_compiler.o parse_util.o CHECKPOLOBJS = $(CHECKOBJS) checkpolicy.o CHECKMODOBJS = $(CHECKOBJS) checkmodule.o LDLIBS=$(LIBDIR)/libsepol.a -lfl +GENERATED=lex.yy.c y.tab.c y.tab.h + all: $(TARGETS) $(MAKE) -C test @@ -55,3 +57,5 @@ -rm -f $(TARGETS) $(CHECKPOLOBJS) $(CHECKMODOBJS) y.tab.c y.tab.h lex.yy.c $(MAKE) -C test clean +indent: + ../Lindent $(filter-out $(GENERATED),$(wildcard *.[ch])) ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.30.3 +1.34.0 ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/checkmodule.c#2 (text+ko) ==== @@ -27,174 +27,124 @@ #include #include #include +#include #include "queue.h" #include "checkpolicy.h" +#include "parse_util.h" extern char *optarg; extern int optind; static sidtab_t sidtab; -extern policydb_t *policydbp; -extern queue_t id_queue; -extern unsigned int policydb_errors; -extern unsigned long policydb_lineno; -extern char source_file[]; extern int mlspol; -extern FILE *yyin; -extern void init_parser(int); -extern int yyparse(void); -extern void yyrestart(FILE *); - static char *txtfile = "policy.conf"; static char *binfile = "policy"; unsigned int policy_type = POLICY_BASE; unsigned int policyvers = MOD_POLICYDB_VERSION_MAX; -static int read_binary_policy(policydb_t *p, char *file, char *progname) +static int read_binary_policy(policydb_t * p, char *file, char *progname) { - int fd; + int fd; struct stat sb; - void *map; + void *map; struct policy_file f, *fp; - - fd = open(file, O_RDONLY); - if (fd < 0) { - fprintf(stderr, "Can't open '%s': %s\n", - file, strerror(errno)); - return -1; - } - if (fstat(fd, &sb) < 0) { - fprintf(stderr, "Can't stat '%s': %s\n", - file, strerror(errno)); - return -1; - } - map = mmap(NULL, sb.st_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); - if (map == MAP_FAILED) { - fprintf(stderr, "Can't map '%s': %s\n", - file, strerror(errno)); - return -1; - } - f.type = PF_USE_MEMORY; - f.data = map; - f.len = sb.st_size; - fp = &f; + + fd = open(file, O_RDONLY); + if (fd < 0) { + fprintf(stderr, "Can't open '%s': %s\n", + file, strerror(errno)); + return -1; + } + if (fstat(fd, &sb) < 0) { + fprintf(stderr, "Can't stat '%s': %s\n", + file, strerror(errno)); + return -1; + } + map = + mmap(NULL, sb.st_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); + if (map == MAP_FAILED) { + fprintf(stderr, "Can't map '%s': %s\n", file, strerror(errno)); + return -1; + } + f.type = PF_USE_MEMORY; + f.data = map; + f.len = sb.st_size; + fp = &f; if (policydb_init(p)) { - fprintf(stderr, "%s: policydb_init: Out of memory!\n", progname); + fprintf(stderr, "%s: policydb_init: Out of memory!\n", + progname); + return -1; + } + if (policydb_read(p, fp, 1)) { + fprintf(stderr, + "%s: error(s) encountered while parsing configuration\n", + progname); return -1; - } - if (policydb_read(p, fp, 1)) { - fprintf(stderr, "%s: error(s) encountered while parsing configuration\n", progname); - return -1; - } - - /* Check Policy Consistency */ - if (p->mls) { - if (!mlspol) { - fprintf(stderr,"%s: MLS policy, but non-MLS" - " is specified\n", progname); - return -1; - } - } else { - if (mlspol) { - fprintf(stderr,"%s: non-MLS policy, but MLS" - " is specified\n", progname); - return -1; - } - } - return 0; + } + + /* Check Policy Consistency */ + if (p->mls) { + if (!mlspol) { + fprintf(stderr, "%s: MLS policy, but non-MLS" + " is specified\n", progname); + return -1; + } + } else { + if (mlspol) { + fprintf(stderr, "%s: non-MLS policy, but MLS" + " is specified\n", progname); + return -1; + } + } + return 0; } -static int read_source_policy(policydb_t *p, char *file, char *progname) +static int write_binary_policy(policydb_t * p, char *file, char *progname) { - yyin = fopen(file, "r"); - if (!yyin) { - fprintf(stderr, "%s: unable to open %s\n", progname, - file); - return -1; - } - - if (policydb_init(p) || - ((id_queue = queue_create()) == NULL)) { - fprintf(stderr, "%s: out of memory!\n", progname); - return -1; - } + FILE *outfp = NULL; + struct policy_file pf; + int ret; - p->policy_type = policy_type; - p->mls = mlspol; + printf("%s: writing binary representation (version %d) to %s\n", + progname, policyvers, file); - init_parser(1); - if (yyparse() || policydb_errors) { - fprintf(stderr, "%s: error(s) encountered while parsing configuration\n", progname); - return -1; - } - rewind(yyin); - init_parser(2); - source_file[0] = '\0'; - yyrestart(yyin); - if (yyparse() || policydb_errors) { - fprintf(stderr, "%s: error(s) encountered while parsing configuration\n", progname); - return -1; - } - queue_destroy(id_queue); - - if (hierarchy_check_constraints(NULL, p)) { - return -1; - } - - if (policydb_errors) - return -1; + outfp = fopen(file, "w"); + if (!outfp) { + perror(file); + exit(1); + } - fclose(yyin); - return 0; -} - -static int write_binary_policy(policydb_t *p, char *file, char *progname) -{ - FILE *outfp = NULL; - struct policy_file pf; - int ret; - - printf("%s: writing binary representation (version %d) to %s\n", - progname, policyvers, file); - - outfp = fopen(file, "w"); - if (!outfp) { - perror(file); - exit(1); - } - p->policy_type = policy_type; p->policyvers = policyvers; - - pf.type = PF_USE_STDIO; - pf.fp = outfp; - ret = policydb_write(p, &pf); - if (ret) { - fprintf(stderr, "%s: error writing %s\n", - progname, file); - return -1; - } - fclose(outfp); - return 0; + + pf.type = PF_USE_STDIO; + pf.fp = outfp; + ret = policydb_write(p, &pf); + if (ret) { + fprintf(stderr, "%s: error writing %s\n", progname, file); + return -1; + } + fclose(outfp); + return 0; } static void usage(char *progname) { - printf("usage: %s [-V] [-b] [-m] [-M] [-o FILE] [INPUT]\n", - progname); - printf("Build base and policy modules.\n"); - printf("Options:\n"); - printf(" INPUT build module from INPUT (else read from \"%s\")\n", txtfile); - printf(" -V show policy versions created by this program\n"); - printf(" -b treat input as a binary policy file\n"); - printf(" -m build a policy module instead of a base module\n"); - printf(" -M enable MLS policy\n"); - printf(" -o FILE write module to FILE (else just check syntax)\n"); + printf("usage: %s [-V] [-b] [-m] [-M] [-o FILE] [INPUT]\n", progname); + printf("Build base and policy modules.\n"); + printf("Options:\n"); + printf(" INPUT build module from INPUT (else read from \"%s\")\n", + txtfile); + printf(" -V show policy versions created by this program\n"); + printf(" -b treat input as a binary policy file\n"); + printf(" -m build a policy module instead of a base module\n"); + printf(" -M enable MLS policy\n"); + printf(" -o FILE write module to FILE (else just check syntax)\n"); exit(1); } @@ -204,13 +154,13 @@ unsigned int binary = 0; int ch; int show_version = 0; - policydb_t modpolicydb; + policydb_t modpolicydb; while ((ch = getopt(argc, argv, "ho:dbVmM")) != EOF) { switch (ch) { - case 'h': - usage (argv [0]); - break; + case 'h': + usage(argv[0]); + break; case 'o': outfile = optarg; break; @@ -223,9 +173,9 @@ break; case 'm': policy_type = POLICY_MOD; - policyvers = MOD_POLICYDB_VERSION_MAX; + policyvers = MOD_POLICYDB_VERSION_MAX; break; - case 'M': + case 'M': mlspol = 1; break; default: @@ -234,8 +184,8 @@ } if (show_version) { - printf("Module versions %d-%d\n", - MOD_POLICYDB_VERSION_MIN, MOD_POLICYDB_VERSION_MAX); + printf("Module versions %d-%d\n", + MOD_POLICYDB_VERSION_MIN, MOD_POLICYDB_VERSION_MAX); exit(0); } @@ -244,27 +194,37 @@ if (optind != argc) usage(argv[0]); } - printf("%s: loading policy configuration from %s\n", argv[0], - file); + printf("%s: loading policy configuration from %s\n", argv[0], file); - /* Set policydb and sidtab used by libsepol service functions - to my structures, so that I can directly populate and - manipulate them. */ - sepol_set_policydb(&modpolicydb); - sepol_set_sidtab(&sidtab); + /* Set policydb and sidtab used by libsepol service functions + to my structures, so that I can directly populate and + manipulate them. */ + sepol_set_policydb(&modpolicydb); + sepol_set_sidtab(&sidtab); - policydbp = &modpolicydb; if (binary) { - if (read_binary_policy(policydbp, file, argv[0]) == -1) { - exit(1); - } + if (read_binary_policy(&modpolicydb, file, argv[0]) == -1) { + exit(1); + } } else { - if (read_source_policy(policydbp, file, argv[0]) == -1) { - exit(1); - } - } + if (policydb_init(&modpolicydb)) { + fprintf(stderr, "%s: out of memory!\n", argv[0]); + return -1; + } + + modpolicydb.policy_type = policy_type; + modpolicydb.mls = mlspol; + + if (read_source_policy(&modpolicydb, file, argv[0]) == -1) { + exit(1); + } + + if (hierarchy_check_constraints(NULL, &modpolicydb)) { + return -1; + } + } - if (policydbp->policy_type == POLICY_BASE) { + if (modpolicydb.policy_type == POLICY_BASE) { /* Verify that we can successfully expand the base module. */ policydb_t kernpolicydb; @@ -272,28 +232,31 @@ fprintf(stderr, "%s: policydb_init failed\n", argv[0]); exit(1); } - if (link_modules(NULL, policydbp, NULL, 0, 0)) { + if (link_modules(NULL, &modpolicydb, NULL, 0, 0)) { fprintf(stderr, "%s: link modules failed\n", argv[0]); exit(1); } - if (expand_module(NULL, policydbp, &kernpolicydb, 0, 1)) { + if (expand_module(NULL, &modpolicydb, &kernpolicydb, 0, 1)) { fprintf(stderr, "%s: expand module failed\n", argv[0]); exit(1); } policydb_destroy(&kernpolicydb); } - if (policydb_load_isids(policydbp, &sidtab)) + if (policydb_load_isids(&modpolicydb, &sidtab)) exit(1); + sepol_sidtab_destroy(&sidtab); + printf("%s: policy configuration loaded\n", argv[0]); if (outfile && - write_binary_policy(policydbp, outfile, argv[0]) == -1) { - exit(1); - } + write_binary_policy(&modpolicydb, outfile, argv[0]) == -1) { + exit(1); + } + policydb_destroy(&modpolicydb); + return 0; } /* FLASK */ - ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/checkpolicy.c#12 (text+ko) ==== @@ -80,6 +80,7 @@ #include "queue.h" #include "checkpolicy.h" +#include "parse_util.h" extern char *optarg; extern int optind; @@ -88,17 +89,8 @@ static sidtab_t sidtab; extern policydb_t *policydbp; -extern queue_t id_queue; -extern unsigned int policydb_errors; -extern unsigned long policydb_lineno; -extern char source_file[]; extern int mlspol; -extern FILE *yyin; -extern void init_parser(int); -extern int yyparse(void); -extern void yyrestart(FILE *); - static char *txtfile = "policy.conf"; static char *binfile = "policy"; @@ -106,8 +98,9 @@ void usage(char *progname) { - printf("usage: %s [-b] [-d] [-M] [-c policyvers (%d-%d)] [-o output_file] [input_file]\n", - progname, POLICYDB_VERSION_MIN, POLICYDB_VERSION_MAX); + printf + ("usage: %s [-b] [-d] [-M] [-c policyvers (%d-%d)] [-o output_file] [input_file]\n", + progname, POLICYDB_VERSION_MIN, POLICYDB_VERSION_MAX); exit(1); } @@ -118,7 +111,9 @@ exit(1);\ } static int print_sid(sepol_security_id_t sid, - context_struct_t * context __attribute__ ((unused)), void *data __attribute__ ((unused))) + context_struct_t * context + __attribute__ ((unused)), void *data + __attribute__ ((unused))) { sepol_security_context_t scontext; size_t scontext_len; @@ -146,7 +141,7 @@ perdatum = (perm_datum_t *) datum; - if (v->val == perdatum->value) { + if (v->val == perdatum->s.value) { v->name = key; return 1; } @@ -155,7 +150,7 @@ } #ifdef EQUIVTYPES -static int insert_type_rule(avtab_key_t *k, avtab_datum_t *d, +static int insert_type_rule(avtab_key_t * k, avtab_datum_t * d, struct avtab_node *type_rules) { struct avtab_node *p, *c, *n; @@ -168,10 +163,10 @@ */ if (k->source_type < c->key.source_type) break; - if (k->source_type == c->key.source_type && + if (k->source_type == c->key.source_type && k->target_type < c->key.target_type) break; - if (k->source_type == c->key.source_type && + if (k->source_type == c->key.source_type && k->target_type == c->key.target_type && k->target_class < c->key.target_class) break; @@ -191,7 +186,7 @@ return 0; } -static int create_type_rules(avtab_key_t *k, avtab_datum_t *d, void *args) +static int create_type_rules(avtab_key_t * k, avtab_datum_t * d, void *args) { struct avtab_node *type_rules = args; @@ -200,8 +195,10 @@ * Insert the rule into the lists for both * the source type and the target type. */ - if (insert_type_rule(k, d, &type_rules[k->source_type-1])) return -1; - if (insert_type_rule(k, d, &type_rules[k->target_type-1])) return -1; + if (insert_type_rule(k, d, &type_rules[k->source_type - 1])) + return -1; + if (insert_type_rule(k, d, &type_rules[k->target_type - 1])) + return -1; } return 0; @@ -218,24 +215,24 @@ } } -static int identify_equiv_types(void) +static int identify_equiv_types(void) { - struct avtab_node *type_rules, *l1, *l2; + struct avtab_node *type_rules, *l1, *l2; int i, j; /* * Create a list of access vector rules for each type * from the access vector table. */ - type_rules = malloc(sizeof(struct avtab_node)*policydb.p_types.nprim); + type_rules = malloc(sizeof(struct avtab_node) * policydb.p_types.nprim); if (!type_rules) { fprintf(stderr, "out of memory\n"); exit(1); } - memset(type_rules, 0, sizeof(struct avtab_node)*policydb.p_types.nprim); + memset(type_rules, 0, + sizeof(struct avtab_node) * policydb.p_types.nprim); if (avtab_map(&policydb.te_avtab, create_type_rules, type_rules)) exit(1); - /* * Compare the type lists and identify equivalent types. @@ -244,27 +241,29 @@ if (!type_rules[i].next) continue; for (j = i + 1; j < policydb.p_types.nprim; j++) { - for (l1 = type_rules[i].next, l2 = type_rules[j].next; l1 && l2; - l1 = l1->next, l2 = l2->next) { - if (l2->key.source_type == (j+1)) { - if (l1->key.source_type != (i+1)) + for (l1 = type_rules[i].next, l2 = type_rules[j].next; + l1 && l2; l1 = l1->next, l2 = l2->next) { + if (l2->key.source_type == (j + 1)) { + if (l1->key.source_type != (i + 1)) break; } else { - if (l1->key.source_type != l2->key.source_type) + if (l1->key.source_type != + l2->key.source_type) break; } - if (l2->key.target_type == (j+1)) { - if (l1->key.target_type != (i+1)) + if (l2->key.target_type == (j + 1)) { + if (l1->key.target_type != (i + 1)) break; } else { - if (l1->key.target_type != l2->key.target_type) + if (l1->key.target_type != + l2->key.target_type) break; } - if (l1->key.target_class != l2->key.target_class || - l1->datum.allowed != l2->datum.allowed) + if (l1->key.target_class != l2->key.target_class + || l1->datum.allowed != l2->datum.allowed) break; } - if (l1 || l2) + if (l1 || l2) continue; free_type_rules(type_rules[j].next); type_rules[j].next = NULL; @@ -272,37 +271,37 @@ policydb.p_type_val_to_name[i], policydb.p_type_val_to_name[j]); } - free_type_rules(type_rules[i].next); + free_type_rules(type_rules[i].next); type_rules[i].next = NULL; } - free(type_rules); + free(type_rules); return 0; } -#endif +#endif extern char *av_to_string(uint32_t tclass, sepol_access_vector_t av); - int display_bools() { int i; for (i = 0; i < policydbp->p_bools.nprim; i++) { printf("%s : %d\n", policydbp->p_bool_val_to_name[i], - policydbp->bool_val_to_struct[i]->state); + policydbp->bool_val_to_struct[i]->state); } return 0; } -void display_expr(cond_expr_t *exp) +void display_expr(cond_expr_t * exp) { cond_expr_t *cur; for (cur = exp; cur != NULL; cur = cur->next) { switch (cur->expr_type) { case COND_BOOL: - printf("%s ", policydbp->p_bool_val_to_name[cur->bool - 1]); + printf("%s ", + policydbp->p_bool_val_to_name[cur->bool - 1]); break; case COND_NOT: printf("! "); @@ -360,7 +359,9 @@ level_datum_t *levdatum = (level_datum_t *) datum; if (!levdatum->isalias && !levdatum->defined) { - fprintf(stderr, "Error: sensitivity %s was not used in a level definition!\n", key); + fprintf(stderr, + "Error: sensitivity %s was not used in a level definition!\n", + key); return -1; } return 0; @@ -389,7 +390,6 @@ int show_version = 0; struct policy_file pf; - while ((ch = getopt(argc, argv, "o:dbMVc:")) != EOF) { switch (ch) { case 'o': @@ -408,30 +408,36 @@ case 'M': mlspol = 1; break; - case 'c': { - long int n = strtol(optarg, NULL, 10); - if (errno) { - fprintf(stderr, "Invalid policyvers specified: %s\n", optarg); - usage(argv[0]); - exit(1); + case 'c':{ + long int n = strtol(optarg, NULL, 10); + if (errno) { + fprintf(stderr, + "Invalid policyvers specified: %s\n", + optarg); + usage(argv[0]); + exit(1); + } + if (n < POLICYDB_VERSION_MIN + || n > POLICYDB_VERSION_MAX) { + fprintf(stderr, + "policyvers value %ld not in range %d-%d\n", + n, POLICYDB_VERSION_MIN, + POLICYDB_VERSION_MAX); + usage(argv[0]); + exit(1); + } + if (policyvers != n) + policyvers = n; + break; } - if (n < POLICYDB_VERSION_MIN || n > POLICYDB_VERSION_MAX) { - fprintf(stderr, "policyvers value %ld not in range %d-%d\n", - n, POLICYDB_VERSION_MIN, POLICYDB_VERSION_MAX); - usage(argv[0]); - exit(1); - } - if (policyvers != n) - policyvers = n; - break; - } default: usage(argv[0]); } } if (show_version) { - printf("%d (compatibility range %d-%d)\n", policyvers, POLICYDB_VERSION_MAX, POLICYDB_VERSION_MIN); + printf("%d (compatibility range %d-%d)\n", policyvers, + POLICYDB_VERSION_MAX, POLICYDB_VERSION_MIN); exit(0); } @@ -440,8 +446,7 @@ if (optind != argc) usage(argv[0]); } - printf("%s: loading policy configuration from %s\n", argv[0], - file); + printf("%s: loading policy configuration from %s\n", argv[0], file); /* Set policydb and sidtab used by libsepol service functions to my structures, so that I can directly populate and @@ -461,7 +466,9 @@ file, strerror(errno)); exit(1); } - map = mmap(NULL, sb.st_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); + map = + mmap(NULL, sb.st_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, + fd, 0); if (map == MAP_FAILED) { fprintf(stderr, "Can't map '%s': %s\n", file, strerror(errno)); @@ -471,12 +478,15 @@ pf.data = map; pf.len = sb.st_size; if (policydb_init(&policydb)) { - fprintf(stderr, "%s: policydb_init: Out of memory!\n", argv[0]); + fprintf(stderr, "%s: policydb_init: Out of memory!\n", + argv[0]); exit(1); } ret = policydb_read(&policydb, &pf, 1); if (ret) { - fprintf(stderr, "%s: error(s) encountered while parsing configuration\n", argv[0]); + fprintf(stderr, + "%s: error(s) encountered while parsing configuration\n", + argv[0]); exit(1); } policydbp = &policydb; @@ -484,27 +494,20 @@ /* Check Policy Consistency */ if (policydbp->mls) { if (!mlspol) { - fprintf(stderr,"%s: MLS policy, but non-MLS" - " is specified\n", argv[0]); + fprintf(stderr, "%s: MLS policy, but non-MLS" + " is specified\n", argv[0]); exit(1); } } else { if (mlspol) { - fprintf(stderr,"%s: non-MLS policy, but MLS" - " is specified\n", argv[0]); + fprintf(stderr, "%s: non-MLS policy, but MLS" + " is specified\n", argv[0]); exit(1); } } } else { - policydb_t parse_policy; + policydb_t parse_policy; - yyin = fopen(file, "r"); - if (!yyin) { - fprintf(stderr, "%s: unable to open %s\n", argv[0], - file); - exit(1); - } - if (policydb_init(&parse_policy)) exit(1); /* We build this as a base policy first since that is all the parser understands */ @@ -513,28 +516,9 @@ /* Let sepol know if we are dealing with MLS support */ parse_policy.mls = mlspol; - id_queue = queue_create(); - if (!id_queue) { - fprintf(stderr, "%s: out of memory\n", argv[0]); - exit(1); - } policydbp = &parse_policy; - init_parser(1); - if (yyparse() || policydb_errors) { - fprintf(stderr, "%s: error(s) encountered while parsing configuration\n", argv[0]); - exit(1); - } - rewind(yyin); - init_parser(2); - source_file[0] = '\0'; - yyrestart(yyin); - if (yyparse() || policydb_errors) { - fprintf(stderr, "%s: error(s) encountered while parsing configuration\n", argv[0]); - exit(1); - } - queue_destroy(id_queue); - if (policydb_errors) + if (read_source_policy(policydbp, file, "checkpolicy") < 0) exit(1); if (hashtab_map(policydbp->p_levels.table, check_level, NULL)) @@ -546,18 +530,17 @@ } /* Linking takes care of optional avrule blocks */ - if (link_modules(NULL, &parse_policy, NULL, 0, 0)) { + if (link_modules(NULL, &parse_policy, NULL, 0, 0)) { fprintf(stderr, "Error while resolving optionals\n"); exit(1); } if (expand_module(NULL, &parse_policy, &policydb, 0, 1)) { - fprintf(stderr, "Error while expanding policy\n"); + fprintf(stderr, "Error while expanding policy\n"); exit(1); - } + } policydb_destroy(&parse_policy); policydbp = &policydb; - fclose(yyin); } if (policydb_load_isids(&policydb, &sidtab)) @@ -566,8 +549,9 @@ printf("%s: policy configuration loaded\n", argv[0]); if (outfile) { - printf("%s: writing binary representation (version %d) to %s\n", - argv[0], policyvers, outfile); + printf + ("%s: writing binary representation (version %d) to %s\n", + argv[0], policyvers, outfile); outfp = fopen(outfile, "w"); if (!outfp) { perror(outfile); @@ -634,39 +618,51 @@ FGETS(ans, sizeof(ans), stdin); if (isdigit(ans[0])) { tclass = atoi(ans); - if (!tclass || tclass > policydb.p_classes.nprim) { + if (!tclass + || tclass > policydb.p_classes.nprim) { printf("\nNo such class.\n"); break; } - cladatum = policydb.class_val_to_struct[tclass - 1]; + cladatum = + policydb.class_val_to_struct[tclass - 1]; } else { ans[strlen(ans) - 1] = 0; - cladatum = (class_datum_t *) hashtab_search(policydb.p_classes.table, - ans); + cladatum = + (class_datum_t *) hashtab_search(policydb. + p_classes. + table, + ans); if (!cladatum) { printf("\nNo such class\n"); break; } - tclass = cladatum->value; + tclass = cladatum->s.value; } if (!cladatum->comdatum && !cladatum->permissions.nprim) { - printf("\nNo access vector definition for that class\n"); + printf + ("\nNo access vector definition for that class\n"); break; } - ret = sepol_compute_av(ssid, tsid, tclass, 0, - &avd); + ret = sepol_compute_av(ssid, tsid, tclass, 0, &avd); switch (ret) { case 0: printf("\nallowed {"); for (i = 1; i <= sizeof(avd.allowed) * 8; i++) { if (avd.allowed & (1 << (i - 1))) { v.val = i; - ret = hashtab_map(cladatum->permissions.table, - find_perm, &v); + ret = + hashtab_map(cladatum-> + permissions. + table, + find_perm, &v); if (!ret && cladatum->comdatum) { - ret = hashtab_map(cladatum->comdatum->permissions.table, - find_perm, &v); + ret = + hashtab_map + (cladatum-> + comdatum-> + permissions.table, + find_perm, &v); } if (ret) printf(" %s", v.name); @@ -686,7 +682,7 @@ FGETS(ans, sizeof(ans), stdin); ssid = atoi(ans); ret = sepol_sid_to_context(ssid, - &scontext, &scontext_len); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Feb 15 20:16:41 2007 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 952BD16A4DF; Thu, 15 Feb 2007 20:16:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5906B16A4C2 for ; Thu, 15 Feb 2007 20:16:41 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4745A13C474 for ; Thu, 15 Feb 2007 20:16:41 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1FKGfiV068391 for ; Thu, 15 Feb 2007 20:16:41 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1FKGcVx068332 for perforce@freebsd.org; Thu, 15 Feb 2007 20:16:38 GMT (envelope-from millert@freebsd.org) Date: Thu, 15 Feb 2007 20:16:38 GMT Message-Id: <200702152016.l1FKGcVx068332@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 114574 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, 15 Feb 2007 20:16:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=114574 Change 114574 by millert@millert_p4 on 2007/02/15 20:16:04 Update to libselinux-1.34.0 from the SELinux web site. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/ChangeLog#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/Makefile#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/VERSION#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/Makefile#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/av_permissions.h#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/avc.h#4 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/context.h#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/flask.h#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/get_context_list.h#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/get_default_type.h#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/selinux.h#5 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/libselinux.spec#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/avc_add_callback.3#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/avc_cache_stats.3#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/avc_context_to_sid.3#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/avc_has_perm.3#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/avc_init.3#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/context_new.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/freecon.3#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/get_ordered_context_list.3#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/getcon.3#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/getexeccon.3#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/getfilecon.3#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/getfscreatecon.3#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/getseuserbyname.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/is_context_customizable.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/is_selinux_enabled.3#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/matchmediacon.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/matchpathcon.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/security_check_context.3#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/security_compute_av.3#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/security_getenforce.3#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/security_load_booleans.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/security_load_policy.3#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/security_policyvers.3#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/selinux_binary_policy_path.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/selinux_check_securetty_context.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/selinux_getenforcemode.3#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/selinux_policy_root.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/selinux_securetty_types_path.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/setfilecon.3#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man8/avcstat.8#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man8/booleans.8#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man8/getenforce.8#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man8/getsebool.8#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man8/matchpathcon.8#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man8/selinuxenabled.8#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man8/setenforce.8#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man8/togglesebool.8#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/Makefile#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/av_inherit.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/av_perm_to_string.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/avc.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/avc_internal.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/avc_internal.h#4 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/avc_sidtab.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/avc_sidtab.h#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/booleans.c#4 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/canonicalize_context.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/checkAccess.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/check_context.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/class_to_string.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/common_perm_to_string.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/compat_file_path.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/compute_av.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/compute_create.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/compute_member.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/compute_relabel.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/compute_user.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/context.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/context_internal.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/disable.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/enabled.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/fgetfilecon.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/file_path_suffixes.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/freecon.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/freeconary.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/fsetfilecon.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/get_context_list.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/get_context_list_internal.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/get_default_type.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/getcon.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/getenforce.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/getexeccon.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/getfilecon.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/getfscreatecon.c#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/getpeercon.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/getpidcon.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/getprevcon.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/init.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/is_customizable_type.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/lgetfilecon.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/load_policy.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/lsetfilecon.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/matchmediacon.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/matchpathcon.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/policy.h#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/policyvers.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/procattr.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/query_user_context.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/rpm.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/sebsd_config.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/sebsd_config.c.NEW#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/selinux.py#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/selinux_check_securetty_context.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/selinux_config.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/selinux_internal.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/selinux_netlink.h#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/selinuxswig.i#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/selinuxswig_wrap.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/setcon.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/setenforce.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/setexeccon.c#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/setfilecon.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/setfscreatecon.c#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/setrans_client.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/setrans_internal.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/seusers.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/trans.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/Makefile#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/avcstat.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/compute_av.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/compute_create.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/compute_member.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/compute_relabel.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/compute_user.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/getconlist.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/getdefaultcon.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/getenforce.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/getfilecon.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/getpidcon.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/getsebool.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/getseuser.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/matchpathcon.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/policyvers.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/selinux_check_securetty_context.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/selinuxenabled.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/setenforce.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/setfilecon.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/togglesebool.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/ChangeLog#3 (text+ko) ==== @@ -1,3 +1,150 @@ +1.34.0 2007-01-18 + * Updated version for stable branch. + +1.33.6 2007-01-17 + * Merged man page updates to make "apropos selinux" work from Dan Walsh. + +1.33.5 2007-01-16 + * Merged getdefaultcon utility from Dan Walsh. + +1.33.4 2007-01-11 + * Merged selinux_check_securetty_context() and support from Dan Walsh. + +1.33.3 2007-01-04 + * Merged patch for matchpathcon utility to use file mode information + when available from Dan Walsh. + +1.33.2 2006-11-27 + * Merged patch to compile with -fPIC instead of -fpic from + Manoj Srivastava to prevent hitting the global offset table + limit. Patch changed to include libsepol and libsemanage in + addition to libselinux. + +1.33.1 2006-10-19 + * Merged updated flask definitions from Darrel Goeddel. + This adds the context security class, and also adds + the string definitions for setsockcreate and polmatch. + +1.32 2006-10-17 + * Updated version for release. + +1.30.30 2006-10-05 + * Merged patch from Darrel Goeddel to always use untranslated + contexts in the userspace AVC. + +1.30.29 2006-09-29 + * Merged av_permissions.h update from Steve Grubb, + adding setsockcreate and polmatch definitions. + +1.30.28 2006-09-13 + * Merged patch from Steve Smalley to fix SIGPIPE in setrans_client + * Merged c++ class identifier fix from Joe Nall. + +1.30.27 2006-08-24 + * Merged patch to not log avc stats upon a reset from Steve Grubb. + * Applied patch to revert compat_net setting upon policy load. + +1.30.26 2006-08-11 + * Merged file context homedir and local path functions from + Chris PeBenito. + +1.30.25 2006-08-11 + * Rework functions that access /proc/pid/attr to access the + per-thread nodes, and unify the code to simplify maintenance. + +1.30.24 2006-08-10 + * Merged return value fix for *getfilecon() from Dan Walsh. + +1.30.23 2006-08-10 + * Merged sockcreate interfaces from Eric Paris. + +1.30.22 2006-08-03 + * Merged no-tls-direct-seg-refs patch from Jeremy Katz. + +1.30.21 2006-08-03 + * Merged netfilter_contexts support patch from Chris PeBenito. + +1.30.20 2006-08-01 + * Merged context_*_set errno patch from Jim Meyering. + +1.30.19 2006-06-29 + * Lindent. + +1.30.18 2006-06-27 + * Merged {get,set}procattrcon patch set from Eric Paris. + * Merged re-base of keycreate patch originally by Michael LeMay from Eric Paris. + +1.30.17 2006-06-27 + * Regenerated Flask headers from refpolicy. + +1.30.16 2006-06-26 + * Merged patch from Dan Walsh with: + - Added selinux_file_context_{cmp,verify}. + - Added selinux_lsetfilecon_default. + - Delay translation of contexts in matchpathcon. + +1.30.15 2006-06-16 + * Merged patch from Dan Walsh with: + * Added selinux_getpolicytype() function. + * Modified setrans code to skip processing if !mls_enabled. + +1.30.14 2006-06-16 + * Set errno in the !selinux_mnt case. + +1.30.13 2006-06-02 + * Allocate large buffers from the heap, not on stack. + Affects is_context_customizable, selinux_init_load_policy, + and selinux_getenforcemode. + +1.30.12 2006-06-02 + * Merged !selinux_mnt checks from Ian Kent. + +1.30.11 2006-05-24 + * Merged matchmediacon and trans_to_raw_context fixes from + Serge Hallyn. + +1.30.10 2006-05-22 + * Merged simple setrans client cache from Dan Walsh. + Merged avcstat patch from Russell Coker. + +1.30.9 2006-05-22 + * Modified selinux_mkload_policy() to also set /selinux/compat_net + appropriately for the loaded policy. + +1.30.8 2006-05-17 + * Added matchpathcon_fini() function to free memory allocated by + matchpathcon_init(). + +1.30.7 2006-05-16 + * Merged setrans client cleanup patch from Steve Grubb. + +1.30.6 2006-05-08 + * Merged getfscreatecon man page fix from Dan Walsh. + * Updated booleans(8) man page to drop references to the old + booleans file and to note that setsebool can be used to set + the boot-time defaults via -P. + +1.30.5 2006-05-05 + * Merged fix warnings patch from Karl MacMillan. + +1.30.4 2006-05-05 + * Merged setrans client support from Dan Walsh. + This removes use of libsetrans. + * Merged patch to eliminate use of PAGE_SIZE constant from Dan Walsh. + * Merged swig typemap fixes from Glauber de Oliveira Costa. + +1.30.3 2006-04-12 + * Added distclean target to Makefile. + * Regenerated swig files. + +1.30.2 2006-04-11 + * Changed matchpathcon_init to verify that the spec file is + a regular file. + * Merged python binding t_output_helper removal patch from Dan Walsh. + +1.30.1 2006-03-20 + * Merged Makefile PYLIBVER definition patch from Dan Walsh. + 1.30 2006-03-14 * Updated version for release. ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/Makefile#3 (text+ko) ==== @@ -17,7 +17,13 @@ relabel: $(MAKE) -C src relabel -clean: - $(MAKE) -C src clean +clean distclean: + $(MAKE) -C src $@ $(MAKE) -C utils clean +indent: + $(MAKE) -C src $@ + $(MAKE) -C utils $@ + $(MAKE) -C include $@ + +test: ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/VERSION#3 (text+ko) ==== @@ -1,1 +1,1 @@ -1.30 +1.34.0 ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/Makefile#3 (text+ko) ==== @@ -5,3 +5,7 @@ install: test -d $(INCDIR) || install -m 755 -d $(INCDIR) install -m 644 $(wildcard selinux/*.h) $(INCDIR) + +indent: + ../../Lindent $(wildcard selinux/*.h) + ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/av_permissions.h#3 (text+ko) ==== @@ -16,7 +16,6 @@ #define COMMON_FILE__SWAPON 0x00004000UL #define COMMON_FILE__QUOTAON 0x00008000UL #define COMMON_FILE__MOUNTON 0x00010000UL - #define COMMON_SOCKET__IOCTL 0x00000001UL #define COMMON_SOCKET__READ 0x00000002UL #define COMMON_SOCKET__WRITE 0x00000004UL @@ -39,7 +38,6 @@ #define COMMON_SOCKET__RECV_MSG 0x00080000UL #define COMMON_SOCKET__SEND_MSG 0x00100000UL #define COMMON_SOCKET__NAME_BIND 0x00200000UL - #define COMMON_IPC__CREATE 0x00000001UL #define COMMON_IPC__DESTROY 0x00000002UL #define COMMON_IPC__GETATTR 0x00000004UL @@ -49,7 +47,6 @@ #define COMMON_IPC__ASSOCIATE 0x00000040UL #define COMMON_IPC__UNIX_READ 0x00000080UL #define COMMON_IPC__UNIX_WRITE 0x00000100UL - #define FILESYSTEM__MOUNT 0x00000001UL #define FILESYSTEM__REMOUNT 0x00000002UL #define FILESYSTEM__UNMOUNT 0x00000004UL @@ -60,7 +57,6 @@ #define FILESYSTEM__ASSOCIATE 0x00000080UL #define FILESYSTEM__QUOTAMOD 0x00000100UL #define FILESYSTEM__QUOTAGET 0x00000200UL - #define DIR__IOCTL 0x00000001UL #define DIR__READ 0x00000002UL #define DIR__WRITE 0x00000004UL @@ -78,13 +74,11 @@ #define DIR__SWAPON 0x00004000UL #define DIR__QUOTAON 0x00008000UL #define DIR__MOUNTON 0x00010000UL - #define DIR__ADD_NAME 0x00020000UL #define DIR__REMOVE_NAME 0x00040000UL #define DIR__REPARENT 0x00080000UL #define DIR__SEARCH 0x00100000UL #define DIR__RMDIR 0x00200000UL - #define FILE__IOCTL 0x00000001UL #define FILE__READ 0x00000002UL #define FILE__WRITE 0x00000004UL @@ -102,11 +96,9 @@ #define FILE__SWAPON 0x00004000UL #define FILE__QUOTAON 0x00008000UL #define FILE__MOUNTON 0x00010000UL - #define FILE__EXECUTE_NO_TRANS 0x00020000UL #define FILE__ENTRYPOINT 0x00040000UL #define FILE__EXECMOD 0x00080000UL - #define LNK_FILE__IOCTL 0x00000001UL #define LNK_FILE__READ 0x00000002UL #define LNK_FILE__WRITE 0x00000004UL @@ -124,7 +116,6 @@ #define LNK_FILE__SWAPON 0x00004000UL #define LNK_FILE__QUOTAON 0x00008000UL #define LNK_FILE__MOUNTON 0x00010000UL - #define CHR_FILE__IOCTL 0x00000001UL #define CHR_FILE__READ 0x00000002UL #define CHR_FILE__WRITE 0x00000004UL @@ -142,11 +133,9 @@ #define CHR_FILE__SWAPON 0x00004000UL #define CHR_FILE__QUOTAON 0x00008000UL #define CHR_FILE__MOUNTON 0x00010000UL - #define CHR_FILE__EXECUTE_NO_TRANS 0x00020000UL #define CHR_FILE__ENTRYPOINT 0x00040000UL #define CHR_FILE__EXECMOD 0x00080000UL - #define BLK_FILE__IOCTL 0x00000001UL #define BLK_FILE__READ 0x00000002UL #define BLK_FILE__WRITE 0x00000004UL @@ -164,7 +153,6 @@ #define BLK_FILE__SWAPON 0x00004000UL #define BLK_FILE__QUOTAON 0x00008000UL #define BLK_FILE__MOUNTON 0x00010000UL - #define SOCK_FILE__IOCTL 0x00000001UL #define SOCK_FILE__READ 0x00000002UL #define SOCK_FILE__WRITE 0x00000004UL @@ -182,7 +170,6 @@ #define SOCK_FILE__SWAPON 0x00004000UL #define SOCK_FILE__QUOTAON 0x00008000UL #define SOCK_FILE__MOUNTON 0x00010000UL - #define FIFO_FILE__IOCTL 0x00000001UL #define FIFO_FILE__READ 0x00000002UL #define FIFO_FILE__WRITE 0x00000004UL @@ -200,9 +187,7 @@ #define FIFO_FILE__SWAPON 0x00004000UL #define FIFO_FILE__QUOTAON 0x00008000UL #define FIFO_FILE__MOUNTON 0x00010000UL - #define FD__USE 0x00000001UL - #define SOCKET__IOCTL 0x00000001UL #define SOCKET__READ 0x00000002UL #define SOCKET__WRITE 0x00000004UL @@ -225,7 +210,6 @@ #define SOCKET__RECV_MSG 0x00080000UL #define SOCKET__SEND_MSG 0x00100000UL #define SOCKET__NAME_BIND 0x00200000UL - #define TCP_SOCKET__IOCTL 0x00000001UL #define TCP_SOCKET__READ 0x00000002UL #define TCP_SOCKET__WRITE 0x00000004UL @@ -248,12 +232,11 @@ #define TCP_SOCKET__RECV_MSG 0x00080000UL #define TCP_SOCKET__SEND_MSG 0x00100000UL #define TCP_SOCKET__NAME_BIND 0x00200000UL - #define TCP_SOCKET__CONNECTTO 0x00400000UL #define TCP_SOCKET__NEWCONN 0x00800000UL #define TCP_SOCKET__ACCEPTFROM 0x01000000UL #define TCP_SOCKET__NODE_BIND 0x02000000UL - +#define TCP_SOCKET__NAME_CONNECT 0x04000000UL #define UDP_SOCKET__IOCTL 0x00000001UL #define UDP_SOCKET__READ 0x00000002UL #define UDP_SOCKET__WRITE 0x00000004UL @@ -276,9 +259,7 @@ #define UDP_SOCKET__RECV_MSG 0x00080000UL #define UDP_SOCKET__SEND_MSG 0x00100000UL #define UDP_SOCKET__NAME_BIND 0x00200000UL - #define UDP_SOCKET__NODE_BIND 0x00400000UL - #define RAWIP_SOCKET__IOCTL 0x00000001UL #define RAWIP_SOCKET__READ 0x00000002UL #define RAWIP_SOCKET__WRITE 0x00000004UL @@ -301,9 +282,7 @@ #define RAWIP_SOCKET__RECV_MSG 0x00080000UL #define RAWIP_SOCKET__SEND_MSG 0x00100000UL #define RAWIP_SOCKET__NAME_BIND 0x00200000UL - #define RAWIP_SOCKET__NODE_BIND 0x00400000UL - #define NODE__TCP_RECV 0x00000001UL #define NODE__TCP_SEND 0x00000002UL #define NODE__UDP_RECV 0x00000004UL @@ -311,14 +290,12 @@ #define NODE__RAWIP_RECV 0x00000010UL #define NODE__RAWIP_SEND 0x00000020UL #define NODE__ENFORCE_DEST 0x00000040UL - #define NETIF__TCP_RECV 0x00000001UL #define NETIF__TCP_SEND 0x00000002UL #define NETIF__UDP_RECV 0x00000004UL #define NETIF__UDP_SEND 0x00000008UL #define NETIF__RAWIP_RECV 0x00000010UL #define NETIF__RAWIP_SEND 0x00000020UL - #define NETLINK_SOCKET__IOCTL 0x00000001UL #define NETLINK_SOCKET__READ 0x00000002UL #define NETLINK_SOCKET__WRITE 0x00000004UL @@ -341,7 +318,6 @@ #define NETLINK_SOCKET__RECV_MSG 0x00080000UL #define NETLINK_SOCKET__SEND_MSG 0x00100000UL #define NETLINK_SOCKET__NAME_BIND 0x00200000UL - #define PACKET_SOCKET__IOCTL 0x00000001UL #define PACKET_SOCKET__READ 0x00000002UL #define PACKET_SOCKET__WRITE 0x00000004UL @@ -364,7 +340,6 @@ #define PACKET_SOCKET__RECV_MSG 0x00080000UL #define PACKET_SOCKET__SEND_MSG 0x00100000UL #define PACKET_SOCKET__NAME_BIND 0x00200000UL - #define KEY_SOCKET__IOCTL 0x00000001UL #define KEY_SOCKET__READ 0x00000002UL #define KEY_SOCKET__WRITE 0x00000004UL @@ -387,7 +362,6 @@ #define KEY_SOCKET__RECV_MSG 0x00080000UL #define KEY_SOCKET__SEND_MSG 0x00100000UL #define KEY_SOCKET__NAME_BIND 0x00200000UL - #define UNIX_STREAM_SOCKET__IOCTL 0x00000001UL #define UNIX_STREAM_SOCKET__READ 0x00000002UL #define UNIX_STREAM_SOCKET__WRITE 0x00000004UL @@ -410,11 +384,9 @@ #define UNIX_STREAM_SOCKET__RECV_MSG 0x00080000UL #define UNIX_STREAM_SOCKET__SEND_MSG 0x00100000UL #define UNIX_STREAM_SOCKET__NAME_BIND 0x00200000UL - #define UNIX_STREAM_SOCKET__CONNECTTO 0x00400000UL #define UNIX_STREAM_SOCKET__NEWCONN 0x00800000UL #define UNIX_STREAM_SOCKET__ACCEPTFROM 0x01000000UL - #define UNIX_DGRAM_SOCKET__IOCTL 0x00000001UL #define UNIX_DGRAM_SOCKET__READ 0x00000002UL #define UNIX_DGRAM_SOCKET__WRITE 0x00000004UL @@ -437,7 +409,6 @@ #define UNIX_DGRAM_SOCKET__RECV_MSG 0x00080000UL #define UNIX_DGRAM_SOCKET__SEND_MSG 0x00100000UL #define UNIX_DGRAM_SOCKET__NAME_BIND 0x00200000UL - #define PROCESS__FORK 0x00000001UL #define PROCESS__TRANSITION 0x00000002UL #define PROCESS__SIGCHLD 0x00000004UL @@ -464,7 +435,10 @@ #define PROCESS__DYNTRANSITION 0x00800000UL #define PROCESS__SETCURRENT 0x01000000UL #define PROCESS__EXECMEM 0x02000000UL - +#define PROCESS__EXECSTACK 0x04000000UL +#define PROCESS__EXECHEAP 0x08000000UL +#define PROCESS__SETKEYCREATE 0x10000000UL +#define PROCESS__SETSOCKCREATE 0x20000000UL #define IPC__CREATE 0x00000001UL #define IPC__DESTROY 0x00000002UL #define IPC__GETATTR 0x00000004UL @@ -474,7 +448,6 @@ #define IPC__ASSOCIATE 0x00000040UL #define IPC__UNIX_READ 0x00000080UL #define IPC__UNIX_WRITE 0x00000100UL - #define SEM__CREATE 0x00000001UL #define SEM__DESTROY 0x00000002UL #define SEM__GETATTR 0x00000004UL @@ -484,7 +457,6 @@ #define SEM__ASSOCIATE 0x00000040UL #define SEM__UNIX_READ 0x00000080UL #define SEM__UNIX_WRITE 0x00000100UL - #define MSGQ__CREATE 0x00000001UL #define MSGQ__DESTROY 0x00000002UL #define MSGQ__GETATTR 0x00000004UL @@ -494,12 +466,9 @@ #define MSGQ__ASSOCIATE 0x00000040UL #define MSGQ__UNIX_READ 0x00000080UL #define MSGQ__UNIX_WRITE 0x00000100UL - #define MSGQ__ENQUEUE 0x00000200UL - #define MSG__SEND 0x00000001UL #define MSG__RECEIVE 0x00000002UL - #define SHM__CREATE 0x00000001UL #define SHM__DESTROY 0x00000002UL #define SHM__GETATTR 0x00000004UL @@ -509,9 +478,7 @@ #define SHM__ASSOCIATE 0x00000040UL #define SHM__UNIX_READ 0x00000080UL #define SHM__UNIX_WRITE 0x00000100UL - #define SHM__LOCK 0x00000200UL - #define SECURITY__COMPUTE_AV 0x00000001UL #define SECURITY__COMPUTE_CREATE 0x00000002UL #define SECURITY__COMPUTE_MEMBER 0x00000004UL @@ -522,12 +489,11 @@ #define SECURITY__SETENFORCE 0x00000080UL #define SECURITY__SETBOOL 0x00000100UL #define SECURITY__SETSECPARAM 0x00000200UL - +#define SECURITY__SETCHECKREQPROT 0x00000400UL #define SYSTEM__IPC_INFO 0x00000001UL #define SYSTEM__SYSLOG_READ 0x00000002UL #define SYSTEM__SYSLOG_MOD 0x00000004UL #define SYSTEM__SYSLOG_CONSOLE 0x00000008UL - #define CAPABILITY__CHOWN 0x00000001UL #define CAPABILITY__DAC_OVERRIDE 0x00000002UL #define CAPABILITY__DAC_READ_SEARCH 0x00000004UL @@ -559,24 +525,20 @@ #define CAPABILITY__LEASE 0x10000000UL #define CAPABILITY__AUDIT_WRITE 0x20000000UL #define CAPABILITY__AUDIT_CONTROL 0x40000000UL - #define PASSWD__PASSWD 0x00000001UL #define PASSWD__CHFN 0x00000002UL #define PASSWD__CHSH 0x00000004UL #define PASSWD__ROOTOK 0x00000008UL #define PASSWD__CRONTAB 0x00000010UL - #define DRAWABLE__CREATE 0x00000001UL #define DRAWABLE__DESTROY 0x00000002UL #define DRAWABLE__DRAW 0x00000004UL #define DRAWABLE__COPY 0x00000008UL #define DRAWABLE__GETATTR 0x00000010UL - #define GC__CREATE 0x00000001UL #define GC__FREE 0x00000002UL #define GC__GETATTR 0x00000004UL #define GC__SETATTR 0x00000008UL - #define WINDOW__ADDCHILD 0x00000001UL #define WINDOW__CREATE 0x00000002UL #define WINDOW__DESTROY 0x00000004UL @@ -603,12 +565,10 @@ #define WINDOW__WINDOWCHANGEREQUEST 0x00800000UL #define WINDOW__SERVERCHANGEEVENT 0x01000000UL #define WINDOW__EXTENSIONEVENT 0x02000000UL - #define FONT__LOAD 0x00000001UL #define FONT__FREE 0x00000002UL #define FONT__GETATTR 0x00000004UL #define FONT__USE 0x00000008UL - #define COLORMAP__CREATE 0x00000001UL #define COLORMAP__FREE 0x00000002UL #define COLORMAP__INSTALL 0x00000004UL @@ -618,20 +578,16 @@ #define COLORMAP__STORE 0x00000040UL #define COLORMAP__GETATTR 0x00000080UL #define COLORMAP__SETATTR 0x00000100UL - #define PROPERTY__CREATE 0x00000001UL #define PROPERTY__FREE 0x00000002UL #define PROPERTY__READ 0x00000004UL #define PROPERTY__WRITE 0x00000008UL - #define CURSOR__CREATE 0x00000001UL #define CURSOR__CREATEGLYPH 0x00000002UL #define CURSOR__FREE 0x00000004UL #define CURSOR__ASSIGN 0x00000008UL #define CURSOR__SETATTR 0x00000010UL - #define XCLIENT__KILL 0x00000001UL - #define XINPUT__LOOKUP 0x00000001UL #define XINPUT__GETATTR 0x00000002UL #define XINPUT__SETATTR 0x00000004UL @@ -643,7 +599,6 @@ #define XINPUT__BELL 0x00000100UL #define XINPUT__MOUSEMOTION 0x00000200UL #define XINPUT__RELABELINPUT 0x00000400UL - #define XSERVER__SCREENSAVER 0x00000001UL #define XSERVER__GETHOSTLIST 0x00000002UL #define XSERVER__SETHOSTLIST 0x00000004UL @@ -652,17 +607,14 @@ #define XSERVER__GETATTR 0x00000020UL #define XSERVER__GRAB 0x00000040UL #define XSERVER__UNGRAB 0x00000080UL - #define XEXTENSION__QUERY 0x00000001UL #define XEXTENSION__USE 0x00000002UL - #define PAX__PAGEEXEC 0x00000001UL #define PAX__EMUTRAMP 0x00000002UL #define PAX__MPROTECT 0x00000004UL #define PAX__RANDMMAP 0x00000008UL #define PAX__RANDEXEC 0x00000010UL #define PAX__SEGMEXEC 0x00000020UL - #define NETLINK_ROUTE_SOCKET__IOCTL 0x00000001UL #define NETLINK_ROUTE_SOCKET__READ 0x00000002UL #define NETLINK_ROUTE_SOCKET__WRITE 0x00000004UL @@ -685,10 +637,8 @@ #define NETLINK_ROUTE_SOCKET__RECV_MSG 0x00080000UL #define NETLINK_ROUTE_SOCKET__SEND_MSG 0x00100000UL #define NETLINK_ROUTE_SOCKET__NAME_BIND 0x00200000UL - #define NETLINK_ROUTE_SOCKET__NLMSG_READ 0x00400000UL #define NETLINK_ROUTE_SOCKET__NLMSG_WRITE 0x00800000UL - #define NETLINK_FIREWALL_SOCKET__IOCTL 0x00000001UL #define NETLINK_FIREWALL_SOCKET__READ 0x00000002UL #define NETLINK_FIREWALL_SOCKET__WRITE 0x00000004UL @@ -711,10 +661,8 @@ #define NETLINK_FIREWALL_SOCKET__RECV_MSG 0x00080000UL #define NETLINK_FIREWALL_SOCKET__SEND_MSG 0x00100000UL #define NETLINK_FIREWALL_SOCKET__NAME_BIND 0x00200000UL - #define NETLINK_FIREWALL_SOCKET__NLMSG_READ 0x00400000UL #define NETLINK_FIREWALL_SOCKET__NLMSG_WRITE 0x00800000UL - #define NETLINK_TCPDIAG_SOCKET__IOCTL 0x00000001UL #define NETLINK_TCPDIAG_SOCKET__READ 0x00000002UL #define NETLINK_TCPDIAG_SOCKET__WRITE 0x00000004UL @@ -737,10 +685,8 @@ #define NETLINK_TCPDIAG_SOCKET__RECV_MSG 0x00080000UL #define NETLINK_TCPDIAG_SOCKET__SEND_MSG 0x00100000UL #define NETLINK_TCPDIAG_SOCKET__NAME_BIND 0x00200000UL - #define NETLINK_TCPDIAG_SOCKET__NLMSG_READ 0x00400000UL #define NETLINK_TCPDIAG_SOCKET__NLMSG_WRITE 0x00800000UL - #define NETLINK_NFLOG_SOCKET__IOCTL 0x00000001UL #define NETLINK_NFLOG_SOCKET__READ 0x00000002UL #define NETLINK_NFLOG_SOCKET__WRITE 0x00000004UL @@ -763,7 +709,6 @@ #define NETLINK_NFLOG_SOCKET__RECV_MSG 0x00080000UL #define NETLINK_NFLOG_SOCKET__SEND_MSG 0x00100000UL #define NETLINK_NFLOG_SOCKET__NAME_BIND 0x00200000UL - #define NETLINK_XFRM_SOCKET__IOCTL 0x00000001UL #define NETLINK_XFRM_SOCKET__READ 0x00000002UL #define NETLINK_XFRM_SOCKET__WRITE 0x00000004UL @@ -786,10 +731,8 @@ #define NETLINK_XFRM_SOCKET__RECV_MSG 0x00080000UL #define NETLINK_XFRM_SOCKET__SEND_MSG 0x00100000UL #define NETLINK_XFRM_SOCKET__NAME_BIND 0x00200000UL - #define NETLINK_XFRM_SOCKET__NLMSG_READ 0x00400000UL #define NETLINK_XFRM_SOCKET__NLMSG_WRITE 0x00800000UL - #define NETLINK_SELINUX_SOCKET__IOCTL 0x00000001UL #define NETLINK_SELINUX_SOCKET__READ 0x00000002UL #define NETLINK_SELINUX_SOCKET__WRITE 0x00000004UL @@ -812,7 +755,6 @@ #define NETLINK_SELINUX_SOCKET__RECV_MSG 0x00080000UL #define NETLINK_SELINUX_SOCKET__SEND_MSG 0x00100000UL #define NETLINK_SELINUX_SOCKET__NAME_BIND 0x00200000UL - #define NETLINK_AUDIT_SOCKET__IOCTL 0x00000001UL #define NETLINK_AUDIT_SOCKET__READ 0x00000002UL #define NETLINK_AUDIT_SOCKET__WRITE 0x00000004UL @@ -835,10 +777,10 @@ #define NETLINK_AUDIT_SOCKET__RECV_MSG 0x00080000UL #define NETLINK_AUDIT_SOCKET__SEND_MSG 0x00100000UL #define NETLINK_AUDIT_SOCKET__NAME_BIND 0x00200000UL - #define NETLINK_AUDIT_SOCKET__NLMSG_READ 0x00400000UL #define NETLINK_AUDIT_SOCKET__NLMSG_WRITE 0x00800000UL - +#define NETLINK_AUDIT_SOCKET__NLMSG_RELAY 0x01000000UL +#define NETLINK_AUDIT_SOCKET__NLMSG_READPRIV 0x02000000UL #define NETLINK_IP6FW_SOCKET__IOCTL 0x00000001UL #define NETLINK_IP6FW_SOCKET__READ 0x00000002UL #define NETLINK_IP6FW_SOCKET__WRITE 0x00000004UL @@ -861,10 +803,8 @@ #define NETLINK_IP6FW_SOCKET__RECV_MSG 0x00080000UL #define NETLINK_IP6FW_SOCKET__SEND_MSG 0x00100000UL #define NETLINK_IP6FW_SOCKET__NAME_BIND 0x00200000UL - #define NETLINK_IP6FW_SOCKET__NLMSG_READ 0x00400000UL #define NETLINK_IP6FW_SOCKET__NLMSG_WRITE 0x00800000UL - #define NETLINK_DNRT_SOCKET__IOCTL 0x00000001UL #define NETLINK_DNRT_SOCKET__READ 0x00000002UL #define NETLINK_DNRT_SOCKET__WRITE 0x00000004UL @@ -887,10 +827,8 @@ #define NETLINK_DNRT_SOCKET__RECV_MSG 0x00080000UL #define NETLINK_DNRT_SOCKET__SEND_MSG 0x00100000UL #define NETLINK_DNRT_SOCKET__NAME_BIND 0x00200000UL - #define DBUS__ACQUIRE_SVC 0x00000001UL #define DBUS__SEND_MSG 0x00000002UL - #define NSCD__GETPWD 0x00000001UL #define NSCD__GETGRP 0x00000002UL #define NSCD__GETHOST 0x00000004UL @@ -899,7 +837,63 @@ #define NSCD__SHMEMPWD 0x00000020UL #define NSCD__SHMEMGRP 0x00000040UL #define NSCD__SHMEMHOST 0x00000080UL - #define ASSOCIATION__SENDTO 0x00000001UL #define ASSOCIATION__RECVFROM 0x00000002UL - +#define ASSOCIATION__SETCONTEXT 0x00000004UL +#define ASSOCIATION__POLMATCH 0x00000008UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__IOCTL 0x00000001UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__READ 0x00000002UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__WRITE 0x00000004UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__CREATE 0x00000008UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__GETATTR 0x00000010UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__SETATTR 0x00000020UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__LOCK 0x00000040UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__RELABELFROM 0x00000080UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__RELABELTO 0x00000100UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__APPEND 0x00000200UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__BIND 0x00000400UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__CONNECT 0x00000800UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__LISTEN 0x00001000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__ACCEPT 0x00002000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__GETOPT 0x00004000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__SETOPT 0x00008000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__SHUTDOWN 0x00010000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__RECVFROM 0x00020000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__SENDTO 0x00040000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__RECV_MSG 0x00080000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__SEND_MSG 0x00100000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__NAME_BIND 0x00200000UL +#define APPLETALK_SOCKET__IOCTL 0x00000001UL +#define APPLETALK_SOCKET__READ 0x00000002UL +#define APPLETALK_SOCKET__WRITE 0x00000004UL +#define APPLETALK_SOCKET__CREATE 0x00000008UL +#define APPLETALK_SOCKET__GETATTR 0x00000010UL +#define APPLETALK_SOCKET__SETATTR 0x00000020UL +#define APPLETALK_SOCKET__LOCK 0x00000040UL +#define APPLETALK_SOCKET__RELABELFROM 0x00000080UL +#define APPLETALK_SOCKET__RELABELTO 0x00000100UL +#define APPLETALK_SOCKET__APPEND 0x00000200UL +#define APPLETALK_SOCKET__BIND 0x00000400UL +#define APPLETALK_SOCKET__CONNECT 0x00000800UL +#define APPLETALK_SOCKET__LISTEN 0x00001000UL +#define APPLETALK_SOCKET__ACCEPT 0x00002000UL +#define APPLETALK_SOCKET__GETOPT 0x00004000UL +#define APPLETALK_SOCKET__SETOPT 0x00008000UL +#define APPLETALK_SOCKET__SHUTDOWN 0x00010000UL +#define APPLETALK_SOCKET__RECVFROM 0x00020000UL +#define APPLETALK_SOCKET__SENDTO 0x00040000UL +#define APPLETALK_SOCKET__RECV_MSG 0x00080000UL +#define APPLETALK_SOCKET__SEND_MSG 0x00100000UL +#define APPLETALK_SOCKET__NAME_BIND 0x00200000UL +#define PACKET__SEND 0x00000001UL +#define PACKET__RECV 0x00000002UL +#define PACKET__RELABELTO 0x00000004UL +#define KEY__VIEW 0x00000001UL +#define KEY__READ 0x00000002UL +#define KEY__WRITE 0x00000004UL +#define KEY__SEARCH 0x00000008UL +#define KEY__LINK 0x00000010UL +#define KEY__SETATTR 0x00000020UL +#define KEY__CREATE 0x00000040UL +#define CONTEXT__TRANSLATE 0x00000001UL +#define CONTEXT__CONTAINS 0x00000002UL ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/avc.h#4 (text+ko) ==== @@ -12,20 +12,19 @@ #include #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /* * SID format and operations */ -struct security_id { - security_context_t ctx; - unsigned int refcnt; -}; -typedef struct security_id *security_id_t; + struct security_id { + security_context_t ctx; + unsigned int refcnt; + }; + typedef struct security_id *security_id_t; -#define SECSID_WILD (security_id_t)NULL /* unspecified SID */ +#define SECSID_WILD (security_id_t)NULL /* unspecified SID */ /** * avc_sid_to_context - get copy of context corresponding to SID. @@ -38,7 +37,8 @@ * failure, with @errno set to %ENOMEM if insufficient memory was * available to make the copy, or %EINVAL if the input SID is invalid. */ -int avc_sid_to_context(security_id_t sid, security_context_t *ctx); + int avc_sid_to_context(security_id_t sid, security_context_t * ctx); + int avc_sid_to_context_raw(security_id_t sid, security_context_t * ctx); /** * avc_context_to_sid - get SID for context. @@ -51,7 +51,8 @@ * to the SID structure into the memory referenced by @sid, * returning %0 on success or -%1 on error with @errno set. */ -int avc_context_to_sid(security_context_t ctx, security_id_t *sid); + int avc_context_to_sid(security_context_t ctx, security_id_t * sid); + int avc_context_to_sid_raw(security_context_t ctx, security_id_t * sid); /** * sidget - increment SID reference counter. @@ -63,7 +64,7 @@ * reference count). Note that avc_context_to_sid() also * increments reference counts. */ -int sidget(security_id_t sid); + int sidget(security_id_t sid); /** * sidput - decrement SID reference counter. @@ -75,16 +76,15 @@ * zero, the SID is invalid, and avc_context_to_sid() must * be called to obtain a new SID for the security context. */ -int sidput(security_id_t sid); - + int sidput(security_id_t sid); /* * AVC entry */ -struct avc_entry; -struct avc_entry_ref { - struct avc_entry *ae; -}; + struct avc_entry; + struct avc_entry_ref { + struct avc_entry *ae; + }; /** * avc_entry_ref_init - initialize an AVC entry reference. @@ -108,43 +108,42 @@ * listening thread won't be started for kernel policy change messages. * If no locking callbacks are passed, no locking will take place. */ -struct avc_memory_callback { - /* malloc() equivalent. */ - void *(*func_malloc)(size_t size); - /* free() equivalent. */ - void (*func_free) (void *ptr); - /* Note that these functions should set errno on failure. - If not, some avc routines may return -1 without errno set. */ -}; + struct avc_memory_callback { + /* malloc() equivalent. */ + void *(*func_malloc) (size_t size); + /* free() equivalent. */ + void (*func_free) (void *ptr); + /* Note that these functions should set errno on failure. + If not, some avc routines may return -1 without errno set. */ + }; -struct avc_log_callback { - /* log the printf-style format and arguments. */ - void (*func_log)(const char *fmt, ...); - /* store a string representation of auditdata (corresponding - to the given security class) into msgbuf. */ - void (*func_audit)(void *auditdata, security_class_t class, - char *msgbuf, size_t msgbufsize); -}; + struct avc_log_callback { + /* log the printf-style format and arguments. */ + void (*func_log) (const char *fmt, ...); + /* store a string representation of auditdata (corresponding + to the given security class) into msgbuf. */ + void (*func_audit) (void *auditdata, security_class_t cls, + char *msgbuf, size_t msgbufsize); + }; -struct avc_thread_callback { - /* create and start a thread, returning an opaque pointer to it; - the thread should run the given function. */ - void *(*func_create_thread)(void (*run)(void)); - /* cancel a given thread and free its resources. */ - void (*func_stop_thread)(void *thread); -}; + struct avc_thread_callback { + /* create and start a thread, returning an opaque pointer to it; + the thread should run the given function. */ + void *(*func_create_thread) (void (*run) (void)); + /* cancel a given thread and free its resources. */ + void (*func_stop_thread) (void *thread); + }; -struct avc_lock_callback { - /* create a lock and return an opaque pointer to it. */ - void *(*func_alloc_lock)(void); - /* obtain a given lock, blocking if necessary. */ - void (*func_get_lock)(void *lock); - /* release a given lock. */ - void (*func_release_lock)(void *lock); - /* destroy a given lock (free memory, etc.) */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Feb 15 20:17:51 2007 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 1D6F016A476; Thu, 15 Feb 2007 20:17:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D330D16A409 for ; Thu, 15 Feb 2007 20:17:50 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BDE0413C4B5 for ; Thu, 15 Feb 2007 20:17:50 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1FKHouk069868 for ; Thu, 15 Feb 2007 20:17:50 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1FKHgL9069735 for perforce@freebsd.org; Thu, 15 Feb 2007 20:17:42 GMT (envelope-from millert@freebsd.org) Date: Thu, 15 Feb 2007 20:17:42 GMT Message-Id: <200702152017.l1FKHgL9069735@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 114575 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, 15 Feb 2007 20:17:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=114575 Change 114575 by millert@millert_p4 on 2007/02/15 20:16:45 Update to libsemanage-1.10.0 from the SELinux web site. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/ChangeLog#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/VERSION#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/boolean_record.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/booleans_active.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/booleans_local.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/booleans_policy.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/context_record.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/debug.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/fcontext_record.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/fcontexts_local.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/fcontexts_policy.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/handle.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/iface_record.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/interfaces_local.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/interfaces_policy.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/modules.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/node_record.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/nodes_local.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/nodes_policy.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/port_record.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/ports_local.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/ports_policy.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/seuser_record.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/seusers_local.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/seusers_policy.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/user_record.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/users_local.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/users_policy.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_count.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_count_active.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_count_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_del_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_exists.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_exists_active.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_exists_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_iterate.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_iterate_active.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_iterate_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_list.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_list_active.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_list_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_modify_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_query.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_query_active.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_query_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_set_active.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_count.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_del.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_exists.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_fcontext.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_fcontext_count.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_fcontext_count_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_fcontext_del_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_fcontext_exists.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_fcontext_exists_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_fcontext_iterate.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_fcontext_iterate_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_fcontext_list.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_fcontext_list_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_fcontext_modify_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_fcontext_query.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_fcontext_query_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_iface.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_iface_count.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_iface_count_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_iface_del_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_iface_exists.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_iface_exists_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_iface_iterate.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_iface_iterate_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_iface_list.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_iface_list_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_iface_modify_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_iface_query.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_iface_query_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_iterate.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_list.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_modify.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_node.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_node_count.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_node_count_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_node_del_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_node_exists.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_node_exists_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_node_iterate.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_node_iterate_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_node_list.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_node_list_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_node_modify_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_node_query.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_node_query_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_port.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_port_count.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_port_count_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_port_del_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_port_exists.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_port_exists_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_port_iterate.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_port_iterate_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_port_list.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_port_list_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_port_modify_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_port_query.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_port_query_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_query.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_seuser.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_seuser_count.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_seuser_count_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_seuser_del_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_seuser_exists.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_seuser_exists_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_seuser_iterate.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_seuser_iterate_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_seuser_list.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_seuser_list_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_seuser_modify_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_seuser_query.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_seuser_query_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_user.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_user_count.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_user_count_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_user_del_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_user_exists.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_user_exists_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_user_iterate.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_user_iterate_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_user_list.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_user_list_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_user_modify_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_user_query.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_user_query_local.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/boolean_internal.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/boolean_record.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/booleans_active.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/booleans_activedb.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/booleans_file.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/booleans_local.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/booleans_policy.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/booleans_policydb.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/conf-parse.y#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/conf-scan.l#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/context_internal.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/context_record.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/database.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/database.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/database_activedb.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/database_activedb.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/database_file.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/database_file.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/database_join.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/database_join.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/database_llist.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/database_llist.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/database_policydb.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/database_policydb.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/debug.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/debug.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/direct_api.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/direct_api.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/fcontext_internal.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/fcontext_record.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/fcontexts_file.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/fcontexts_local.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/fcontexts_policy.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/handle.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/handle.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/handle_internal.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/iface_internal.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/iface_record.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/interfaces_file.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/interfaces_local.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/interfaces_policy.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/interfaces_policydb.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/module_internal.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/modules.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/modules.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/node_internal.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/node_record.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/nodes_file.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/nodes_local.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/nodes_policy.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/nodes_policydb.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/parse_utils.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/parse_utils.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/policy.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/policy_components.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/port_internal.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/port_record.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/ports_file.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/ports_local.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/ports_policy.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/ports_policydb.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/private.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/semanage.py#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/semanage_conf.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/semanage_store.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/semanage_store.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/semanageswig_python.i#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/semanageswig_wrap.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/seuser_internal.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/seuser_record.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/seusers_file.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/seusers_local.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/seusers_policy.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/user_base_record.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/user_extra_record.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/user_internal.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/user_record.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/users_base_file.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/users_base_policydb.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/users_extra_file.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/users_join.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/users_local.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/users_policy.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/tests/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/tests/README#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/tests/libsemanage-tests.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/tests/nc_sort_malformed#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/tests/nc_sort_sorted#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/tests/nc_sort_unsorted#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/tests/test_semanage_store.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/tests/test_semanage_store.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/tests/utilities.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/tests/utilities.h#1 add Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,91 @@ +1.10.0 2007-01-18 + * Updated version for stable branch. + +1.9.2 2007-01-08 + * Merged patch to optionally reduce disk usage by removing + the backup module store and linked policy from Karl MacMillan + * Merged patch to correctly propagate return values in libsemanage + +1.9.1 2006-11-27 + * Merged patch to compile wit -fPIC instead of -fpic from + Manoj Srivastava to prevent hitting the global offest table + limit. Patch changed to include libselinux and libsemanage in + addition to libsepol. + +1.8 2006-10-17 + * Updated version for release. + +1.6.17 2006-09-29 + * Merged patch to skip reload if no active store exists and + the store path doesn't match the active store path from Dan Walsh. + * Merged patch to not destroy sepol handle on error path of + connect from James Athey. + * Merged patch to add genhomedircon path to semanage.conf from + James Athey. + +1.6.16 2006-08-14 + * Make most copy errors fatal, but allow exceptions for + file_contexts.local, seusers, and netfilter_contexts if + the source file does not exist in the store. + +1.6.15 2006-08-11 + * Merged separate local file contexts patch from Chris PeBenito. + +1.6.14 2006-08-11 + * Merged patch to make most copy errors non-fatal from Dan Walsh. + +1.6.13 2006-08-03 + * Merged netfilter contexts support from Chris PeBenito. + +1.6.12 2006-07-11 + * Merged support for read operations on read-only fs from + Caleb Case (Tresys Technology). + +1.6.11 2006-06-29 + * Lindent. + +1.6.10 2006-06-26 + * Merged setfiles location check patch from Dan Walsh. + +1.6.9 2006-06-16 + * Merged several fixes from Serge Hallyn: + dbase_file_cache: deref of uninit data on error path. + dbase_policydb_cache: clear fp to avoid double fclose + semanage_fc_sort: destroy temp on error paths + +1.6.8 2006-06-02 + * Updated default location for setfiles to /sbin to + match policycoreutils. This can also be adjusted via + semanage.conf using the syntax: + [setfiles] + path = /path/to/setfiles + args = -q -c $@ $< + [end] + +1.6.7 2006-05-05 + * Merged fix warnings patch from Karl MacMillan. + +1.6.6 2006-04-14 + * Merged updated file context sorting patch from Christopher + Ashworth, with bug fix for escaped character flag. + +1.6.5 2006-04-13 + * Merged file context sorting code from Christopher Ashworth + (Tresys Technology), based on fc_sort.c code in refpolicy. + +1.6.4 2006-04-12 + * Merged python binding t_output_helper removal patch from Dan Walsh. + * Regenerated swig files. + +1.6.3 2006-03-30 + * Merged corrected fix for descriptor leak from Dan Walsh. + +1.6.2 2006-03-20 + * Merged Makefile PYLIBVER definition patch from Dan Walsh. + +1.6.1 2006-03-20 + * Merged man page reorganization from Ivan Gyurdiev. + 1.6 2006-03-14 * Updated version for release. ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/Makefile#2 (text+ko) ==== @@ -17,4 +17,10 @@ clean distclean: $(MAKE) -C src $@ + $(MAKE) -C tests $@ + +indent: + $(MAKE) -C src $@ + $(MAKE) -C include $@ +test: ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.6 +1.10.0 ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/Makefile#2 (text+ko) ==== @@ -5,3 +5,6 @@ install: test -d $(INCDIR) || install -m 755 -d $(INCDIR) install -m 644 $(wildcard semanage/*.h) $(INCDIR) + +indent: + ../../Lindent $(wildcard semanage/*.h) ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/boolean_record.h#2 (text+ko) ==== @@ -6,7 +6,7 @@ #include #ifndef _SEMANAGE_BOOL_DEFINED_ -struct semanage_bool; +struct semanage_bool; struct semanage_bool_key; typedef struct semanage_bool semanage_bool_t; typedef struct semanage_bool_key semanage_bool_key_t; @@ -14,55 +14,41 @@ #endif /* Key */ -extern int semanage_bool_key_create( - semanage_handle_t* handle, - const char* name, - semanage_bool_key_t** key); +extern int semanage_bool_key_create(semanage_handle_t * handle, + const char *name, + semanage_bool_key_t ** key); + +extern int semanage_bool_key_extract(semanage_handle_t * handle, + const semanage_bool_t * boolean, + semanage_bool_key_t ** key); -extern int semanage_bool_key_extract( - semanage_handle_t* handle, - const semanage_bool_t* boolean, - semanage_bool_key_t** key); +extern void semanage_bool_key_free(semanage_bool_key_t * key); -extern void semanage_bool_key_free( - semanage_bool_key_t* key); +extern int semanage_bool_compare(const semanage_bool_t * boolean, + const semanage_bool_key_t * key); -extern int semanage_bool_compare( - const semanage_bool_t* boolean, - const semanage_bool_key_t* key); +extern int semanage_bool_compare2(const semanage_bool_t * boolean, + const semanage_bool_t * boolean2); -extern int semanage_bool_compare2( - const semanage_bool_t* boolean, - const semanage_bool_t* boolean2); - /* Name */ -extern const char* semanage_bool_get_name( - const semanage_bool_t* boolean); +extern const char *semanage_bool_get_name(const semanage_bool_t * boolean); -extern int semanage_bool_set_name( - semanage_handle_t* handle, - semanage_bool_t* boolean, - const char* name); +extern int semanage_bool_set_name(semanage_handle_t * handle, + semanage_bool_t * boolean, const char *name); /* Value */ -extern int semanage_bool_get_value( - const semanage_bool_t* boolean); +extern int semanage_bool_get_value(const semanage_bool_t * boolean); -extern void semanage_bool_set_value( - semanage_bool_t* boolean, - int value); +extern void semanage_bool_set_value(semanage_bool_t * boolean, int value); /* Create/Clone/Destroy */ -extern int semanage_bool_create( - semanage_handle_t* handle, - semanage_bool_t** bool_ptr); +extern int semanage_bool_create(semanage_handle_t * handle, + semanage_bool_t ** bool_ptr); -extern int semanage_bool_clone( - semanage_handle_t* handle, - const semanage_bool_t* boolean, - semanage_bool_t** bool_ptr); +extern int semanage_bool_clone(semanage_handle_t * handle, + const semanage_bool_t * boolean, + semanage_bool_t ** bool_ptr); -extern void semanage_bool_free( - semanage_bool_t* boolean); +extern void semanage_bool_free(semanage_bool_t * boolean); #endif ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/booleans_active.h#2 (text+ko) ==== @@ -6,35 +6,28 @@ #include #include -extern int semanage_bool_set_active( - semanage_handle_t* handle, - const semanage_bool_key_t* key, - const semanage_bool_t* data); +extern int semanage_bool_set_active(semanage_handle_t * handle, + const semanage_bool_key_t * key, + const semanage_bool_t * data); -extern int semanage_bool_query_active( - semanage_handle_t* handle, - const semanage_bool_key_t* key, - semanage_bool_t** response); +extern int semanage_bool_query_active(semanage_handle_t * handle, + const semanage_bool_key_t * key, + semanage_bool_t ** response); -extern int semanage_bool_exists_active( - semanage_handle_t* handle, - const semanage_bool_key_t* key, - int* response); +extern int semanage_bool_exists_active(semanage_handle_t * handle, + const semanage_bool_key_t * key, + int *response); -extern int semanage_bool_count_active( - semanage_handle_t* handle, - unsigned int* response); +extern int semanage_bool_count_active(semanage_handle_t * handle, + unsigned int *response); -extern int semanage_bool_iterate_active( - semanage_handle_t* handle, - int (*handler) ( - const semanage_bool_t* record, - void* varg), - void* handler_arg); +extern int semanage_bool_iterate_active(semanage_handle_t * handle, + int (*handler) (const semanage_bool_t * + record, void *varg), + void *handler_arg); -extern int semanage_bool_list_active( - semanage_handle_t* handle, - semanage_bool_t*** records, - unsigned int* count); +extern int semanage_bool_list_active(semanage_handle_t * handle, + semanage_bool_t *** records, + unsigned int *count); -#endif +#endif ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/booleans_local.h#2 (text+ko) ==== @@ -6,39 +6,31 @@ #include #include -extern int semanage_bool_modify_local( - semanage_handle_t* handle, - const semanage_bool_key_t* key, - const semanage_bool_t* data); +extern int semanage_bool_modify_local(semanage_handle_t * handle, + const semanage_bool_key_t * key, + const semanage_bool_t * data); -extern int semanage_bool_del_local( - semanage_handle_t* handle, - const semanage_bool_key_t* key); +extern int semanage_bool_del_local(semanage_handle_t * handle, + const semanage_bool_key_t * key); -extern int semanage_bool_query_local( - semanage_handle_t* handle, - const semanage_bool_key_t* key, - semanage_bool_t** response); +extern int semanage_bool_query_local(semanage_handle_t * handle, + const semanage_bool_key_t * key, + semanage_bool_t ** response); -extern int semanage_bool_exists_local( - semanage_handle_t* handle, - const semanage_bool_key_t* key, - int* response); +extern int semanage_bool_exists_local(semanage_handle_t * handle, + const semanage_bool_key_t * key, + int *response); -extern int semanage_bool_count_local( - semanage_handle_t* handle, - unsigned int* response); +extern int semanage_bool_count_local(semanage_handle_t * handle, + unsigned int *response); -extern int semanage_bool_iterate_local( - semanage_handle_t* handle, - int (*handler) ( - const semanage_bool_t* record, - void* varg), - void* handler_arg); +extern int semanage_bool_iterate_local(semanage_handle_t * handle, + int (*handler) (const semanage_bool_t * + record, void *varg), + void *handler_arg); -extern int semanage_bool_list_local( - semanage_handle_t* handle, - semanage_bool_t*** records, - unsigned int* count); +extern int semanage_bool_list_local(semanage_handle_t * handle, + semanage_bool_t *** records, + unsigned int *count); -#endif +#endif ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/booleans_policy.h#2 (text+ko) ==== @@ -3,33 +3,25 @@ #ifndef _SEMANAGE_BOOLEANS_POLICY_H_ #define _SEMANAGE_BOOLEANS_POLICY_H_ -#include +#include #include -extern int semanage_bool_query( - semanage_handle_t* handle, - const semanage_bool_key_t* key, - semanage_bool_t** response); +extern int semanage_bool_query(semanage_handle_t * handle, + const semanage_bool_key_t * key, + semanage_bool_t ** response); -extern int semanage_bool_exists( - semanage_handle_t* handle, - const semanage_bool_key_t* key, - int* response); +extern int semanage_bool_exists(semanage_handle_t * handle, + const semanage_bool_key_t * key, int *response); -extern int semanage_bool_count( - semanage_handle_t* handle, - unsigned int* response); +extern int semanage_bool_count(semanage_handle_t * handle, + unsigned int *response); -extern int semanage_bool_iterate( - semanage_handle_t* handle, - int (*handler) ( - const semanage_bool_t* record, - void* varg), - void* handler_arg); +extern int semanage_bool_iterate(semanage_handle_t * handle, + int (*handler) (const semanage_bool_t * record, + void *varg), + void *handler_arg); -extern int semanage_bool_list( - semanage_handle_t* handle, - semanage_bool_t*** records, - unsigned int* count); +extern int semanage_bool_list(semanage_handle_t * handle, + semanage_bool_t *** records, unsigned int *count); #endif ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/context_record.h#2 (text+ko) ==== @@ -1,7 +1,7 @@ /* Copyright (C) 2005 Red Hat, Inc. */ #ifndef _SEMANAGE_CONTEXT_RECORD_H_ -#define _SEMANAGE_CONTEXT_RECORD_H_ +#define _SEMANAGE_CONTEXT_RECORD_H_ #include @@ -12,63 +12,50 @@ #endif /* User */ -extern const char* semanage_context_get_user( - const semanage_context_t* con); +extern const char *semanage_context_get_user(const semanage_context_t * con); -extern int semanage_context_set_user( - semanage_handle_t* handle, - semanage_context_t* con, - const char* user); +extern int semanage_context_set_user(semanage_handle_t * handle, + semanage_context_t * con, + const char *user); /* Role */ -extern const char* semanage_context_get_role( - const semanage_context_t* con); +extern const char *semanage_context_get_role(const semanage_context_t * con); -extern int semanage_context_set_role( - semanage_handle_t* handle, - semanage_context_t* con, - const char* role); +extern int semanage_context_set_role(semanage_handle_t * handle, + semanage_context_t * con, + const char *role); /* Type */ -extern const char* semanage_context_get_type( - const semanage_context_t* con); +extern const char *semanage_context_get_type(const semanage_context_t * con); -extern int semanage_context_set_type( - semanage_handle_t* handle, - semanage_context_t* con, - const char* type); +extern int semanage_context_set_type(semanage_handle_t * handle, + semanage_context_t * con, + const char *type); /* MLS */ -extern const char* semanage_context_get_mls( - const semanage_context_t* con); +extern const char *semanage_context_get_mls(const semanage_context_t * con); -extern int semanage_context_set_mls( - semanage_handle_t* handle, - semanage_context_t* con, - const char* mls_range); +extern int semanage_context_set_mls(semanage_handle_t * handle, + semanage_context_t * con, + const char *mls_range); /* Create/Clone/Destroy */ -extern int semanage_context_create( - semanage_handle_t* handle, - semanage_context_t** con_ptr); +extern int semanage_context_create(semanage_handle_t * handle, + semanage_context_t ** con_ptr); + +extern int semanage_context_clone(semanage_handle_t * handle, + const semanage_context_t * con, + semanage_context_t ** con_ptr); -extern int semanage_context_clone( - semanage_handle_t* handle, - const semanage_context_t* con, - semanage_context_t** con_ptr); +extern void semanage_context_free(semanage_context_t * con); -extern void semanage_context_free( - semanage_context_t* con); - /* Parse to/from string */ -extern int semanage_context_from_string( - semanage_handle_t* handle, - const char* str, - semanage_context_t** con); +extern int semanage_context_from_string(semanage_handle_t * handle, + const char *str, + semanage_context_t ** con); -extern int semanage_context_to_string( - semanage_handle_t* handle, - const semanage_context_t* con, - char** str_ptr); +extern int semanage_context_to_string(semanage_handle_t * handle, + const semanage_context_t * con, + char **str_ptr); -#endif +#endif ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/debug.h#2 (text+ko) ==== @@ -29,30 +29,26 @@ #define SEMANAGE_MSG_WARN 2 #define SEMANAGE_MSG_INFO 3 -extern int semanage_msg_get_level( - semanage_handle_t* handle); +extern int semanage_msg_get_level(semanage_handle_t * handle); -extern const char* semanage_msg_get_channel( - semanage_handle_t* handle); +extern const char *semanage_msg_get_channel(semanage_handle_t * handle); -extern const char* semanage_msg_get_fname( - semanage_handle_t* handle); +extern const char *semanage_msg_get_fname(semanage_handle_t * handle); /* Set the messaging callback. * By the default, the callback will print * the message on standard output, in a * particular format. Passing NULL here * indicates that messaging should be suppressed */ -extern void semanage_msg_set_callback( - semanage_handle_t* handle, +extern void semanage_msg_set_callback(semanage_handle_t * handle, #ifdef __GNUC__ - __attribute__ ((format (printf, 3, 4))) + __attribute__ ((format(printf, 3, 4))) #endif - void (*msg_callback) ( - void* varg, - semanage_handle_t* handle, - const char* fmt, - ...), - void* msg_callback_arg); + void (*msg_callback) (void *varg, + semanage_handle_t * + handle, + const char *fmt, + ...), + void *msg_callback_arg); -#endif +#endif ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/fcontext_record.h#2 (text+ko) ==== @@ -1,7 +1,7 @@ /* Copyright (C) 2005 Red Hat, Inc. */ #ifndef _SEMANAGE_FCONTEXT_RECORD_H_ -#define _SEMANAGE_FCONTEXT_RECORD_H_ +#define _SEMANAGE_FCONTEXT_RECORD_H_ #include #include @@ -15,36 +15,30 @@ #endif /* Key */ -extern int semanage_fcontext_compare( - const semanage_fcontext_t* fcontext, - const semanage_fcontext_key_t* key); +extern int semanage_fcontext_compare(const semanage_fcontext_t * fcontext, + const semanage_fcontext_key_t * key); -extern int semanage_fcontext_compare2( - const semanage_fcontext_t* fcontext, - const semanage_fcontext_t* fcontext2); +extern int semanage_fcontext_compare2(const semanage_fcontext_t * fcontext, + const semanage_fcontext_t * fcontext2); -extern int semanage_fcontext_key_create( - semanage_handle_t* handle, - const char* expr, - int type, - semanage_fcontext_key_t** key_ptr); +extern int semanage_fcontext_key_create(semanage_handle_t * handle, + const char *expr, + int type, + semanage_fcontext_key_t ** key_ptr); -extern int semanage_fcontext_key_extract( - semanage_handle_t* handle, - const semanage_fcontext_t* fcontext, - semanage_fcontext_key_t** key_ptr); +extern int semanage_fcontext_key_extract(semanage_handle_t * handle, + const semanage_fcontext_t * fcontext, + semanage_fcontext_key_t ** key_ptr); -extern void semanage_fcontext_key_free( - semanage_fcontext_key_t* key); +extern void semanage_fcontext_key_free(semanage_fcontext_key_t * key); /* Regexp */ -extern const char* semanage_fcontext_get_expr( - const semanage_fcontext_t* fcontext); +extern const char *semanage_fcontext_get_expr(const semanage_fcontext_t * + fcontext); -extern int semanage_fcontext_set_expr( - semanage_handle_t* handle, - semanage_fcontext_t* fcontext, - const char* expr); +extern int semanage_fcontext_set_expr(semanage_handle_t * handle, + semanage_fcontext_t * fcontext, + const char *expr); /* Type */ #define SEMANAGE_FCONTEXT_ALL 0 @@ -56,36 +50,29 @@ #define SEMANAGE_FCONTEXT_LINK 6 #define SEMANAGE_FCONTEXT_PIPE 7 -extern int semanage_fcontext_get_type( - const semanage_fcontext_t* fcontext); +extern int semanage_fcontext_get_type(const semanage_fcontext_t * fcontext); -extern const char* semanage_fcontext_get_type_str( - int type); +extern const char *semanage_fcontext_get_type_str(int type); -extern void semanage_fcontext_set_type( - semanage_fcontext_t* fcontext, - int type); +extern void semanage_fcontext_set_type(semanage_fcontext_t * fcontext, + int type); /* Context */ -extern semanage_context_t* semanage_fcontext_get_con( - const semanage_fcontext_t* fcontext); +extern semanage_context_t *semanage_fcontext_get_con(const semanage_fcontext_t * + fcontext); -extern int semanage_fcontext_set_con( - semanage_handle_t* handle, - semanage_fcontext_t* fcontext, - semanage_context_t* con); +extern int semanage_fcontext_set_con(semanage_handle_t * handle, + semanage_fcontext_t * fcontext, + semanage_context_t * con); /* Create/Clone/Destroy */ -extern int semanage_fcontext_create( - semanage_handle_t* handle, - semanage_fcontext_t** fcontext_ptr); +extern int semanage_fcontext_create(semanage_handle_t * handle, + semanage_fcontext_t ** fcontext_ptr); -extern int semanage_fcontext_clone( - semanage_handle_t* handle, - const semanage_fcontext_t* fcontext, - semanage_fcontext_t** fcontext_ptr); +extern int semanage_fcontext_clone(semanage_handle_t * handle, + const semanage_fcontext_t * fcontext, + semanage_fcontext_t ** fcontext_ptr); -extern void semanage_fcontext_free( - semanage_fcontext_t* fcontext); +extern void semanage_fcontext_free(semanage_fcontext_t * fcontext); #endif ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/fcontexts_local.h#2 (text+ko) ==== @@ -6,39 +6,32 @@ #include #include -extern int semanage_fcontext_modify_local( - semanage_handle_t* handle, - const semanage_fcontext_key_t* key, - const semanage_fcontext_t* data); +extern int semanage_fcontext_modify_local(semanage_handle_t * handle, + const semanage_fcontext_key_t * key, + const semanage_fcontext_t * data); -extern int semanage_fcontext_del_local( - semanage_handle_t* handle, - const semanage_fcontext_key_t* key); +extern int semanage_fcontext_del_local(semanage_handle_t * handle, + const semanage_fcontext_key_t * key); -extern int semanage_fcontext_query_local( - semanage_handle_t* handle, - const semanage_fcontext_key_t* key, - semanage_fcontext_t** response); +extern int semanage_fcontext_query_local(semanage_handle_t * handle, + const semanage_fcontext_key_t * key, + semanage_fcontext_t ** response); -extern int semanage_fcontext_exists_local( - semanage_handle_t* handle, - const semanage_fcontext_key_t* key, - int* response); +extern int semanage_fcontext_exists_local(semanage_handle_t * handle, + const semanage_fcontext_key_t * key, + int *response); -extern int semanage_fcontext_count_local( - semanage_handle_t* handle, - unsigned int* response); +extern int semanage_fcontext_count_local(semanage_handle_t * handle, + unsigned int *response); -extern int semanage_fcontext_iterate_local( - semanage_handle_t* handle, - int (*handler) ( - const semanage_fcontext_t* record, - void* varg), - void* handler_arg); +extern int semanage_fcontext_iterate_local(semanage_handle_t * handle, + int (*handler) (const + semanage_fcontext_t * + record, void *varg), + void *handler_arg); -extern int semanage_fcontext_list_local( - semanage_handle_t* handle, - semanage_fcontext_t*** records, - unsigned int* count); +extern int semanage_fcontext_list_local(semanage_handle_t * handle, + semanage_fcontext_t *** records, + unsigned int *count); -#endif +#endif ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/fcontexts_policy.h#2 (text+ko) ==== @@ -6,30 +6,24 @@ #include #include -extern int semanage_fcontext_query( - semanage_handle_t* handle, - const semanage_fcontext_key_t* key, - semanage_fcontext_t** response); +extern int semanage_fcontext_query(semanage_handle_t * handle, + const semanage_fcontext_key_t * key, + semanage_fcontext_t ** response); -extern int semanage_fcontext_exists( - semanage_handle_t* handle, - const semanage_fcontext_key_t* key, - int* response); +extern int semanage_fcontext_exists(semanage_handle_t * handle, + const semanage_fcontext_key_t * key, + int *response); -extern int semanage_fcontext_count( - semanage_handle_t* handle, - unsigned int* response); +extern int semanage_fcontext_count(semanage_handle_t * handle, + unsigned int *response); -extern int semanage_fcontext_iterate( - semanage_handle_t* handle, - int (*handler) ( - const semanage_fcontext_t* record, - void* varg), - void* handler_arg); +extern int semanage_fcontext_iterate(semanage_handle_t * handle, + int (*handler) (const semanage_fcontext_t * + record, void *varg), + void *handler_arg); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Feb 15 20:17:53 2007 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 E7E1A16A56D; Thu, 15 Feb 2007 20:17:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C010516A569 for ; Thu, 15 Feb 2007 20:17:52 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id ADE9313C4A7 for ; Thu, 15 Feb 2007 20:17:52 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1FKHqIn069902 for ; Thu, 15 Feb 2007 20:17:52 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1FKHoir069871 for perforce@freebsd.org; Thu, 15 Feb 2007 20:17:50 GMT (envelope-from millert@freebsd.org) Date: Thu, 15 Feb 2007 20:17:50 GMT Message-Id: <200702152017.l1FKHoir069871@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 114576 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, 15 Feb 2007 20:17:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=114576 Change 114576 by millert@millert_p4 on 2007/02/15 20:17:25 Update to libsepol-1.16.0 from the SELinux web site. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/ChangeLog#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/VERSION#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/boolean_record.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/booleans.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/context.h#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/context_record.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/debug.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/iface_record.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/interfaces.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/module.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/node_record.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/nodes.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb.h#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/avrule_block.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/avtab.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/conditional.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/constraint.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/context.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/ebitmap.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/expand.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/flask_types.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/hashtab.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/hierarchy.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/link.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/mls_types.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/module.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/policydb.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/services.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/sidtab.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/symtab.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/util.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/port_record.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/ports.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/roles.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/sepol.h#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/user_record.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/users.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/Makefile#4 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/assertion.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/avrule_block.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/avtab.c#5 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/boolean_internal.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/boolean_record.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/booleans.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/conditional.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/constraint.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/context.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/context.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/context_internal.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/context_record.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/debug.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/debug.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/ebitmap.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/expand.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/genbools.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/genusers.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/handle.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/handle.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/hashtab.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/hierarchy.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/iface_internal.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/iface_record.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/interfaces.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/link.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/mls.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/mls.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/module.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/module_internal.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/node_internal.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/node_record.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/nodes.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/policydb.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/policydb_convert.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/policydb_internal.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/policydb_public.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/port_internal.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/port_record.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/ports.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/private.h#4 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/roles.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/services.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/sidtab.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/symtab.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/user_internal.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/user_record.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/users.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/util.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/write.c#5 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/debug.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/debug.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/helpers.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/helpers.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/libsepol-tests.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/test-common.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/test-common.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/test-cond.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/test-cond.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/test-deps.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/test-deps.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/test-expander-attr-map.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/test-expander-attr-map.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/test-expander-roles.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/test-expander-roles.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/test-expander-users.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/test-expander-users.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/test-expander.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/test-expander.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/test-linker-cond-map.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/test-linker-cond-map.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/test-linker-roles.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/test-linker-roles.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/test-linker-types.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/test-linker-types.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/test-linker.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/tests/test-linker.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/utils/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/utils/chkcon.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,107 @@ +1.16.0 2007-01-18 + * Updated version for stable branch. + +1.15.3 2006-11-27 + * Merged patch to compile wit -fPIC instead of -fpic from + Manoj Srivastava to prevent hitting the global offest table + limit. Patch changed to include libselinux and libsemanage in + addition to libselinux. +1.15.2 2006-10-31 + * Merged fix from Karl MacMillan for a segfault when linking + non-MLS modules with users in them. + +1.15.1 2006-10-24 + * Merged fix for version comparison that was preventing range + transition rules from being written for a version 5 base policy + from Darrel Goeddel. + +1.14 2006-10-17 + * Updated version for release. + +1.12.28 2006-09-28 + * Build libsepol's static object files with -fpic + +1.12.27 2006-09-28 + * Merged mls user and range_transition support in modules + from Darrel Goeddel + +1.12.26 2006-09-05 + * Merged range transition enhancements and user format changes + Darrel Goeddel + +1.12.25 2006-08-24 + * Merged conditionally expand neverallows patch from Jeremy Mowery. + * Merged refactor expander patch from Jeremy Mowery. + +1.12.24 2006-08-03 + * Merged libsepol unit tests from Joshua Brindle. + +1.12.23 2006-08-03 + * Merged symtab datum patch from Karl MacMillan. + +1.12.22 2006-08-03 + * Merged netfilter contexts support from Chris PeBenito. + +1.12.21 2006-07-28 + * Merged helpful hierarchy check errors patch from Joshua Brindle. + +1.12.20 2006-07-25 + * Merged semodule_deps patch from Karl MacMillan. + This adds source module names to the avrule decls. + +1.12.19 2006-06-29 + * Lindent. + +1.12.18 2006-06-26 + * Merged optionals in base take 2 patch set from Joshua Brindle. + +1.12.17 2006-05-30 + * Revert 1.12.16. + +1.12.16 2006-05-30 + * Merged cleaner fix for bool_ids overflow from Karl MacMillan, + replacing the prior patch. + +1.12.15 2006-05-30 + * Merged fixes for several memory leaks in the error paths during + policy read from Serge Hallyn. + +1.12.14 2006-05-25 + * Fixed bool_ids overflow bug in cond_node_find and cond_copy_list, + based on bug report and suggested fix by Cedric Roux. + +1.12.13 2006-05-24 + * Merged sens_copy_callback, check_role_hierarchy_callback, + and node_from_record fixes from Serge Hallyn. + +1.12.12 2006-05-22 + * Added sepol_policydb_compat_net() interface for testing whether + a policy requires the compatibility support for network checks + to be enabled in the kernel. + +1.12.11 2006-05-17 + * Merged patch to initialize sym_val_to_name arrays from Kevin Carr. + Reworked to use calloc in the first place, and converted some other + malloc/memset pairs to calloc calls. + +1.12.10 2006-05-08 + * Merged patch to revert role/user decl upgrade from Karl MacMillan. + +1.12.9 2006-05-08 + * Dropped tests from all Makefile target. + +1.12.8 2006-05-05 + * Merged fix warnings patch from Karl MacMillan. + +1.12.7 2006-05-05 + * Merged libsepol test framework patch from Karl MacMillan. + +1.12.6 2006-04-28 + * Fixed cond_normalize to traverse the entire cond list at link time. + +1.12.5 2006-04-03 + * Merged fix for leak of optional package sections from Ivan Gyurdiev. + 1.12.4 2006-03-29 * Generalize test for bitmap overflow in ebitmap_set_bit. ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/Makefile#2 (text+ko) ==== @@ -14,4 +14,13 @@ clean: $(MAKE) -C src clean $(MAKE) -C utils clean + $(MAKE) -C tests clean + +indent: + $(MAKE) -C src $@ + $(MAKE) -C include $@ + $(MAKE) -C utils $@ + +test: + $(MAKE) -C tests test ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.12.4 +1.16.0 ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/Makefile#2 (text+ko) ==== @@ -7,3 +7,6 @@ test -d $(INCDIR)/policydb || install -m 755 -d $(INCDIR)/policydb install -m 644 $(wildcard sepol/*.h) $(INCDIR) install -m 644 $(wildcard sepol/policydb/*.h) $(INCDIR)/policydb + +indent: + ../../Lindent $(wildcard sepol/*.h) ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/boolean_record.h#2 (text+ko) ==== @@ -10,59 +10,42 @@ typedef struct sepol_bool_key sepol_bool_key_t; /* Key */ -extern int sepol_bool_key_create( - sepol_handle_t* handle, - const char* name, - sepol_bool_key_t** key); +extern int sepol_bool_key_create(sepol_handle_t * handle, + const char *name, sepol_bool_key_t ** key); + +extern void sepol_bool_key_unpack(const sepol_bool_key_t * key, + const char **name); -extern void sepol_bool_key_unpack( - const sepol_bool_key_t* key, - const char** name); +extern int sepol_bool_key_extract(sepol_handle_t * handle, + const sepol_bool_t * boolean, + sepol_bool_key_t ** key_ptr); -extern int sepol_bool_key_extract( - sepol_handle_t* handle, - const sepol_bool_t* boolean, - sepol_bool_key_t** key_ptr); +extern void sepol_bool_key_free(sepol_bool_key_t * key); -extern void sepol_bool_key_free( - sepol_bool_key_t* key); +extern int sepol_bool_compare(const sepol_bool_t * boolean, + const sepol_bool_key_t * key); -extern int sepol_bool_compare( - const sepol_bool_t* boolean, - const sepol_bool_key_t* key); +extern int sepol_bool_compare2(const sepol_bool_t * boolean, + const sepol_bool_t * boolean2); -extern int sepol_bool_compare2( - const sepol_bool_t* boolean, - const sepol_bool_t* boolean2); - /* Name */ -extern const char* sepol_bool_get_name( - const sepol_bool_t* boolean); +extern const char *sepol_bool_get_name(const sepol_bool_t * boolean); -extern int sepol_bool_set_name( - sepol_handle_t* handle, - sepol_bool_t* boolean, - const char* name); +extern int sepol_bool_set_name(sepol_handle_t * handle, + sepol_bool_t * boolean, const char *name); /* Value */ -extern int sepol_bool_get_value( - const sepol_bool_t* boolean); +extern int sepol_bool_get_value(const sepol_bool_t * boolean); -extern void sepol_bool_set_value( - sepol_bool_t* boolean, - int value); +extern void sepol_bool_set_value(sepol_bool_t * boolean, int value); /* Create/Clone/Destroy */ -extern int sepol_bool_create( - sepol_handle_t* handle, - sepol_bool_t** bool_ptr); +extern int sepol_bool_create(sepol_handle_t * handle, sepol_bool_t ** bool_ptr); -extern int sepol_bool_clone( - sepol_handle_t* handle, - const sepol_bool_t* boolean, - sepol_bool_t** bool_ptr); +extern int sepol_bool_clone(sepol_handle_t * handle, + const sepol_bool_t * boolean, + sepol_bool_t ** bool_ptr); -extern void sepol_bool_free( - sepol_bool_t* boolean); +extern void sepol_bool_free(sepol_bool_t * boolean); #endif ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/booleans.h#2 (text+ko) ==== @@ -13,47 +13,37 @@ policy for the boolean settings in the boolean configuration file. The binary policy is rewritten in place in memory. Returns 0 upon success, or -1 otherwise. */ -extern int sepol_genbools( - void *data, size_t len, - char *boolpath); +extern int sepol_genbools(void *data, size_t len, char *boolpath); /* Given an existing binary policy (starting at 'data', with length 'len') and boolean settings specified by the parallel arrays ('names', 'values') with 'nel' elements, rewrite the binary policy for the boolean settings. The binary policy is rewritten in place in memory. Returns 0 upon success or -1 otherwise. */ -extern int sepol_genbools_array( - void *data, size_t len, - char **names, int *values, - int nel); +extern int sepol_genbools_array(void *data, size_t len, + char **names, int *values, int nel); /*---------------end compatbility------------*/ /* Set the specified boolean */ -extern int sepol_bool_set ( - sepol_handle_t* handle, - sepol_policydb_t* policydb, - const sepol_bool_key_t* key, - const sepol_bool_t* data); +extern int sepol_bool_set(sepol_handle_t * handle, + sepol_policydb_t * policydb, + const sepol_bool_key_t * key, + const sepol_bool_t * data); /* Return the number of booleans */ -extern int sepol_bool_count( - sepol_handle_t* handle, - const sepol_policydb_t* p, - unsigned int* response); +extern int sepol_bool_count(sepol_handle_t * handle, + const sepol_policydb_t * p, unsigned int *response); /* Check if the specified boolean exists */ -extern int sepol_bool_exists( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - const sepol_bool_key_t* key, - int* response); +extern int sepol_bool_exists(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + const sepol_bool_key_t * key, int *response); /* Query a boolean - returns the boolean, or NULL if not found */ -extern int sepol_bool_query( - sepol_handle_t* handle, - const sepol_policydb_t* p, - const sepol_bool_key_t* key, - sepol_bool_t** response); +extern int sepol_bool_query(sepol_handle_t * handle, + const sepol_policydb_t * p, + const sepol_bool_key_t * key, + sepol_bool_t ** response); /* Iterate the booleans * The handler may return: @@ -61,12 +51,9 @@ * 1 to signal successful exit * 0 to signal continue */ -extern int sepol_bool_iterate( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - int (*fn)( - const sepol_bool_t* boolean, - void* fn_arg), - void* arg); +extern int sepol_bool_iterate(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + int (*fn) (const sepol_bool_t * boolean, + void *fn_arg), void *arg); #endif ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/context.h#3 (text+ko) ==== @@ -7,25 +7,19 @@ /* -- Deprecated -- */ -extern int sepol_check_context( - const char *context); +extern int sepol_check_context(const char *context); /* -- End deprecated -- */ -extern int sepol_context_check( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - const sepol_context_t* context); +extern int sepol_context_check(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + const sepol_context_t * context); -extern int sepol_mls_contains( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - const char* mls1, - const char* mls2, - int* response); +extern int sepol_mls_contains(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + const char *mls1, + const char *mls2, int *response); -extern int sepol_mls_check( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - const char* mls); +extern int sepol_mls_check(sepol_handle_t * handle, + const sepol_policydb_t * policydb, const char *mls); #endif ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/context_record.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ #ifndef _SEPOL_CONTEXT_RECORD_H_ -#define _SEPOL_CONTEXT_RECORD_H_ +#define _SEPOL_CONTEXT_RECORD_H_ #include @@ -10,63 +10,44 @@ * in a data collection by itself */ /* User */ -extern const char* sepol_context_get_user( - const sepol_context_t* con); +extern const char *sepol_context_get_user(const sepol_context_t * con); -extern int sepol_context_set_user( - sepol_handle_t* handle, - sepol_context_t* con, - const char* user); +extern int sepol_context_set_user(sepol_handle_t * handle, + sepol_context_t * con, const char *user); /* Role */ -extern const char* sepol_context_get_role( - const sepol_context_t* con); +extern const char *sepol_context_get_role(const sepol_context_t * con); -extern int sepol_context_set_role( - sepol_handle_t* handle, - sepol_context_t* con, - const char* role); +extern int sepol_context_set_role(sepol_handle_t * handle, + sepol_context_t * con, const char *role); /* Type */ -extern const char* sepol_context_get_type( - const sepol_context_t* con); +extern const char *sepol_context_get_type(const sepol_context_t * con); -extern int sepol_context_set_type( - sepol_handle_t* handle, - sepol_context_t* con, - const char* type); +extern int sepol_context_set_type(sepol_handle_t * handle, + sepol_context_t * con, const char *type); /* MLS */ -extern const char* sepol_context_get_mls( - const sepol_context_t* con); +extern const char *sepol_context_get_mls(const sepol_context_t * con); -extern int sepol_context_set_mls( - sepol_handle_t* handle, - sepol_context_t* con, - const char* mls_range); +extern int sepol_context_set_mls(sepol_handle_t * handle, + sepol_context_t * con, const char *mls_range); /* Create/Clone/Destroy */ -extern int sepol_context_create( - sepol_handle_t* handle, - sepol_context_t** con_ptr); +extern int sepol_context_create(sepol_handle_t * handle, + sepol_context_t ** con_ptr); -extern int sepol_context_clone( - sepol_handle_t* handle, - const sepol_context_t* con, - sepol_context_t** con_ptr); +extern int sepol_context_clone(sepol_handle_t * handle, + const sepol_context_t * con, + sepol_context_t ** con_ptr); -extern void sepol_context_free( - sepol_context_t* con); +extern void sepol_context_free(sepol_context_t * con); /* Parse to/from string */ -extern int sepol_context_from_string( - sepol_handle_t* handle, - const char* str, - sepol_context_t** con); +extern int sepol_context_from_string(sepol_handle_t * handle, + const char *str, sepol_context_t ** con); -extern int sepol_context_to_string( - sepol_handle_t* handle, - const sepol_context_t* con, - char** str_ptr); +extern int sepol_context_to_string(sepol_handle_t * handle, + const sepol_context_t * con, char **str_ptr); -#endif +#endif ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/debug.h#2 (text+ko) ==== @@ -11,29 +11,24 @@ #define SEPOL_MSG_WARN 2 #define SEPOL_MSG_INFO 3 -extern int sepol_msg_get_level( - sepol_handle_t* handle); +extern int sepol_msg_get_level(sepol_handle_t * handle); -extern const char* sepol_msg_get_channel( - sepol_handle_t* handle); +extern const char *sepol_msg_get_channel(sepol_handle_t * handle); -extern const char* sepol_msg_get_fname( - sepol_handle_t* handle); +extern const char *sepol_msg_get_fname(sepol_handle_t * handle); /* Set the messaging callback. * By the default, the callback will print * the message on standard output, in a * particular format. Passing NULL here * indicates that messaging should be suppressed */ -extern void sepol_msg_set_callback( - sepol_handle_t* handle, +extern void sepol_msg_set_callback(sepol_handle_t * handle, #ifdef __GNUC__ - __attribute__ ((format (printf, 3, 4))) + __attribute__ ((format(printf, 3, 4))) +#endif + void (*msg_callback) (void *varg, + sepol_handle_t * + handle, + const char *fmt, ...), + void *msg_callback_arg); #endif - void (*msg_callback) ( - void* varg, - sepol_handle_t* handle, - const char* fmt, - ...), - void* msg_callback_arg); -#endif ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/iface_record.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ #ifndef _SEPOL_IFACE_RECORD_H_ -#define _SEPOL_IFACE_RECORD_H_ +#define _SEPOL_IFACE_RECORD_H_ #include #include @@ -10,68 +10,50 @@ typedef struct sepol_iface_key sepol_iface_key_t; /* Key */ -extern int sepol_iface_compare( - const sepol_iface_t* iface, - const sepol_iface_key_t* key); +extern int sepol_iface_compare(const sepol_iface_t * iface, + const sepol_iface_key_t * key); -extern int sepol_iface_compare2( - const sepol_iface_t* iface, - const sepol_iface_t* iface2); +extern int sepol_iface_compare2(const sepol_iface_t * iface, + const sepol_iface_t * iface2); -extern void sepol_iface_key_unpack( - const sepol_iface_key_t* key, - const char** name); +extern void sepol_iface_key_unpack(const sepol_iface_key_t * key, + const char **name); -extern int sepol_iface_key_create( - sepol_handle_t* handle, - const char* name, - sepol_iface_key_t** key_ptr); +extern int sepol_iface_key_create(sepol_handle_t * handle, + const char *name, + sepol_iface_key_t ** key_ptr); -extern int sepol_iface_key_extract( - sepol_handle_t* handle, - const sepol_iface_t* iface, - sepol_iface_key_t** key_ptr); +extern int sepol_iface_key_extract(sepol_handle_t * handle, + const sepol_iface_t * iface, + sepol_iface_key_t ** key_ptr); -extern void sepol_iface_key_free( - sepol_iface_key_t* key); +extern void sepol_iface_key_free(sepol_iface_key_t * key); /* Name */ -extern const char* sepol_iface_get_name( - const sepol_iface_t* iface); +extern const char *sepol_iface_get_name(const sepol_iface_t * iface); -extern int sepol_iface_set_name( - sepol_handle_t* handle, - sepol_iface_t* iface, - const char* name); +extern int sepol_iface_set_name(sepol_handle_t * handle, + sepol_iface_t * iface, const char *name); /* Context */ -extern sepol_context_t* sepol_iface_get_ifcon( - const sepol_iface_t* iface); +extern sepol_context_t *sepol_iface_get_ifcon(const sepol_iface_t * iface); -extern int sepol_iface_set_ifcon( - sepol_handle_t* handle, - sepol_iface_t* iface, - sepol_context_t* con); +extern int sepol_iface_set_ifcon(sepol_handle_t * handle, + sepol_iface_t * iface, sepol_context_t * con); -extern sepol_context_t* sepol_iface_get_msgcon( - const sepol_iface_t* iface); +extern sepol_context_t *sepol_iface_get_msgcon(const sepol_iface_t * iface); -extern int sepol_iface_set_msgcon( - sepol_handle_t* handle, - sepol_iface_t* iface, - sepol_context_t* con); +extern int sepol_iface_set_msgcon(sepol_handle_t * handle, + sepol_iface_t * iface, sepol_context_t * con); /* Create/Clone/Destroy */ -extern int sepol_iface_create( - sepol_handle_t* handle, - sepol_iface_t** iface_ptr); +extern int sepol_iface_create(sepol_handle_t * handle, + sepol_iface_t ** iface_ptr); -extern int sepol_iface_clone( - sepol_handle_t* handle, - const sepol_iface_t* iface, - sepol_iface_t** iface_ptr); +extern int sepol_iface_clone(sepol_handle_t * handle, + const sepol_iface_t * iface, + sepol_iface_t ** iface_ptr); -extern void sepol_iface_free( - sepol_iface_t* iface); +extern void sepol_iface_free(sepol_iface_t * iface); #endif ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/interfaces.h#2 (text+ko) ==== @@ -6,33 +6,28 @@ #include /* Return the number of interfaces */ -extern int sepol_iface_count( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - unsigned int* response); +extern int sepol_iface_count(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + unsigned int *response); /* Check if an interface exists */ -extern int sepol_iface_exists( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - const sepol_iface_key_t* key, - int* response); +extern int sepol_iface_exists(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + const sepol_iface_key_t * key, int *response); /* Query an interface - returns the interface, * or NULL if not found */ -extern int sepol_iface_query( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - const sepol_iface_key_t* key, - sepol_iface_t** response); +extern int sepol_iface_query(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + const sepol_iface_key_t * key, + sepol_iface_t ** response); /* Modify an interface, or add it, if the key * is not found */ -extern int sepol_iface_modify( - sepol_handle_t* handle, - sepol_policydb_t* policydb, - const sepol_iface_key_t* key, - const sepol_iface_t* data); +extern int sepol_iface_modify(sepol_handle_t * handle, + sepol_policydb_t * policydb, + const sepol_iface_key_t * key, + const sepol_iface_t * data); /* Iterate the interfaces * The handler may return: @@ -40,12 +35,9 @@ * 1 to signal successful exit * 0 to signal continue */ -extern int sepol_iface_iterate( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - int (*fn)( - const sepol_iface_t* iface, - void* fn_arg), - void* arg); +extern int sepol_iface_iterate(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + int (*fn) (const sepol_iface_t * iface, + void *fn_arg), void *arg); #endif ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/module.h#2 (text+ko) ==== @@ -6,73 +6,77 @@ #include #include -#include +#include struct sepol_module_package; typedef struct sepol_module_package sepol_module_package_t; /* Module package public interfaces. */ -extern int sepol_module_package_create(sepol_module_package_t **p); +extern int sepol_module_package_create(sepol_module_package_t ** p); + +extern void sepol_module_package_free(sepol_module_package_t * p); + +extern char *sepol_module_package_get_file_contexts(sepol_module_package_t * p); -extern void sepol_module_package_free(sepol_module_package_t *p); +extern size_t sepol_module_package_get_file_contexts_len(sepol_module_package_t + * p); -extern char *sepol_module_package_get_file_contexts(sepol_module_package_t *p); +extern int sepol_module_package_set_file_contexts(sepol_module_package_t * p, + char *data, size_t len); -extern size_t sepol_module_package_get_file_contexts_len(sepol_module_package_t *p); +extern char *sepol_module_package_get_seusers(sepol_module_package_t * p); -extern int sepol_module_package_set_file_contexts(sepol_module_package_t *p, - char *data, - size_t len); +extern size_t sepol_module_package_get_seusers_len(sepol_module_package_t * p); -extern char *sepol_module_package_get_seusers(sepol_module_package_t *p); +extern int sepol_module_package_set_seusers(sepol_module_package_t * p, + char *data, size_t len); -extern size_t sepol_module_package_get_seusers_len(sepol_module_package_t *p); +extern char *sepol_module_package_get_user_extra(sepol_module_package_t * p); -extern int sepol_module_package_set_seusers(sepol_module_package_t *p, - char *data, - size_t len); +extern size_t sepol_module_package_get_user_extra_len(sepol_module_package_t * + p); -extern char *sepol_module_package_get_user_extra(sepol_module_package_t *p); +extern int sepol_module_package_set_user_extra(sepol_module_package_t * p, + char *data, size_t len); -extern size_t sepol_module_package_get_user_extra_len(sepol_module_package_t *p); +extern char *sepol_module_package_get_netfilter_contexts(sepol_module_package_t + * p); -extern int sepol_module_package_set_user_extra(sepol_module_package_t *p, - char *data, - size_t len); +extern size_t +sepol_module_package_get_netfilter_contexts_len(sepol_module_package_t * p); +extern int sepol_module_package_set_netfilter_contexts(sepol_module_package_t * + p, char *data, + size_t len); -extern sepol_policydb_t *sepol_module_package_get_policy(sepol_module_package_t *p); +extern sepol_policydb_t *sepol_module_package_get_policy(sepol_module_package_t + * p); -extern int sepol_link_packages(sepol_handle_t *handle, - sepol_module_package_t *base, - sepol_module_package_t **modules, - int num_modules, - int verbose); +extern int sepol_link_packages(sepol_handle_t * handle, + sepol_module_package_t * base, + sepol_module_package_t ** modules, + int num_modules, int verbose); -extern int sepol_module_package_read(sepol_module_package_t *mod, - struct sepol_policy_file *file, +extern int sepol_module_package_read(sepol_module_package_t * mod, + struct sepol_policy_file *file, int verbose); -extern int sepol_module_package_info(struct sepol_policy_file *file, +extern int sepol_module_package_info(struct sepol_policy_file *file, int *type, char **name, char **version); -extern int sepol_module_package_write(sepol_module_package_t *p, +extern int sepol_module_package_write(sepol_module_package_t * p, struct sepol_policy_file *file); /* Module linking/expanding public interfaces. */ -extern int sepol_link_modules(sepol_handle_t *handle, - sepol_policydb_t *base, - sepol_policydb_t **modules, - size_t len, - int verbose); +extern int sepol_link_modules(sepol_handle_t * handle, + sepol_policydb_t * base, + sepol_policydb_t ** modules, + size_t len, int verbose); -extern int sepol_expand_module(sepol_handle_t *handle, - sepol_policydb_t *base, - sepol_policydb_t *out, - int verbose, - int check); +extern int sepol_expand_module(sepol_handle_t * handle, + sepol_policydb_t * base, + sepol_policydb_t * out, int verbose, int check); #endif - ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/node_record.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ #ifndef _SEPOL_NODE_RECORD_H_ -#define _SEPOL_NODE_RECORD_H_ +#define _SEPOL_NODE_RECORD_H_ #include #include @@ -14,114 +14,79 @@ #define SEPOL_PROTO_IP6 1 /* Key */ -extern int sepol_node_compare( - const sepol_node_t* node, - const sepol_node_key_t* key); +extern int sepol_node_compare(const sepol_node_t * node, + const sepol_node_key_t * key); -extern int sepol_node_compare2( - const sepol_node_t* node, - const sepol_node_t* node2); +extern int sepol_node_compare2(const sepol_node_t * node, + const sepol_node_t * node2); -extern int sepol_node_key_create( - sepol_handle_t* handle, - const char* addr, - const char* mask, - int proto, - sepol_node_key_t** key_ptr); +extern int sepol_node_key_create(sepol_handle_t * handle, + const char *addr, + const char *mask, + int proto, sepol_node_key_t ** key_ptr); -extern void sepol_node_key_unpack( - const sepol_node_key_t* key, - const char** addr, - const char** mask, - int* proto); +extern void sepol_node_key_unpack(const sepol_node_key_t * key, + const char **addr, + const char **mask, int *proto); -extern int sepol_node_key_extract( - sepol_handle_t* handle, - const sepol_node_t* node, - sepol_node_key_t** key_ptr); +extern int sepol_node_key_extract(sepol_handle_t * handle, + const sepol_node_t * node, + sepol_node_key_t ** key_ptr); -extern void sepol_node_key_free( - sepol_node_key_t* key); +extern void sepol_node_key_free(sepol_node_key_t * key); /* Address */ -extern int sepol_node_get_addr( - sepol_handle_t* handle, - const sepol_node_t* node, - char** addr); +extern int sepol_node_get_addr(sepol_handle_t * handle, + const sepol_node_t * node, char **addr); -extern int sepol_node_get_addr_bytes( - sepol_handle_t* handle, - const sepol_node_t* node, - char** addr, - size_t* addr_sz); +extern int sepol_node_get_addr_bytes(sepol_handle_t * handle, + const sepol_node_t * node, + char **addr, size_t * addr_sz); -extern int sepol_node_set_addr( - sepol_handle_t* handle, - sepol_node_t* node, - int proto, - const char* addr); +extern int sepol_node_set_addr(sepol_handle_t * handle, + sepol_node_t * node, + int proto, const char *addr); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Feb 15 20:18:56 2007 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 DCC0016A409; Thu, 15 Feb 2007 20:18:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9CA1716A402 for ; Thu, 15 Feb 2007 20:18:55 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8A37213C4B4 for ; Thu, 15 Feb 2007 20:18:55 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1FKItBt070201 for ; Thu, 15 Feb 2007 20:18:55 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1FKIskH070198 for perforce@freebsd.org; Thu, 15 Feb 2007 20:18:54 GMT (envelope-from millert@freebsd.org) Date: Thu, 15 Feb 2007 20:18:54 GMT Message-Id: <200702152018.l1FKIskH070198@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 114577 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, 15 Feb 2007 20:18:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=114577 Change 114577 by millert@millert_p4 on 2007/02/15 20:18:07 Update to policycoreutils-1.34.1 from the SELinux web site. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/ChangeLog#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/Makefile#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/VERSION#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/audit2allow/Makefile#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/audit2allow/audit2allow#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/audit2allow/audit2allow.1#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/audit2allow/avc.py#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/audit2why/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/audit2why/audit2why.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/load_policy/Makefile#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/load_policy/load_policy.8#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/load_policy/load_policy.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/newrole/Makefile#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/newrole/newrole-lspp.pamd#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/newrole/newrole.1#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/newrole/newrole.c#4 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/Makefile#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/POTFILES#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/POTFILES.in#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/af.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/am.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/ar.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/as.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/be.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/bg.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/bn.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/bn_IN.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/ca.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/cs.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/cy.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/da.po#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/de.po#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/el.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/en_GB.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/es.po#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/et.po#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/eu_ES.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/fa.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/fi.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/fr.po#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/gl.po#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/gu.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/he.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/hi.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/hr.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/hu.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/hy.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/id.po#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/is.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/it.po#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/ja.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/ka.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/kn.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/ko.po#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/ku.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/lo.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/lt.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/lv.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/mk.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/ml.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/mr.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/ms.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/my.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/nb.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/nl.po#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/nn.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/no.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/nso.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/or.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/pa.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/pl.po#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/policycoreutils.pot#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/pt.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/pt_BR.po#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/ro.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/ru.po#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/si.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/sk.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/sl.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/sq.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/sr%40Latn.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/sr.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/sv.po#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/ta.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/te.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/th.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/tr.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/uk.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/ur.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/vi.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/zh_CN.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/zh_TW.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/zu.po#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/restorecon/Makefile#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/restorecon/restorecon.8#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/restorecon/restorecon.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/restorecond/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/restorecond/restorecond.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/restorecond/restorecond.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/restorecond/restorecond.conf#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/restorecond/restorecond.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/restorecond/restorecond.init#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/restorecond/stringslist.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/restorecond/stringslist.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/restorecond/utmpwatcher.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/restorecond/utmpwatcher.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/run_init/Makefile#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/run_init/open_init_pty.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/run_init/run_init.8#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/run_init/run_init.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/scripts/Makefile#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/scripts/chcat#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/scripts/chcat.8#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/scripts/fixfiles#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/scripts/fixfiles.8#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/scripts/genhomedircon#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/scripts/genhomedircon.8#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/secon/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/secon/secon.1#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/secon/secon.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semanage/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semanage/semanage#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semanage/semanage.8#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semanage/seobject.py#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule/semodule.8#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule/semodule.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule_deps/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule_deps/semodule_deps.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule_deps/semodule_deps.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule_expand/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule_expand/semodule_expand.8#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule_expand/semodule_expand.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule_link/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule_link/semodule_link.8#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule_link/semodule_link.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule_package/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule_package/semodule_package.8#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule_package/semodule_package.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/sestatus/Makefile#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/sestatus/sestatus.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/setfiles/Makefile#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/setfiles/setfiles.8#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/setfiles/setfiles.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/setsebool/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/setsebool/setsebool.8#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/setsebool/setsebool.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/ChangeLog#3 (text+ko) ==== @@ -1,3 +1,205 @@ +1.34.1 2007-01-22 + * Fixed newrole non-pam build. + +1.34.0 2007-01-18 + * Updated version for stable branch. + +1.33.16 2007-01-18 + * Merged po file updates from Dan Walsh. + * Removed update-po from all target in po/Makefile. + +1.33.15 2007-01-17 + * Merged unicode-to-string fix for seobject audit from Dan Walsh. + * Merged man page updates to make "apropos selinux" work from Dan Walsh. + +1.33.14 2007-01-16 + * Merged newrole man page patch from Michael Thompson. + +1.33.13 2007-01-16 + * Merged patch to fix python unicode problem from Dan Walsh. + +1.33.12 2007-01-11 + * Merged newrole securetty check from Dan Walsh. + * Merged semodule patch to generalize list support from Karl MacMillan. + +1.33.11 2007-01-09 + * Merged fixfiles and seobject fixes from Dan Walsh. + * Merged semodule support for list of modules after -i from Karl MacMillan. + +1.33.10 2007-01-08 + * Merged patch to correctly handle a failure during semanage handle + creation from Karl MacMillan. + +1.33.9 2007-01-05 + * Merged patch to fix seobject role modification from Dan Walsh. + +1.33.8 2007-01-04 + * Merged patches from Dan Walsh to: + - omit the optional name from audit2allow + - use the installed python version in the Makefiles + - re-open the tty with O_RDWR in newrole + +1.33.7 2007-01-03 + * Patch from Dan Walsh to correctly suppress warnings in load_policy. + +1.33.6 2006-11-29 + * Patch from Dan Walsh to add an pam_acct_msg call to run_init + * Patch from Dan Walsh to fix error code returns in newrole + * Patch from Dan Walsh to remove verbose flag from semanage man page + * Patch from Dan Walsh to make audit2allow use refpolicy Makefile + in /usr/share/selinux/ + +1.33.5 2006-11-27 + * Merged patch from Michael C Thompson to clean up genhomedircon + error handling. +1.33.4 2006-11-21 + * Merged po file updates from Dan Walsh. + +1.33.3 2006-11-21 + * Merged setsebool patch from Karl MacMillan. + This fixes a bug reported by Yuichi Nakamura with + always setting booleans persistently on an unmanaged system. + +1.33.2 2006-11-20 + * Merged patch from Dan Walsh (via Karl MacMillan): + * Added newrole audit message on login failure + * Add /var/log/wtmp to restorecond.conf watch list + * Fix genhomedircon, semanage, semodule_expand man pages. + +1.33.1 2006-11-13 + * Merged newrole patch set from Michael Thompson. + +1.32 2006-10-17 + * Updated version for release. + +1.30.31 2006-10-17 + * Merged audit2allow -l fix from Yuichi Nakamura. + * Merged restorecon -i and -o - support from Karl MacMillan. + * Merged semanage/seobject fix from Dan Walsh. + * Merged fixfiles -R and verify changes from Dan Walsh. + +1.30.30 2006-09-29 + * Merged newrole auditing of failures due to user actions from + Michael Thompson. + +1.30.29 2006-09-13 + * Man page corrections from Dan Walsh + * Change all python invocations to /usr/bin/python -E + * Add missing getopt flags to genhomedircon + +1.30.28 2006-09-01 + * Merged fix for restorecon // handling from Erich Schubert. + * Merged translations update and fixfiles fix from Dan Walsh. + +1.30.27 2006-08-24 + * Merged fix for restorecon symlink handling from Erich Schubert. + +1.30.26 2006-08-11 + * Merged semanage local file contexts patch from Chris PeBenito. + +1.30.25 2006-08-03 + * Merged patch from Dan Walsh with: + * audit2allow: process MAC_POLICY_LOAD events + * newrole: run shell with - prefix to start a login shell + * po: po file updates + * restorecond: bail if SELinux not enabled + * fixfiles: omit -q + * genhomedircon: fix exit code if non-root + * semodule_deps: install man page + +1.30.24 2006-08-03 + * Merged secon Makefile fix from Joshua Brindle. + +1.30.23 2006-08-03 + * Merged netfilter contexts support patch from Chris PeBenito. + +1.30.22 2006-07-28 + * Merged restorecond size_t fix from Joshua Brindle. + +1.30.21 2006-07-28 + * Merged secon keycreate patch from Michael LeMay. + +1.30.20 2006-07-26 + * Merged restorecond fixes from Dan Walsh. + Merged updated po files from Dan Walsh. + +1.30.19 2006-07-26 + * Merged python gettext patch from Stephen Bennett. + +1.30.18 2006-07-25 + * Merged semodule_deps from Karl MacMillan. + +1.30.17 2006-06-29 + * Lindent. + +1.30.16 2006-06-26 + * Merged patch from Dan Walsh with: + * -p option (progress) for setfiles and restorecon. + * disable context translation for setfiles and restorecon. + * on/off values for setsebool. + +1.30.15 2006-06-26 + * Merged setfiles and semodule_link fixes from Joshua Brindle. + +1.30.14 2006-06-16 + * Merged fix for setsebool error path from Serge Hallyn. + +1.30.13 2006-06-16 + * Merged patch from Dan Walsh with: + * Updated po files. + * Fixes for genhomedircon and seobject. + * Audit message for mass relabel by setfiles. + +1.30.12 2006-06-02 + * Updated fixfiles script for new setfiles location in /sbin. + +1.30.11 2006-05-26 + * Merged more translations from Dan Walsh. + * Merged patch to relocate setfiles to /sbin for early relabel + when /usr might not be mounted from Dan Walsh. + * Merged semanage/seobject patch to preserve fcontext ordering in list. + * Merged secon patch from James Antill. + +1.30.10 2006-05-22 + * Merged patch with updates to audit2allow, secon, genhomedircon, + and semanage from Dan Walsh. + +1.30.9 2006-05-08 + * Fixed audit2allow and po Makefiles for DESTDIR= builds. + * Merged .po file patch from Dan Walsh. + * Merged bug fix for genhomedircon. + +1.30.8 2006-05-08 + * Merged patch from Dan Walsh. + This includes audit2allow changes for analysis plugins, + internationalization support for several additional programs + and added po files, some fixes for semanage, and several cleanups. + It also adds a new secon utility. + +1.30.7 2006-05-05 + * Merged fix warnings patch from Karl MacMillan. + +1.30.6 2006-04-14 + * Merged semanage prefix support from Russell Coker. + +1.30.5 2006-04-11 + * Added a test to setfiles to check that the spec file is + a regular file. + +1.30.4 2006-03-29 + * Merged audit2allow fixes for refpolicy from Dan Walsh. + * Merged fixfiles patch from Dan Walsh. + * Merged restorecond daemon from Dan Walsh. + +1.30.3 2006-03-29 + * Merged semanage non-MLS fixes from Chris PeBenito. + +1.30.2 2006-03-29 + * Merged semanage and semodule man page examples from Thomas Bleher. + +1.30.1 2006-03-20 + * Merged semanage labeling prefix patch from Ivan Gyurdiev. + 1.30 2006-03-14 * Updated version for release. ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/Makefile#3 (text+ko) ==== @@ -1,7 +1,8 @@ -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand setsebool po +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po -all install relabel clean: +all install relabel clean indent: @for subdir in $(SUBDIRS); do \ (cd $$subdir && $(MAKE) $@) || exit 1; \ done +test: ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/VERSION#3 (text+ko) ==== @@ -1,1 +1,1 @@ -1.30 +1.34.1 ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/audit2allow/Makefile#3 (text+ko) ==== @@ -1,8 +1,11 @@ # Installation directories. PREFIX ?= ${DESTDIR}/usr BINDIR ?= $(PREFIX)/bin +LIBDIR ?= $(PREFIX)/lib MANDIR ?= $(PREFIX)/share/man LOCALEDIR ?= /usr/share/locale +PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]') +PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER) TARGETS=audit2allow @@ -13,7 +16,11 @@ install -m 755 $(TARGETS) $(BINDIR) -mkdir -p $(MANDIR)/man1 install -m 644 audit2allow.1 $(MANDIR)/man1/ + test -d $(PYTHONLIBDIR)/site-packages || install -m 755 -d $(PYTHONLIBDIR)/site-packages + install -m 755 avc.py $(PYTHONLIBDIR)/site-packages clean: +indent: + relabel: ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/audit2allow/audit2allow#3 (text+ko) ==== @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python -E # Copyright (C) 2005 Red Hat # see file 'COPYING' for use and warranty information # @@ -24,438 +24,24 @@ # 02111-1307 USA # # -import commands, sys, os, pwd, string, getopt, re, selinux - -obj="(\{[^\}]*\}|[^ \t:]*)" -allow_regexp="allow[ \t]+%s[ \t]*%s[ \t]*:[ \t]*%s[ \t]*%s" % (obj, obj, obj, obj) - -awk_script='/^[[:blank:]]*interface[[:blank:]]*\(/ {\n\ - IFACEFILE=FILENAME\n\ - IFACENAME = gensub("^[[:blank:]]*interface[[:blank:]]*\\\\(\`?","","g",$0);\n\ - IFACENAME = gensub("\'?,.*$","","g",IFACENAME);\n\ -}\n\ -\n\ -/^[[:blank:]]*allow[[:blank:]]+.*;[[:blank:]]*$/ {\n\ -\n\ - if ((length(IFACENAME) > 0) && (IFACEFILE == FILENAME)){\n\ - ALLOW = gensub("^[[:blank:]]*","","g",$0)\n\ - ALLOW = gensub(";[[:blank:]]*$","","g",$0)\n\ - print FILENAME "\\t" IFACENAME "\\t" ALLOW;\n\ - }\n\ -}\ -' - -class accessTrans: - def __init__(self): - self.dict={} - try: - fd=open("/usr/share/selinux/devel/include/support/obj_perm_sets.spt") - except IOError, error: - raise IOError("Reference policy generation requires the policy development package.\n%s" % error) - records=fd.read().split("\n") - regexp="^define *\(`([^']*)' *, *` *\{([^}]*)}'" - for r in records: - m=re.match(regexp,r) - if m!=None: - self.dict[m.groups()[0]] = m.groups()[1].split() - fd.close() - def get(self, var): - l=[] - for v in var: - if v in self.dict.keys(): - l += self.dict[v] - else: - if v not in ("{", "}"): - l.append(v) - return l - -class interfaces: - def __init__(self): - self.dict={} - trans=accessTrans() - (input, output) = os.popen2("awk -f - /usr/share/selinux/devel/include/*/*.if 2> /dev/null") - input.write(awk_script) - input.close() - records=output.read().split("\n") - input.close() - if len(records) > 0: - regexp="([^ \t]*)[ \t]+([^ \t]*)[ \t]+%s" % allow_regexp - for r in records: - m=re.match(regexp,r) - if m==None: - continue - else: - val=m.groups() - file=os.path.basename(val[0]).split(".")[0] - iface=val[1] - Scon=val[2].split() - Tcon=val[3].split() - Class=val[4].split() - Access=trans.get(val[5].split()) - for s in Scon: - for t in Tcon: - for c in Class: - if (s, t, c) not in self.dict.keys(): - self.dict[(s, t, c)]=[] - self.dict[(s, t, c)].append((Access, file, iface)) - def out(self): - keys=self.dict.keys() - keys.sort() - for k in keys: - print k - for i in self.dict[k]: - print "\t", i - - def match(self, Scon, Tcon, Class, Access): - keys=self.dict.keys() - ret=[] - if (Scon, Tcon, Class) in keys: - for i in self.dict[(Scon, Tcon, Class)]: - if Access in i[0]: - if i[2].find(Access) >= 0: - ret.insert(0, i) - else: - ret.append(i) - return ret - if ("$1", Tcon, Class) in keys: - for i in self.dict[("$1", Tcon, Class)]: - if Access in i[0]: - if i[2].find(Access) >= 0: - ret.insert(0, i) - else: - ret.append(i) - return ret - if (Scon, "$1", Class) in keys: - for i in self.dict[(Scon, "$1", Class)]: - if Access in i[0]: - if i[2].find(Access) >= 0: - ret.insert(0, i) - else: - ret.append(i) - return ret - else: - return ret - - -class serule: - def __init__(self, type, source, target, seclass): - self.type=type - self.source=source - self.target=target - self.seclass=seclass - self.avcinfo={} - self.iface=None - - def add(self, avc): - for a in avc[0]: - if a not in self.avcinfo.keys(): - self.avcinfo[a]=[] - - self.avcinfo[a].append(avc[1:]) - - def getAccess(self): - if len(self.avcinfo.keys()) == 1: - for i in self.avcinfo.keys(): - return i - else: - keys=self.avcinfo.keys() - keys.sort() - ret="{" - for i in keys: - ret=ret + " " + i - ret=ret+" }" - return ret - def out(self, verbose=0): - ret="" - ret=ret+"%s %s %s:%s %s;" % (self.type, self.source, self.gettarget(), self.seclass, self.getAccess()) - if verbose: - keys=self.avcinfo.keys() - keys.sort() - for i in keys: - for x in self.avcinfo[i]: - ret=ret+"\n\t#TYPE=AVC MSG=%s " % x[0] - if len(x[1]): - ret=ret+"COMM=%s " % x[1] - if len(x[2]): - ret=ret+"NAME=%s " % x[2] - ret=ret + " : " + i - return ret - - def gen_reference_policy(self, iface): - ret="" - Scon=self.source - Tcon=self.gettarget() - Class=self.seclass - Access=self.getAccess() - m=iface.match(Scon,Tcon,Class,Access) - if len(m)==0: - return self.out() - else: - file=m[0][1] - ret="\n#%s\n"% self.out() - ret += "optional_policy(`%s', `\n" % m[0][1] - first=True - for i in m: - if file != i[1]: - ret += "')\ngen_require(`%s', `\n" % i[1] - file = i[1] - first=True - if first: - ret += "\t%s(%s)\n" % (i[2], Scon) - first=False - else: - ret += "#\t%s(%s)\n" % (i[2], Scon) - ret += "');" - return ret - - def gettarget(self): - if self.source == self.target: - return "self" - else: - return self.target - -class seruleRecords: - def __init__(self, input, last_reload=0, verbose=0, te_ind=0): - self.last_reload=last_reload - self.seRules={} - self.seclasses={} - self.types=[] - self.roles=[] - self.load(input, te_ind) - self.gen_ref_policy = False - - def gen_reference_policy(self): - self.gen_ref_policy = True - self.iface=interfaces() - - def warning(self, error): - sys.stderr.write("%s: " % sys.argv[0]) - sys.stderr.write("%s\n" % error) - sys.stderr.flush() - - def load(self, input, te_ind=0): - VALID_CMDS=("allow", "dontaudit", "auditallow", "role") - - avc=[] - found=0 - line = input.readline() - if te_ind: - while line: - rec=line.split() - if len(rec) and rec[0] in VALID_CMDS: - self.add_terule(line) - line = input.readline() - - else: - while line: - rec=line.split() - for i in rec: - if i=="avc:" or i=="message=avc:" or i=="msg='avc:": - - found=1 - else: - avc.append(i) - if found: - self.add(avc) - found=0 - avc=[] - line = input.readline() - - - def get_target(self, i, rule): - target=[] - if rule[i][0] == "{": - for t in rule[i].split("{"): - if len(t): - target.append(t) - i=i+1 - for s in rule[i:]: - if s.find("}") >= 0: - for s1 in s.split("}"): - if len(s1): - target.append(s1) - i=i+1 - return (i, target) +from avc import * - target.append(s) - i=i+1 - else: - if rule[i].find(";") >= 0: - for s1 in rule[i].split(";"): - if len(s1): - target.append(s1) - else: - target.append(rule[i]) - - i=i+1 - return (i, target) - - def rules_split(self, rules): - (idx, target ) = self.get_target(0, rules) - (idx, subject) = self.get_target(idx, rules) - return (target, subject) - - def add_terule(self, rule): - rc = rule.split(":") - rules=rc[0].split() - type=rules[0] - if type == "role": - print type - (sources, targets) = self.rules_split(rules[1:]) - rules=rc[1].split() - (seclasses, access) = self.rules_split(rules) - for scon in sources: - for tcon in targets: - for seclass in seclasses: - self.add_rule(type, scon, tcon, seclass,access) - - def add_rule(self, rule_type, scon, tcon, seclass, access, msg="", comm="", name=""): - self.add_seclass(seclass, access) - self.add_type(tcon) - self.add_type(scon) - if (rule_type, scon, tcon, seclass) not in self.seRules.keys(): - self.seRules[(rule_type, scon, tcon, seclass)]=serule(rule_type, scon, tcon, seclass) - - self.seRules[(rule_type, scon, tcon, seclass)].add((access, msg, comm, name )) - - def add(self,avc): - scon="" - tcon="" - seclass="" - comm="" - name="" - msg="" - access=[] - if "security_compute_sid" in avc: - return - - if "load_policy" in avc and self.last_reload: - self.seRules={} - - if "granted" in avc: - return - try: - for i in range (0, len(avc)): - if avc[i]=="{": - i=i+1 - while i 0: - for i in self.roles: - rec += "\trole %s; \n" % i - rec += "\n" - - for i in keys: - access=self.seclasses[i] - if len(access) > 1: - access.sort() - rec += "\tclass %s {" % i - for a in access: - rec += " %s" % a - rec += " }; \n" - else: - rec += "\tclass %s %s;\n" % (i, access[0]) - - rec += "\n" - - for i in self.types: - rec += "\ttype %s; \n" % i - rec += " };\n\n\n" - return rec - - def out(self, require=0, module=""): - rec="" - if len(self.seRules.keys())==0: - raise(ValueError("No AVC messages found.")) - if module != "": - rec += self.gen_module(module) - rec += self.gen_requires() - else: - if requires: - rec+=self.gen_requires() - - keys=self.seRules.keys() - keys.sort() - for i in keys: - if self.gen_ref_policy: - rec += self.seRules[i].gen_reference_policy(self.iface)+"\n" - else: - rec += self.seRules[i].out(verbose)+"\n" - return rec - if __name__ == '__main__': - + import commands, sys, os, getopt, selinux + import gettext + import re + try: + gettext.install('policycoreutils') + except: + pass def get_mls_flag(): if selinux.is_selinux_mls_enabled(): return "-M" else: return "" - def usage(msg=""): - print 'audit2allow [-adhilrv] [-t file ] [ -f fcfile ] [-i ] [[-m|-M] ] [-o ]\n\ + def usage(msg = ""): + print _('audit2allow [-adhilrv] [-t file ] [ -f fcfile ] [-i ] [[-m|-M] ] [-o ]\n\ -a, --all read input from audit and message log, conflicts with -i\n\ -d, --dmesg read input from output of /bin/dmesg\n\ -h, --help display this message\n\ @@ -465,14 +51,20 @@ -M generate loadable module package, conflicts with -o\n\ -o, --output append output to , conflicts with -M\n\ -r, --requires generate require output \n\ - -t, --tefile Indicates input is Existing Type Enforcement file\n\ + -t, --tefile Add input from Existing Type Enforcement file\n\ -f, --fcfile Existing Type Enforcement file, requires -M\n\ -v, --verbose verbose output\n\ - ' + -A, --analyze Analyze output\n\ + ') if msg != "": print msg sys.exit(1) + def verify_module(module): + m = re.findall("[^a-zA-Z0-9]", module) + if len(m) != 0: + usage(_("Alphanumeric Charaters Only")) + def errorExit(error): sys.stderr.write("%s: " % sys.argv[0]) sys.stderr.write("%s\n" % error) @@ -483,24 +75,26 @@ # # try: - last_reload=0 - input=sys.stdin - output=sys.stdout - module="" - requires=0 - verbose=0 - auditlogs=0 - buildPP=0 - input_ind=0 - output_ind=0 - ref_ind=False - te_ind=0 + last_reload = 0 + inputfd = sys.stdin + output = sys.stdout + module = "" + requires = 0 + verbose = 0 + auditlogs = 0 + buildPP = 0 + input_ind = 0 + output_ind = 0 + ref_ind = False + analyze = False + te_inputs = [] - fc_file="" + fc_file = "" gopts, cmds = getopt.getopt(sys.argv[1:], - 'adf:hi:lm:M:o:rtvR', + 'Aadf:hi:lm:M:o:rt:vR', ['all', - 'dmesg', + 'analyze', + 'dmesg', 'fcfile=', 'help', 'input=', @@ -509,57 +103,63 @@ 'output=', 'requires', 'reference', - 'tefile', + 'tefile=', 'verbose' ]) for o,a in gopts: if o == "-a" or o == "--all": - if input_ind or te_ind: + if input_ind: usage() - input=open("/var/log/messages", "r") - auditlogs=1 + inputfd = open("/var/log/messages", "r") + auditlogs = 1 if o == "-d" or o == "--dmesg": - input=os.popen("/bin/dmesg", "r") + inputfd = os.popen("/bin/dmesg", "r") if o == "-f" or o == "--fcfile": - if a[0]=="-": + if a[0] == "-": usage() - fc_file=a + fc_file = a if o == "-h" or o == "--help": usage() if o == "-i"or o == "--input": - if auditlogs or a[0]=="-": + if auditlogs or a[0] == "-": usage() - input_ind=1 - input=open(a, "r") + input_ind = 1 + inputfd = open(a, "r") if o == '--lastreload' or o == "-l": - last_reload=1 + last_reload = 1 if o == "-m" or o == "--module": - if module != "" or a[0]=="-": + if module != "" or a[0] == "-": usage() - module=a + module = a + verify_module(module) if o == "-M": - if module != "" or output_ind or a[0]=="-": + if module != "" or output_ind or a[0] == "-": usage() - module=a - outfile=a+".te" - buildPP=1 - output=open(outfile, "w") + module = a + verify_module(module) + outfile = a+".te" + buildPP = 1 + if not os.path.exists("/usr/bin/checkmodule"): + errorExit("-M Requires the checkmodule command, you need to install the checkpolicy rpm package") + output = open(outfile, "w") if o == "-r" or o == "--requires": - requires=1 + requires = 1 if o == "-t" or o == "--tefile": - if auditlogs: >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Feb 15 20:20:00 2007 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 38E9C16A407; Thu, 15 Feb 2007 20:20:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DA3D916A46B for ; Thu, 15 Feb 2007 20:19:59 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C4A1713C4A5 for ; Thu, 15 Feb 2007 20:19:59 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1FKJvR3070243 for ; Thu, 15 Feb 2007 20:19:57 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1FKJvKM070240 for perforce@freebsd.org; Thu, 15 Feb 2007 20:19:57 GMT (envelope-from millert@freebsd.org) Date: Thu, 15 Feb 2007 20:19:57 GMT Message-Id: <200702152019.l1FKJvKM070240@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 114578 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, 15 Feb 2007 20:20:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=114578 Change 114578 by millert@millert_p4 on 2007/02/15 20:19:45 Tweak to build with new checkpolicy. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/booleans.conf#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/devd.te#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/usbd.te#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/modutils.if#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/modutils.te#2 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/booleans.conf#2 (text+ko) ==== @@ -8,7 +8,7 @@ # # Disable transitions to insmod. # -secure_mode_insmod = false +secure_mode_insmod = true # # boolean to determine whether the system permits loading policy, setting ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/devd.te#2 (text+ko) ==== @@ -10,8 +10,6 @@ # kernel_domtrans_to(devd_t, devd_exec_t) init_daemon_domain(devd_t, devd_exec_t) -type_transition initrc_t devd_exec_t:process devd_t; - type devd_etc_t; files_config_file(devd_etc_t) ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/usbd.te#2 (text+ko) ==== @@ -10,8 +10,6 @@ #kernel_domtrans_to(usbd_t, usbd_exec_t) init_daemon_domain(usbd_t, usbd_exec_t) -type_transition initrc_t usbd_exec_t:process usbd_t; - type usbd_etc_t; files_config_file(usbd_etc_t) ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/modutils.if#2 (text+ko) ==== @@ -85,7 +85,7 @@ allow $1 insmod_t:fd use; allow insmod_t $1:fd use; allow insmod_t $1:fifo_file rw_file_perms; - allow insmod_t $1:process sigchld; + #allow insmod_t $1:process sigchld; ') ######################################## @@ -103,9 +103,9 @@ bool secure_mode_insmod; ') - if (!secure_mode_insmod) { - modutils_domtrans_insmod_uncond($1) - } +# if (!secure_mode_insmod) { +# modutils_domtrans_insmod_uncond($1) +# } ') ######################################## @@ -175,7 +175,7 @@ allow $1 depmod_t:fd use; allow depmod_t $1:fd use; allow depmod_t $1:fifo_file rw_file_perms; - allow depmod_t $1:process sigchld; + #allow depmod_t $1:process sigchld; ') ######################################## @@ -242,7 +242,7 @@ allow $1 update_modules_t:fd use; allow update_modules_t $1:fd use; allow update_modules_t $1:fifo_file rw_file_perms; - allow update_modules_t $1:process sigchld; + #allow update_modules_t $1:process sigchld; ') ######################################## ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/modutils.te#2 (text+ko) ==== @@ -20,7 +20,6 @@ type insmod_t; type insmod_exec_t; -init_system_domain(insmod_t,insmod_exec_t) mls_file_write_down(insmod_t) role system_r types insmod_t; @@ -43,7 +42,7 @@ # allow insmod_t self:capability { dac_override net_raw sys_tty_config }; -allow insmod_t self:process { execmem sigchld sigkill sigstop signull signal }; +#allow insmod_t self:process { execmem sigchld sigkill sigstop signull signal }; allow insmod_t self:udp_socket create_socket_perms; allow insmod_t self:rawip_socket create_socket_perms; @@ -88,7 +87,7 @@ corecmd_exec_sbin(insmod_t) corecmd_exec_shell(insmod_t) -domain_signal_all_domains(insmod_t) +#domain_signal_all_domains(insmod_t) domain_use_interactive_fds(insmod_t) files_read_etc_runtime_files(insmod_t) @@ -115,25 +114,25 @@ seutil_read_file_contexts(insmod_t) -if( ! secure_mode_insmod ) { - kernel_domtrans_to(insmod_t,insmod_exec_t) -} +#if( ! secure_mode_insmod ) { +# kernel_domtrans_to(insmod_t,insmod_exec_t) +#} ifdef(`hide_broken_symptoms',` dev_dontaudit_rw_cardmgr(insmod_t) ') -ifdef(`targeted_policy',` - unconfined_domain(insmod_t) -') +#ifdef(`targeted_policy',` +# unconfined_domain(insmod_t) +#') optional_policy(`hotplug',` hotplug_search_config(insmod_t) ') -optional_policy(`mount',` - mount_domtrans(insmod_t) -') +#optional_policy(`mount',` +# mount_domtrans(insmod_t) +#') optional_policy(`nis',` nis_use_ypbind(insmod_t) @@ -236,7 +235,7 @@ allow update_modules_t depmod_t:fd use; allow depmod_t update_modules_t:fd use; allow depmod_t update_modules_t:fifo_file rw_file_perms; -allow depmod_t update_modules_t:process sigchld; +#allow depmod_t update_modules_t:process sigchld; allow update_modules_t update_modules_tmp_t:dir create_dir_perms; allow update_modules_t update_modules_tmp_t:file create_file_perms; From owner-p4-projects@FreeBSD.ORG Thu Feb 15 20:21:00 2007 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 36B1916A401; Thu, 15 Feb 2007 20:21:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0C9B416A406 for ; Thu, 15 Feb 2007 20:21:00 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D8E0713C4A5 for ; Thu, 15 Feb 2007 20:20:59 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1FKKxeV071091 for ; Thu, 15 Feb 2007 20:20:59 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1FKKxbj071079 for perforce@freebsd.org; Thu, 15 Feb 2007 20:20:59 GMT (envelope-from millert@freebsd.org) Date: Thu, 15 Feb 2007 20:20:59 GMT Message-Id: <200702152020.l1FKKxbj071079@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 114579 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, 15 Feb 2007 20:21:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=114579 Change 114579 by millert@millert_p4 on 2007/02/15 20:20:06 Remove old policy.conf. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/support/policy.conf#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Feb 15 20:24:04 2007 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 9A93516A408; Thu, 15 Feb 2007 20:24:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4E01716A400 for ; Thu, 15 Feb 2007 20:24:04 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3DD6A13C478 for ; Thu, 15 Feb 2007 20:24:04 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1FKO4oU073206 for ; Thu, 15 Feb 2007 20:24:04 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1FKO3E1073203 for perforce@freebsd.org; Thu, 15 Feb 2007 20:24:03 GMT (envelope-from millert@freebsd.org) Date: Thu, 15 Feb 2007 20:24:03 GMT Message-Id: <200702152024.l1FKO3E1073203@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 114580 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, 15 Feb 2007 20:24:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=114580 Change 114580 by millert@millert_p4 on 2007/02/15 20:23:55 Regen flask headers from refpolicy. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/av_inherit.h#6 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/av_perm_to_string.h#9 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/av_permissions.h#10 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/class_to_string.h#7 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/common_perm_to_string.h#6 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/flask.h#8 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/av_inherit.h#6 (text+ko) ==== @@ -1,11 +1,11 @@ /* This file is automatically generated. Do not edit. */ - S_(SECCLASS_DIR, file, 0x00100000UL) - S_(SECCLASS_FILE, file, 0x00100000UL) - S_(SECCLASS_LNK_FILE, file, 0x00100000UL) - S_(SECCLASS_CHR_FILE, file, 0x00100000UL) - S_(SECCLASS_BLK_FILE, file, 0x00100000UL) - S_(SECCLASS_SOCK_FILE, file, 0x00100000UL) - S_(SECCLASS_FIFO_FILE, file, 0x00100000UL) + S_(SECCLASS_DIR, file, 0x00020000UL) + S_(SECCLASS_FILE, file, 0x00020000UL) + S_(SECCLASS_LNK_FILE, file, 0x00020000UL) + S_(SECCLASS_CHR_FILE, file, 0x00020000UL) + S_(SECCLASS_BLK_FILE, file, 0x00020000UL) + S_(SECCLASS_SOCK_FILE, file, 0x00020000UL) + S_(SECCLASS_FIFO_FILE, file, 0x00020000UL) S_(SECCLASS_SOCKET, socket, 0x00400000UL) S_(SECCLASS_TCP_SOCKET, socket, 0x00400000UL) S_(SECCLASS_UDP_SOCKET, socket, 0x00400000UL) ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/av_perm_to_string.h#9 (text+ko) ==== @@ -20,7 +20,6 @@ S_(SECCLASS_CHR_FILE, CHR_FILE__EXECUTE_NO_TRANS, "execute_no_trans") S_(SECCLASS_CHR_FILE, CHR_FILE__ENTRYPOINT, "entrypoint") S_(SECCLASS_CHR_FILE, CHR_FILE__EXECMOD, "execmod") - S_(SECCLASS_FD, FD__CREATE, "create") S_(SECCLASS_FD, FD__USE, "use") S_(SECCLASS_TCP_SOCKET, TCP_SOCKET__CONNECTTO, "connectto") S_(SECCLASS_TCP_SOCKET, TCP_SOCKET__NEWCONN, "newconn") @@ -76,13 +75,7 @@ S_(SECCLASS_MSGQ, MSGQ__ENQUEUE, "enqueue") S_(SECCLASS_MSG, MSG__SEND, "send") S_(SECCLASS_MSG, MSG__RECEIVE, "receive") - S_(SECCLASS_MSG, MSG__DESTROY, "destroy") S_(SECCLASS_SHM, SHM__LOCK, "lock") - S_(SECCLASS_POSIX_SEM, POSIX_SEM__ASSOCIATE, "associate") - S_(SECCLASS_POSIX_SEM, POSIX_SEM__DISASSOCIATE, "disassociate") - S_(SECCLASS_POSIX_SEM, POSIX_SEM__DESTROY, "destroy") - S_(SECCLASS_POSIX_SEM, POSIX_SEM__WRITE, "write") - S_(SECCLASS_POSIX_SEM, POSIX_SEM__READ, "read") S_(SECCLASS_SECURITY, SECURITY__COMPUTE_AV, "compute_av") S_(SECCLASS_SECURITY, SECURITY__COMPUTE_CREATE, "compute_create") S_(SECCLASS_SECURITY, SECURITY__COMPUTE_MEMBER, "compute_member") ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/av_permissions.h#10 (text+ko) ==== @@ -1,24 +1,21 @@ /* This file is automatically generated. Do not edit. */ -#define COMMON_FILE__POLL 0x00000001UL -#define COMMON_FILE__IOCTL 0x00000002UL -#define COMMON_FILE__READ 0x00000004UL -#define COMMON_FILE__WRITE 0x00000008UL -#define COMMON_FILE__CREATE 0x00000010UL -#define COMMON_FILE__GETATTR 0x00000020UL -#define COMMON_FILE__SETATTR 0x00000040UL -#define COMMON_FILE__LOCK 0x00000080UL -#define COMMON_FILE__RELABELFROM 0x00000100UL -#define COMMON_FILE__RELABELTO 0x00000200UL -#define COMMON_FILE__TRANSITION 0x00000400UL -#define COMMON_FILE__APPEND 0x00000800UL -#define COMMON_FILE__ACCESS 0x00001000UL -#define COMMON_FILE__UNLINK 0x00002000UL -#define COMMON_FILE__LINK 0x00004000UL -#define COMMON_FILE__RENAME 0x00008000UL -#define COMMON_FILE__EXECUTE 0x00010000UL -#define COMMON_FILE__SWAPON 0x00020000UL -#define COMMON_FILE__QUOTAON 0x00040000UL -#define COMMON_FILE__MOUNTON 0x00080000UL +#define COMMON_FILE__IOCTL 0x00000001UL +#define COMMON_FILE__READ 0x00000002UL +#define COMMON_FILE__WRITE 0x00000004UL +#define COMMON_FILE__CREATE 0x00000008UL +#define COMMON_FILE__GETATTR 0x00000010UL +#define COMMON_FILE__SETATTR 0x00000020UL +#define COMMON_FILE__LOCK 0x00000040UL +#define COMMON_FILE__RELABELFROM 0x00000080UL +#define COMMON_FILE__RELABELTO 0x00000100UL +#define COMMON_FILE__APPEND 0x00000200UL +#define COMMON_FILE__UNLINK 0x00000400UL +#define COMMON_FILE__LINK 0x00000800UL +#define COMMON_FILE__RENAME 0x00001000UL +#define COMMON_FILE__EXECUTE 0x00002000UL +#define COMMON_FILE__SWAPON 0x00004000UL +#define COMMON_FILE__QUOTAON 0x00008000UL +#define COMMON_FILE__MOUNTON 0x00010000UL #define COMMON_SOCKET__IOCTL 0x00000001UL #define COMMON_SOCKET__READ 0x00000002UL @@ -64,169 +61,147 @@ #define FILESYSTEM__QUOTAMOD 0x00000100UL #define FILESYSTEM__QUOTAGET 0x00000200UL -#define DIR__POLL 0x00000001UL -#define DIR__IOCTL 0x00000002UL -#define DIR__READ 0x00000004UL -#define DIR__WRITE 0x00000008UL -#define DIR__CREATE 0x00000010UL -#define DIR__GETATTR 0x00000020UL -#define DIR__SETATTR 0x00000040UL -#define DIR__LOCK 0x00000080UL -#define DIR__RELABELFROM 0x00000100UL -#define DIR__RELABELTO 0x00000200UL -#define DIR__TRANSITION 0x00000400UL -#define DIR__APPEND 0x00000800UL -#define DIR__ACCESS 0x00001000UL -#define DIR__UNLINK 0x00002000UL -#define DIR__LINK 0x00004000UL -#define DIR__RENAME 0x00008000UL -#define DIR__EXECUTE 0x00010000UL -#define DIR__SWAPON 0x00020000UL -#define DIR__QUOTAON 0x00040000UL -#define DIR__MOUNTON 0x00080000UL +#define DIR__IOCTL 0x00000001UL +#define DIR__READ 0x00000002UL +#define DIR__WRITE 0x00000004UL +#define DIR__CREATE 0x00000008UL +#define DIR__GETATTR 0x00000010UL +#define DIR__SETATTR 0x00000020UL +#define DIR__LOCK 0x00000040UL +#define DIR__RELABELFROM 0x00000080UL +#define DIR__RELABELTO 0x00000100UL +#define DIR__APPEND 0x00000200UL +#define DIR__UNLINK 0x00000400UL +#define DIR__LINK 0x00000800UL +#define DIR__RENAME 0x00001000UL +#define DIR__EXECUTE 0x00002000UL +#define DIR__SWAPON 0x00004000UL +#define DIR__QUOTAON 0x00008000UL +#define DIR__MOUNTON 0x00010000UL -#define DIR__ADD_NAME 0x00100000UL -#define DIR__REMOVE_NAME 0x00200000UL -#define DIR__REPARENT 0x00400000UL -#define DIR__SEARCH 0x00800000UL -#define DIR__RMDIR 0x01000000UL +#define DIR__ADD_NAME 0x00020000UL +#define DIR__REMOVE_NAME 0x00040000UL +#define DIR__REPARENT 0x00080000UL +#define DIR__SEARCH 0x00100000UL +#define DIR__RMDIR 0x00200000UL -#define FILE__POLL 0x00000001UL -#define FILE__IOCTL 0x00000002UL -#define FILE__READ 0x00000004UL -#define FILE__WRITE 0x00000008UL -#define FILE__CREATE 0x00000010UL -#define FILE__GETATTR 0x00000020UL -#define FILE__SETATTR 0x00000040UL -#define FILE__LOCK 0x00000080UL -#define FILE__RELABELFROM 0x00000100UL -#define FILE__RELABELTO 0x00000200UL -#define FILE__TRANSITION 0x00000400UL -#define FILE__APPEND 0x00000800UL -#define FILE__ACCESS 0x00001000UL -#define FILE__UNLINK 0x00002000UL -#define FILE__LINK 0x00004000UL -#define FILE__RENAME 0x00008000UL -#define FILE__EXECUTE 0x00010000UL -#define FILE__SWAPON 0x00020000UL -#define FILE__QUOTAON 0x00040000UL -#define FILE__MOUNTON 0x00080000UL +#define FILE__IOCTL 0x00000001UL +#define FILE__READ 0x00000002UL +#define FILE__WRITE 0x00000004UL +#define FILE__CREATE 0x00000008UL +#define FILE__GETATTR 0x00000010UL +#define FILE__SETATTR 0x00000020UL +#define FILE__LOCK 0x00000040UL +#define FILE__RELABELFROM 0x00000080UL +#define FILE__RELABELTO 0x00000100UL +#define FILE__APPEND 0x00000200UL +#define FILE__UNLINK 0x00000400UL +#define FILE__LINK 0x00000800UL +#define FILE__RENAME 0x00001000UL +#define FILE__EXECUTE 0x00002000UL +#define FILE__SWAPON 0x00004000UL +#define FILE__QUOTAON 0x00008000UL +#define FILE__MOUNTON 0x00010000UL -#define FILE__EXECUTE_NO_TRANS 0x00100000UL -#define FILE__ENTRYPOINT 0x00200000UL -#define FILE__EXECMOD 0x00400000UL +#define FILE__EXECUTE_NO_TRANS 0x00020000UL +#define FILE__ENTRYPOINT 0x00040000UL +#define FILE__EXECMOD 0x00080000UL -#define LNK_FILE__POLL 0x00000001UL -#define LNK_FILE__IOCTL 0x00000002UL -#define LNK_FILE__READ 0x00000004UL -#define LNK_FILE__WRITE 0x00000008UL -#define LNK_FILE__CREATE 0x00000010UL -#define LNK_FILE__GETATTR 0x00000020UL -#define LNK_FILE__SETATTR 0x00000040UL -#define LNK_FILE__LOCK 0x00000080UL -#define LNK_FILE__RELABELFROM 0x00000100UL -#define LNK_FILE__RELABELTO 0x00000200UL -#define LNK_FILE__TRANSITION 0x00000400UL -#define LNK_FILE__APPEND 0x00000800UL -#define LNK_FILE__ACCESS 0x00001000UL -#define LNK_FILE__UNLINK 0x00002000UL -#define LNK_FILE__LINK 0x00004000UL -#define LNK_FILE__RENAME 0x00008000UL -#define LNK_FILE__EXECUTE 0x00010000UL -#define LNK_FILE__SWAPON 0x00020000UL -#define LNK_FILE__QUOTAON 0x00040000UL -#define LNK_FILE__MOUNTON 0x00080000UL +#define LNK_FILE__IOCTL 0x00000001UL +#define LNK_FILE__READ 0x00000002UL +#define LNK_FILE__WRITE 0x00000004UL +#define LNK_FILE__CREATE 0x00000008UL +#define LNK_FILE__GETATTR 0x00000010UL +#define LNK_FILE__SETATTR 0x00000020UL +#define LNK_FILE__LOCK 0x00000040UL +#define LNK_FILE__RELABELFROM 0x00000080UL +#define LNK_FILE__RELABELTO 0x00000100UL +#define LNK_FILE__APPEND 0x00000200UL +#define LNK_FILE__UNLINK 0x00000400UL +#define LNK_FILE__LINK 0x00000800UL +#define LNK_FILE__RENAME 0x00001000UL +#define LNK_FILE__EXECUTE 0x00002000UL +#define LNK_FILE__SWAPON 0x00004000UL +#define LNK_FILE__QUOTAON 0x00008000UL +#define LNK_FILE__MOUNTON 0x00010000UL -#define CHR_FILE__POLL 0x00000001UL -#define CHR_FILE__IOCTL 0x00000002UL -#define CHR_FILE__READ 0x00000004UL -#define CHR_FILE__WRITE 0x00000008UL -#define CHR_FILE__CREATE 0x00000010UL -#define CHR_FILE__GETATTR 0x00000020UL -#define CHR_FILE__SETATTR 0x00000040UL -#define CHR_FILE__LOCK 0x00000080UL -#define CHR_FILE__RELABELFROM 0x00000100UL -#define CHR_FILE__RELABELTO 0x00000200UL -#define CHR_FILE__TRANSITION 0x00000400UL -#define CHR_FILE__APPEND 0x00000800UL -#define CHR_FILE__ACCESS 0x00001000UL -#define CHR_FILE__UNLINK 0x00002000UL -#define CHR_FILE__LINK 0x00004000UL -#define CHR_FILE__RENAME 0x00008000UL -#define CHR_FILE__EXECUTE 0x00010000UL -#define CHR_FILE__SWAPON 0x00020000UL -#define CHR_FILE__QUOTAON 0x00040000UL -#define CHR_FILE__MOUNTON 0x00080000UL +#define CHR_FILE__IOCTL 0x00000001UL +#define CHR_FILE__READ 0x00000002UL +#define CHR_FILE__WRITE 0x00000004UL +#define CHR_FILE__CREATE 0x00000008UL +#define CHR_FILE__GETATTR 0x00000010UL +#define CHR_FILE__SETATTR 0x00000020UL +#define CHR_FILE__LOCK 0x00000040UL +#define CHR_FILE__RELABELFROM 0x00000080UL +#define CHR_FILE__RELABELTO 0x00000100UL +#define CHR_FILE__APPEND 0x00000200UL +#define CHR_FILE__UNLINK 0x00000400UL +#define CHR_FILE__LINK 0x00000800UL +#define CHR_FILE__RENAME 0x00001000UL +#define CHR_FILE__EXECUTE 0x00002000UL +#define CHR_FILE__SWAPON 0x00004000UL +#define CHR_FILE__QUOTAON 0x00008000UL +#define CHR_FILE__MOUNTON 0x00010000UL -#define CHR_FILE__EXECUTE_NO_TRANS 0x00100000UL -#define CHR_FILE__ENTRYPOINT 0x00200000UL -#define CHR_FILE__EXECMOD 0x00400000UL +#define CHR_FILE__EXECUTE_NO_TRANS 0x00020000UL +#define CHR_FILE__ENTRYPOINT 0x00040000UL +#define CHR_FILE__EXECMOD 0x00080000UL -#define BLK_FILE__POLL 0x00000001UL -#define BLK_FILE__IOCTL 0x00000002UL -#define BLK_FILE__READ 0x00000004UL -#define BLK_FILE__WRITE 0x00000008UL -#define BLK_FILE__CREATE 0x00000010UL -#define BLK_FILE__GETATTR 0x00000020UL -#define BLK_FILE__SETATTR 0x00000040UL -#define BLK_FILE__LOCK 0x00000080UL -#define BLK_FILE__RELABELFROM 0x00000100UL -#define BLK_FILE__RELABELTO 0x00000200UL -#define BLK_FILE__TRANSITION 0x00000400UL -#define BLK_FILE__APPEND 0x00000800UL -#define BLK_FILE__ACCESS 0x00001000UL -#define BLK_FILE__UNLINK 0x00002000UL -#define BLK_FILE__LINK 0x00004000UL -#define BLK_FILE__RENAME 0x00008000UL -#define BLK_FILE__EXECUTE 0x00010000UL -#define BLK_FILE__SWAPON 0x00020000UL -#define BLK_FILE__QUOTAON 0x00040000UL -#define BLK_FILE__MOUNTON 0x00080000UL +#define BLK_FILE__IOCTL 0x00000001UL +#define BLK_FILE__READ 0x00000002UL +#define BLK_FILE__WRITE 0x00000004UL +#define BLK_FILE__CREATE 0x00000008UL +#define BLK_FILE__GETATTR 0x00000010UL +#define BLK_FILE__SETATTR 0x00000020UL +#define BLK_FILE__LOCK 0x00000040UL +#define BLK_FILE__RELABELFROM 0x00000080UL +#define BLK_FILE__RELABELTO 0x00000100UL +#define BLK_FILE__APPEND 0x00000200UL +#define BLK_FILE__UNLINK 0x00000400UL +#define BLK_FILE__LINK 0x00000800UL +#define BLK_FILE__RENAME 0x00001000UL +#define BLK_FILE__EXECUTE 0x00002000UL +#define BLK_FILE__SWAPON 0x00004000UL +#define BLK_FILE__QUOTAON 0x00008000UL +#define BLK_FILE__MOUNTON 0x00010000UL -#define SOCK_FILE__POLL 0x00000001UL -#define SOCK_FILE__IOCTL 0x00000002UL -#define SOCK_FILE__READ 0x00000004UL -#define SOCK_FILE__WRITE 0x00000008UL -#define SOCK_FILE__CREATE 0x00000010UL -#define SOCK_FILE__GETATTR 0x00000020UL -#define SOCK_FILE__SETATTR 0x00000040UL -#define SOCK_FILE__LOCK 0x00000080UL -#define SOCK_FILE__RELABELFROM 0x00000100UL -#define SOCK_FILE__RELABELTO 0x00000200UL -#define SOCK_FILE__TRANSITION 0x00000400UL -#define SOCK_FILE__APPEND 0x00000800UL -#define SOCK_FILE__ACCESS 0x00001000UL -#define SOCK_FILE__UNLINK 0x00002000UL -#define SOCK_FILE__LINK 0x00004000UL -#define SOCK_FILE__RENAME 0x00008000UL -#define SOCK_FILE__EXECUTE 0x00010000UL -#define SOCK_FILE__SWAPON 0x00020000UL -#define SOCK_FILE__QUOTAON 0x00040000UL -#define SOCK_FILE__MOUNTON 0x00080000UL +#define SOCK_FILE__IOCTL 0x00000001UL +#define SOCK_FILE__READ 0x00000002UL +#define SOCK_FILE__WRITE 0x00000004UL +#define SOCK_FILE__CREATE 0x00000008UL +#define SOCK_FILE__GETATTR 0x00000010UL +#define SOCK_FILE__SETATTR 0x00000020UL +#define SOCK_FILE__LOCK 0x00000040UL +#define SOCK_FILE__RELABELFROM 0x00000080UL +#define SOCK_FILE__RELABELTO 0x00000100UL +#define SOCK_FILE__APPEND 0x00000200UL +#define SOCK_FILE__UNLINK 0x00000400UL +#define SOCK_FILE__LINK 0x00000800UL +#define SOCK_FILE__RENAME 0x00001000UL +#define SOCK_FILE__EXECUTE 0x00002000UL +#define SOCK_FILE__SWAPON 0x00004000UL +#define SOCK_FILE__QUOTAON 0x00008000UL +#define SOCK_FILE__MOUNTON 0x00010000UL -#define FIFO_FILE__POLL 0x00000001UL -#define FIFO_FILE__IOCTL 0x00000002UL -#define FIFO_FILE__READ 0x00000004UL -#define FIFO_FILE__WRITE 0x00000008UL -#define FIFO_FILE__CREATE 0x00000010UL -#define FIFO_FILE__GETATTR 0x00000020UL -#define FIFO_FILE__SETATTR 0x00000040UL -#define FIFO_FILE__LOCK 0x00000080UL -#define FIFO_FILE__RELABELFROM 0x00000100UL -#define FIFO_FILE__RELABELTO 0x00000200UL -#define FIFO_FILE__TRANSITION 0x00000400UL -#define FIFO_FILE__APPEND 0x00000800UL -#define FIFO_FILE__ACCESS 0x00001000UL -#define FIFO_FILE__UNLINK 0x00002000UL -#define FIFO_FILE__LINK 0x00004000UL -#define FIFO_FILE__RENAME 0x00008000UL -#define FIFO_FILE__EXECUTE 0x00010000UL -#define FIFO_FILE__SWAPON 0x00020000UL -#define FIFO_FILE__QUOTAON 0x00040000UL -#define FIFO_FILE__MOUNTON 0x00080000UL +#define FIFO_FILE__IOCTL 0x00000001UL +#define FIFO_FILE__READ 0x00000002UL +#define FIFO_FILE__WRITE 0x00000004UL +#define FIFO_FILE__CREATE 0x00000008UL +#define FIFO_FILE__GETATTR 0x00000010UL +#define FIFO_FILE__SETATTR 0x00000020UL +#define FIFO_FILE__LOCK 0x00000040UL +#define FIFO_FILE__RELABELFROM 0x00000080UL +#define FIFO_FILE__RELABELTO 0x00000100UL +#define FIFO_FILE__APPEND 0x00000200UL +#define FIFO_FILE__UNLINK 0x00000400UL +#define FIFO_FILE__LINK 0x00000800UL +#define FIFO_FILE__RENAME 0x00001000UL +#define FIFO_FILE__EXECUTE 0x00002000UL +#define FIFO_FILE__SWAPON 0x00004000UL +#define FIFO_FILE__QUOTAON 0x00008000UL +#define FIFO_FILE__MOUNTON 0x00010000UL -#define FD__CREATE 0x00000001UL -#define FD__USE 0x00000002UL +#define FD__USE 0x00000001UL #define SOCKET__IOCTL 0x00000001UL #define SOCKET__READ 0x00000002UL @@ -527,7 +502,6 @@ #define MSG__SEND 0x00000001UL #define MSG__RECEIVE 0x00000002UL -#define MSG__DESTROY 0x00000004UL #define SHM__CREATE 0x00000001UL #define SHM__DESTROY 0x00000002UL @@ -541,12 +515,6 @@ #define SHM__LOCK 0x00000200UL -#define POSIX_SEM__ASSOCIATE 0x00000001UL -#define POSIX_SEM__DISASSOCIATE 0x00000002UL -#define POSIX_SEM__DESTROY 0x00000004UL -#define POSIX_SEM__WRITE 0x00000008UL -#define POSIX_SEM__READ 0x00000010UL - #define SECURITY__COMPUTE_AV 0x00000001UL #define SECURITY__COMPUTE_CREATE 0x00000002UL #define SECURITY__COMPUTE_MEMBER 0x00000004UL ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/class_to_string.h#7 (text+ko) ==== @@ -32,7 +32,6 @@ S_("msgq") S_("shm") S_("ipc") - S_("posix_sem") S_("passwd") S_("drawable") S_("window") ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/common_perm_to_string.h#6 (text+ko) ==== @@ -1,6 +1,5 @@ /* This file is automatically generated. Do not edit. */ TB_(common_file_perm_to_string) - S_("poll") S_("ioctl") S_("read") S_("write") @@ -10,9 +9,7 @@ S_("lock") S_("relabelfrom") S_("relabelto") - S_("transition") S_("append") - S_("access") S_("unlink") S_("link") S_("rename") ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/flask.h#8 (text+ko) ==== @@ -34,33 +34,32 @@ #define SECCLASS_MSGQ 27 #define SECCLASS_SHM 28 #define SECCLASS_IPC 29 -#define SECCLASS_POSIX_SEM 30 -#define SECCLASS_PASSWD 31 -#define SECCLASS_DRAWABLE 32 -#define SECCLASS_WINDOW 33 -#define SECCLASS_GC 34 -#define SECCLASS_FONT 35 -#define SECCLASS_COLORMAP 36 -#define SECCLASS_PROPERTY 37 -#define SECCLASS_CURSOR 38 -#define SECCLASS_XCLIENT 39 -#define SECCLASS_XINPUT 40 -#define SECCLASS_XSERVER 41 -#define SECCLASS_XEXTENSION 42 -#define SECCLASS_PAX 43 -#define SECCLASS_NETLINK_ROUTE_SOCKET 44 -#define SECCLASS_NETLINK_FIREWALL_SOCKET 45 -#define SECCLASS_NETLINK_TCPDIAG_SOCKET 46 -#define SECCLASS_NETLINK_NFLOG_SOCKET 47 -#define SECCLASS_NETLINK_XFRM_SOCKET 48 -#define SECCLASS_NETLINK_SELINUX_SOCKET 49 -#define SECCLASS_NETLINK_AUDIT_SOCKET 50 -#define SECCLASS_NETLINK_IP6FW_SOCKET 51 -#define SECCLASS_NETLINK_DNRT_SOCKET 52 -#define SECCLASS_DBUS 53 -#define SECCLASS_NSCD 54 -#define SECCLASS_ASSOCIATION 55 -#define SECCLASS_NETLINK_KOBJECT_UEVENT_SOCKET 56 +#define SECCLASS_PASSWD 30 +#define SECCLASS_DRAWABLE 31 +#define SECCLASS_WINDOW 32 +#define SECCLASS_GC 33 +#define SECCLASS_FONT 34 +#define SECCLASS_COLORMAP 35 +#define SECCLASS_PROPERTY 36 +#define SECCLASS_CURSOR 37 +#define SECCLASS_XCLIENT 38 +#define SECCLASS_XINPUT 39 +#define SECCLASS_XSERVER 40 +#define SECCLASS_XEXTENSION 41 +#define SECCLASS_PAX 42 +#define SECCLASS_NETLINK_ROUTE_SOCKET 43 +#define SECCLASS_NETLINK_FIREWALL_SOCKET 44 +#define SECCLASS_NETLINK_TCPDIAG_SOCKET 45 +#define SECCLASS_NETLINK_NFLOG_SOCKET 46 +#define SECCLASS_NETLINK_XFRM_SOCKET 47 +#define SECCLASS_NETLINK_SELINUX_SOCKET 48 +#define SECCLASS_NETLINK_AUDIT_SOCKET 49 +#define SECCLASS_NETLINK_IP6FW_SOCKET 50 +#define SECCLASS_NETLINK_DNRT_SOCKET 51 +#define SECCLASS_DBUS 52 +#define SECCLASS_NSCD 53 +#define SECCLASS_ASSOCIATION 54 +#define SECCLASS_NETLINK_KOBJECT_UEVENT_SOCKET 55 /* * Security identifier indices for initial entities From owner-p4-projects@FreeBSD.ORG Thu Feb 15 20:26:07 2007 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 B23DD16A406; Thu, 15 Feb 2007 20:26:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8A7F016A400 for ; Thu, 15 Feb 2007 20:26:07 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 798F713C4AA for ; Thu, 15 Feb 2007 20:26:07 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1FKQ76N073485 for ; Thu, 15 Feb 2007 20:26:07 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1FKQ7X4073476 for perforce@freebsd.org; Thu, 15 Feb 2007 20:26:07 GMT (envelope-from millert@freebsd.org) Date: Thu, 15 Feb 2007 20:26:07 GMT Message-Id: <200702152026.l1FKQ7X4073476@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 114581 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, 15 Feb 2007 20:26:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=114581 Change 114581 by millert@millert_p4 on 2007/02/15 20:25:32 Sync SEBSD module with SELinux kernel tree. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/avc.c#11 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/avc.h#10 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/avc_ss.h#6 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/avtab.c#10 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/avtab.h#8 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/conditional.c#7 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/context.h#6 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/ebitmap.c#6 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/ebitmap.h#6 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/hashtab.c#6 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/hashtab.h#6 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/mls.c#6 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/mls.h#5 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/policydb.c#8 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/policydb.h#9 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/security.h#11 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/services.c#14 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/sidtab.c#11 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/symtab.c#6 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/avc.c#11 (text+ko) ==== @@ -20,7 +20,6 @@ #include "opt_mac.h" -#include #include #include #include @@ -28,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -35,6 +35,10 @@ #include #include +#include +#include +#include + #include #include @@ -44,12 +48,7 @@ #include #include -static const struct av_perm_to_string -{ - u16 tclass; - u32 value; - const char *name; -} av_perm_to_string[] = { +static const struct av_perm_to_string av_perm_to_string[] = { #define S_(c, v, s) { c, v, s }, #include #undef S_ @@ -69,17 +68,21 @@ #undef TE_ #undef S_ -static const struct av_inherit -{ - u16 tclass; - const char **common_pts; - u32 common_base; -} av_inherit[] = { +static const struct av_inherit av_inherit[] = { #define S_(c, i, b) { c, common_##i##_perm_to_string, b }, #include #undef S_ }; +const struct selinux_class_perm selinux_class_perm = { + av_perm_to_string, + ARRAY_SIZE(av_perm_to_string), + class_to_string, + ARRAY_SIZE(class_to_string), + av_inherit, + ARRAY_SIZE(av_inherit) +}; + #define AVC_CACHE_SLOTS 512 #define AVC_DEF_CACHE_THRESHOLD 512 #define AVC_CACHE_RECLAIM 16 @@ -92,7 +95,7 @@ u32 tsid; u16 tclass; struct av_decision avd; - int used; /* used recently */ + atomic_t used; /* used recently */ }; struct avc_node { @@ -100,15 +103,10 @@ LIST_ENTRY(avc_node) list; }; -#define AVC_LOCK_NAMEFMT "SEBSD AVC slot %d" -#define AVC_LOCK_NAMESIZE (sizeof(AVC_LOCK_NAMEFMT) + 4) - struct avc_cache { LIST_HEAD(, avc_node) slots[AVC_CACHE_SLOTS]; - struct rwlock slots_lock[AVC_CACHE_SLOTS]; - char slots_lockname[AVC_CACHE_SLOTS][AVC_LOCK_NAMESIZE]; u32 lru_hint; /* LRU hint for reclaim scan */ - u32 active_nodes; + atomic_t active_nodes; u32 latest_notif; /* latest revocation notification */ }; @@ -125,7 +123,7 @@ }; /* Exported via selinufs */ -unsigned int avc_cache_threshold = AVC_DEF_CACHE_THRESHOLD; +int avc_cache_threshold = AVC_DEF_CACHE_THRESHOLD; #ifdef CONFIG_SECURITY_SELINUX_AVC_STATS DEFINE_PER_CPU(struct avc_cache_stats, avc_cache_stats) = { 0 }; @@ -134,21 +132,18 @@ int selinux_auditing = 1; int selinux_enforcing = 0; -#define AVC_RDLOCK(n) rw_rlock(&avc_cache.slots_lock[n]) -#define AVC_WRLOCK(n) rw_wlock(&avc_cache.slots_lock[n]) -#define AVC_RDUNLOCK(n) rw_runlock(&avc_cache.slots_lock[n]) -#define AVC_WRUNLOCK(n) rw_wunlock(&avc_cache.slots_lock[n]) +static struct rwlock avc_lock; +RW_SYSINIT(avc_lock, &avc_lock, "SEBSD avc lock"); +#define AVC_RDLOCK rw_rlock(&avc_lock) +#define AVC_WRLOCK rw_wlock(&avc_lock) +#define AVC_RDUNLOCK rw_runlock(&avc_lock) +#define AVC_WRUNLOCK rw_wunlock(&avc_lock) static struct mtx notif_lock; MTX_SYSINIT(notif_lock, ¬if_lock, "SEBSD Notif Update", MTX_DEF); #define NOTIF_LOCK mtx_lock(¬if_lock) #define NOTIF_UNLOCK mtx_unlock(¬if_lock) -static struct mtx ratelimit_lock; -MTX_SYSINIT(ratelimit_lock, &ratelimit_lock, "SEBSD Ratelimit", MTX_DEF); -#define RATELIM_LOCK mtx_lock(&ratelimit_lock) -#define RATELIM_UNLOCK mtx_unlock(&ratelimit_lock) - static struct avc_cache avc_cache; static struct avc_callback_node *avc_callbacks; static uma_zone_t avc_node_cachep; @@ -256,11 +251,10 @@ { int i; + avc_audit_init(); + for (i = 0; i < AVC_CACHE_SLOTS; i++) { LIST_INIT(&avc_cache.slots[i]); - snprintf(avc_cache.slots_lockname[i], - sizeof(avc_cache.slots_lockname[i]), AVC_LOCK_NAMEFMT, i); - rw_init(&avc_cache.slots_lock[i], avc_cache.slots_lockname[i]); } avc_cache.active_nodes = 0; avc_cache.lru_hint = 0; @@ -268,10 +262,10 @@ avc_node_cachep = uma_zcreate("avc_node", sizeof(struct avc_node), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); - audit_log("AVC INITIALIZED"); - /* The fetch may or may not occur; if not, it doesn't change int *. */ TUNABLE_INT_FETCH("security.mac.sebsd.enforcing", &selinux_enforcing); + + printf("AVC INITIALIZED\n"); /* XXX */ } #if 0 @@ -280,10 +274,11 @@ int i, chain_len, max_chain_len, slots_used; struct avc_node *node; + AVC_RDLOCK; + slots_used = 0; max_chain_len = 0; for (i = 0; i < AVC_CACHE_SLOTS; i++) { - AVC_RDLOCK(i); if (!LIST_EMPTY(&avc_cache.slots[i])) { slots_used++; chain_len = 0; @@ -292,9 +287,10 @@ if (chain_len > max_chain_len) max_chain_len = chain_len; } - AVC_RDUNLOCK(i); } + AVC_RDUNLOCK; + return scnprintf(page, PAGE_SIZE, "entries: %d\nbuckets used: %d/%d\n" "longest chain: %d\n", atomic_read(&avc_cache.active_nodes), @@ -339,10 +335,12 @@ struct avc_node *node, *next; int hvalue, try, ecx; + AVC_WRLOCK; + + hvalue = avc_cache.lru_hint; for (try = 0, ecx = 0; try < AVC_CACHE_SLOTS; try++ ) { - hvalue = atomic_inc_return(&avc_cache.lru_hint) & (AVC_CACHE_SLOTS - 1); + hvalue = (hvalue + 1) & (AVC_CACHE_SLOTS - 1); - AVC_WRLOCK(hvalue); for (node = LIST_FIRST(&avc_cache.slots[hvalue]); node != NULL; node = next) { next = LIST_NEXT(node, list); @@ -351,15 +349,14 @@ avc_node_delete(node); avc_cache_stats_incr(reclaims); ecx++; - if (ecx >= AVC_CACHE_RECLAIM) { - AVC_WRUNLOCK(hvalue); + if (ecx >= AVC_CACHE_RECLAIM) goto out; - } } } - AVC_WRUNLOCK(hvalue); } out: + avc_cache.lru_hint = hvalue; + AVC_WRUNLOCK; return ecx; } @@ -389,17 +386,13 @@ memcpy(&node->ae.avd, &ae->avd, sizeof(node->ae.avd)); } -/* - * Note: returns with read lock held for hvalue. - */ -static inline struct avc_node *avc_search_node(u32 ssid, u32 tsid, u16 tclass, - int *hvaluep) +static inline struct avc_node *avc_search_node(u32 ssid, u32 tsid, u16 tclass) { struct avc_node *node, *ret = NULL; + int hvalue; - *hvaluep = avc_hash(ssid, tsid, tclass); - AVC_RDLOCK(*hvaluep); - LIST_FOREACH(node, &avc_cache.slots[*hvaluep], list) { + hvalue = avc_hash(ssid, tsid, tclass); + LIST_FOREACH(node, &avc_cache.slots[hvalue], list) { if (ssid == node->ae.ssid && tclass == node->ae.tclass && tsid == node->ae.tsid) { @@ -426,35 +419,33 @@ * @tsid: target security identifier * @tclass: target security class * @requested: requested permissions, interpreted based on @tclass - * @hvaluep: cache slot of the node on success * * Look up an AVC entry that is valid for the * @requested permissions between the SID pair * (@ssid, @tsid), interpreting the permissions * based on @tclass. If a valid AVC entry exists, - * then this function return the avc_node and read locks its slot. + * then this function return the avc_node. * Otherwise, this function returns NULL. */ -static struct avc_node *avc_lookup(u32 ssid, u32 tsid, u16 tclass, u32 requested, int *hvaluep) +static struct avc_node *avc_lookup(u32 ssid, u32 tsid, u16 tclass, u32 requested) { struct avc_node *node; avc_cache_stats_incr(lookups); - node = avc_search_node(ssid, tsid, tclass, hvaluep); + node = avc_search_node(ssid, tsid, tclass); if (node && ((node->ae.avd.decided & requested) == requested)) { avc_cache_stats_incr(hits); goto out; } - AVC_RDUNLOCK(*hvaluep); node = NULL; avc_cache_stats_incr(misses); out: return node; } -static int avc_latest_notif_update(int seqno, int is_insert) +static int avc_latest_notif_update(u32 seqno, int is_insert) { int ret = 0; @@ -480,7 +471,6 @@ * @tsid: target security identifier * @tclass: target security class * @ae: AVC entry - * @hvaluep: cache slot of the node on success * * Insert an AVC entry for the SID pair * (@ssid, @tsid) and class @tclass. @@ -489,112 +479,61 @@ * response to a security_compute_av() call. If the * sequence number @ae->avd.seqno is not less than the latest * revocation notification, then the function copies - * the access vectors into a cache entry, returns (WRITE-locked) + * the access vectors into a cache entry, returns * avc_node inserted. Otherwise, this function returns NULL. */ -static struct avc_node *avc_insert(u32 ssid, u32 tsid, u16 tclass, struct avc_entry *ae, int *hvaluep) +static struct avc_node *avc_insert(u32 ssid, u32 tsid, u16 tclass, struct avc_entry *ae) { struct avc_node *pos, *node; + int hvalue; if (avc_latest_notif_update(ae->avd.seqno, 1)) return NULL; node = avc_alloc_node(); if (node) { - *hvaluep = avc_hash(ssid, tsid, tclass); + hvalue = avc_hash(ssid, tsid, tclass); avc_node_populate(node, ssid, tsid, tclass, ae); - AVC_WRLOCK(*hvaluep); + AVC_WRLOCK; - LIST_FOREACH(pos, &avc_cache.slots[*hvaluep], list) { + LIST_FOREACH(pos, &avc_cache.slots[hvalue], list) { if (pos->ae.ssid == ssid && pos->ae.tsid == tsid && pos->ae.tclass == tclass) { avc_node_replace(node, pos); + AVC_WRUNLOCK; goto found; } } - LIST_INSERT_HEAD(&avc_cache.slots[*hvaluep], node, list); + LIST_INSERT_HEAD(&avc_cache.slots[hvalue], node, list); + AVC_WRUNLOCK; } found: return node; } -#ifdef __linux__ static inline void avc_print_ipv6_addr(struct audit_buffer *ab, struct in6_addr *addr, __be16 port, - char *name1, char *name2) + const char *name1, const char *name2) { - if (!ipv6_addr_any(addr)) - audit_log_format(ab, " %s=" NIP6_FMT, name1, NIP6(*addr)); + if (!IN6_IS_ADDR_UNSPECIFIED(addr)) + audit_log_format(ab, " %s=%s", name1, ip6_sprintf(addr)); if (port) audit_log_format(ab, " %s=%d", name2, ntohs(port)); } -static inline void avc_print_ipv4_addr(struct audit_buffer *ab, u32 addr, - __be16 port, char *name1, char *name2) +static inline void avc_print_ipv4_addr(struct audit_buffer *ab, __be32 addr, + __be16 port, const char *name1, + const char *name2) { - if (addr) - audit_log_format(ab, " %s=" NIPQUAD_FMT, name1, NIPQUAD(addr)); + if (addr != INADDR_ANY) + audit_log_format(ab, " %s=%ld.%ld.%ld.%ld", name1, + (ntohl(addr)>>24)&0xFF, (ntohl(addr)>>16)&0xFF, + (ntohl(addr)>>8)&0xFF, (ntohl(addr))&0xFF); if (port) audit_log_format(ab, " %s=%d", name2, ntohs(port)); } -#endif /* __linux__ */ - - -#define AVC_MSG_COST 5 -#define AVC_MSG_BURST 10*5 - -/* - * This enforces a rate limit: not more than one kernel message - * every 5secs to make a denial-of-service attack impossible. - */ -static int avc_ratelimit(void) -{ - static int toks; - static int last_msg; - static int missed, rc; - int now = ticks; - - RATELIM_LOCK; - toks += now - last_msg; - last_msg = now; - if (toks > AVC_MSG_BURST) - toks = AVC_MSG_BURST; - if (toks >= AVC_MSG_COST) { - int lost = missed; - missed = 0; - toks -= AVC_MSG_COST; - RATELIM_UNLOCK; - if (lost) - printk(KERN_WARNING "AVC: %d messages suppressed.\n", - lost); - rc = 1; - goto out; - } - missed++; - RATELIM_UNLOCK; -out: - return rc; -} - -static inline int check_avc_ratelimit(void) -{ - - /* - * If auditing is not enabled, suppress all messages. - */ - if (!selinux_auditing) - return 0; - - /* - * If in permissive mode, display all messages. - */ - if (!selinux_enforcing) - return 1; - - return avc_ratelimit(); -} /** * avc_audit - Audit the granting or denial of permissions. @@ -619,7 +558,7 @@ u16 tclass, u32 requested, struct av_decision *avd, int result, struct avc_audit_data *a) { - struct proc *tsk = curproc; + struct proc *tsk; u32 denied, audited; struct audit_buffer *ab; @@ -636,19 +575,16 @@ return; } - if (!check_avc_ratelimit()) - return; - - ab = audit_log_start(); + ab = audit_log_start(current->audit_context, GFP_ATOMIC, AUDIT_AVC); if (!ab) return; /* audit_panic has been called */ audit_log_format(ab, "avc: %s ", denied ? "denied" : "granted"); avc_dump_av(ab, tclass,audited); - audit_log_format(ab, " for "); -#ifdef __linux__ + audit_log_format(ab, " for"); if (a && a->tsk) tsk = a->tsk; -#endif + else + tsk = curproc; /* XXX, should be set by caller */ if (tsk && tsk->p_pid) { audit_log_format(ab, " pid=%d comm=", tsk->p_pid); audit_log_untrustedstring(ab, tsk->p_comm); @@ -676,7 +612,7 @@ curthread)) { audit_log_format(ab, " inode=%ld, mountpoint=%s, ", - va.va_fileid, + va.va_fileid, vp->v_mount->mnt_stat.f_mntonname); } else { audit_log_format(ab, @@ -736,6 +672,7 @@ break; } } +#endif /* __linux__ */ switch (a->u.net.family) { case AF_INET: @@ -756,9 +693,8 @@ break; } if (a->u.net.netif) - audit_log_format(ab, " netif=%s", - a->u.net.netif); -#endif /* __linux__ */ + audit_log_format(ab, " netif=%s%d", + a->u.net.netif, a->u.net.netif_unit); break; } } @@ -767,6 +703,7 @@ audit_log_end(ab); } +#ifdef __linux__ /** * avc_add_callback - Register a callback for security events. * @callback: callback function @@ -807,6 +744,7 @@ out: return rc; } +#endif static inline int avc_sidcmp(u32 x, u32 y) { @@ -835,9 +773,9 @@ goto out; } - /* Lock the target slot */ hvalue = avc_hash(ssid, tsid, tclass); - AVC_WRLOCK(hvalue); + + AVC_WRLOCK; LIST_FOREACH(pos, &avc_cache.slots[hvalue], list){ if ( ssid==pos->ae.ssid && @@ -883,7 +821,7 @@ } avc_node_replace(node, orig); out_unlock: - AVC_WRUNLOCK(hvalue); + AVC_WRUNLOCK; out: return rc; } @@ -895,28 +833,30 @@ int avc_ss_reset(u32 seqno) { struct avc_callback_node *c; - int i, rc = 0; + int i, rc = 0, tmprc; struct avc_node *node; + AVC_WRLOCK; for (i = 0; i < AVC_CACHE_SLOTS; i++) { - AVC_WRLOCK(i); while ((node = LIST_FIRST(&avc_cache.slots[i])) != NULL) avc_node_delete(node); - AVC_WRUNLOCK(i); } + AVC_WRUNLOCK; + for (c = avc_callbacks; c; c = c->next) { if (c->events & AVC_CALLBACK_RESET) { - rc = c->callback(AVC_CALLBACK_RESET, - 0, 0, 0, 0, NULL); - if (rc) - goto out; + tmprc = c->callback(AVC_CALLBACK_RESET, + 0, 0, 0, 0, NULL); + /* save the first error encountered for the return + value and continue processing the callbacks */ + if (!rc) + rc = tmprc; } } avc_latest_notif_update(seqno, 0); -out: return rc; } @@ -945,29 +885,28 @@ { struct avc_node *node; struct avc_entry entry, *p_ae; - int hvalue, found, rc = 0; + int rc = 0; u32 denied; - node = avc_lookup(ssid, tsid, tclass, requested, &hvalue); - found = node != NULL; + AVC_RDLOCK; + node = avc_lookup(ssid, tsid, tclass, requested); + AVC_RDUNLOCK; - if (!found) { + if (!node) { rc = security_compute_av(ssid,tsid,tclass,requested,&entry.avd); if (rc) goto out; - node = avc_insert(ssid,tsid,tclass,&entry,&hvalue); + node = avc_insert(ssid,tsid,tclass,&entry); } + AVC_RDLOCK; p_ae = node ? &node->ae : &entry; if (avd) memcpy(avd, &p_ae->avd, sizeof(*avd)); denied = requested & ~(p_ae->avd.allowed); - if (found) - AVC_RDUNLOCK(hvalue); /* locked by avc_lookup() */ - else if (node) - AVC_WRUNLOCK(hvalue); /* locked by avc_insert() */ + AVC_RDUNLOCK; if (!requested || denied) { if (selinux_enforcing) ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/avc.h#10 (text+ko) ==== @@ -34,12 +34,8 @@ */ struct avc_entry; -struct task_struct; -struct vfsmount; -struct dentry; -struct inode; -struct sock; -struct sk_buff; +struct proc; +struct socket; /* Auxiliary data to use in generating the audit record. */ struct avc_audit_data { @@ -48,23 +44,25 @@ #define AVC_AUDIT_DATA_NET 2 #define AVC_AUDIT_DATA_CAP 3 #define AVC_AUDIT_DATA_IPC 4 -#ifdef __linux__ - struct task_struct *tsk; -#endif +#define AVC_AUDIT_DATA_MIG 5 + struct proc *tsk; union { struct { struct vnode *vp; + char *path; + int pathlen; } fs; struct { - char *netif; - struct sock *sk; + const char *netif; + u32 netif_unit; + struct socket *so; u16 family; - u16 dport; - u16 sport; + __be16 dport; + __be16 sport; union { struct { - u32 daddr; - u32 saddr; + __be32 daddr; + __be32 saddr; } v4; struct { struct in6_addr daddr; @@ -89,12 +87,12 @@ */ struct avc_cache_stats { - unsigned int lookups; - unsigned int hits; - unsigned int misses; - unsigned int allocations; - unsigned int reclaims; - unsigned int frees; + atomic_t lookups; + atomic_t hits; + atomic_t misses; + atomic_t allocations; + atomic_t reclaims; + atomic_t frees; }; /* @@ -132,11 +130,13 @@ /* Exported to selinuxfs */ int avc_get_hash_stats(char *page); -extern unsigned int avc_cache_threshold; +extern int avc_cache_threshold; #ifdef CONFIG_SECURITY_SELINUX_AVC_STATS DECLARE_PER_CPU(struct avc_cache_stats, avc_cache_stats); #endif +void avc_audit_init(void); + #endif /* _SELINUX_AVC_H_ */ ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/avc_ss.h#6 (text+ko) ==== @@ -11,5 +11,29 @@ int avc_ss_reset(u32 seqno); +struct av_perm_to_string +{ + u16 tclass; + u32 value; + const char *name; +}; + +struct av_inherit +{ + u16 tclass; + const char **common_pts; + u32 common_base; +}; + +struct selinux_class_perm +{ + const struct av_perm_to_string *av_perm_to_string; + u32 av_pts_len; + const char **class_to_string; + u32 cts_len; + const struct av_inherit *av_inherit; + u32 av_inherit_len; +}; + #endif /* _SELINUX_AVC_SS_H_ */ ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/avtab.c#10 (text+ko) ==== @@ -305,7 +305,8 @@ u32 items, items2, val; struct avtab_key key; struct avtab_datum datum; - int i, rc; + size_t i; + int rc; memset(&key, 0, sizeof(struct avtab_key)); memset(&datum, 0, sizeof(struct avtab_datum)); ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/avtab.h#8 (text+ko) ==== @@ -57,7 +57,7 @@ void avtab_destroy(struct avtab *h); void avtab_hash_eval(struct avtab *h, char *tag); -int avtab_read_item(void *fp, uint32_t vers, struct avtab *a, +int avtab_read_item(void *fp, u32 vers, struct avtab *a, int (*insert)(struct avtab *a, struct avtab_key *k, struct avtab_datum *d, void *p), void *p); ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/conditional.c#7 (text+ko) ==== @@ -342,9 +342,10 @@ static int cond_read_av_list(struct policydb *p, void *fp, struct cond_av_list **ret_list, struct cond_av_list *other) { - int i, rc; + int rc; __le32 buf[1]; u32 len; + size_t i; struct cond_insertf_data data; *ret_list = NULL; ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/context.h#6 (text+ko) ==== @@ -55,6 +55,29 @@ return rc; } +/* + * Sets both levels in the MLS range of 'dst' to the low level of 'src'. + */ +static inline int mls_context_cpy_low(struct context *dst, struct context *src) +{ + int rc; + + if (!selinux_mls_enabled) + return 0; + + dst->range.level[0].sens = src->range.level[0].sens; + rc = ebitmap_cpy(&dst->range.level[0].cat, &src->range.level[0].cat); + if (rc) + goto out; + + dst->range.level[1].sens = src->range.level[0].sens; + rc = ebitmap_cpy(&dst->range.level[1].cat, &src->range.level[0].cat); + if (rc) + ebitmap_destroy(&dst->range.level[0].cat); +out: + return rc; +} + static inline int mls_context_cmp(struct context *c1, struct context *c2) { if (!selinux_mls_enabled) @@ -104,3 +127,4 @@ } #endif /* _SS_CONTEXT_H_ */ + ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/ebitmap.c#6 (text+ko) ==== @@ -3,6 +3,13 @@ * * Author : Stephen Smalley, */ +/* + * Updated: Hewlett-Packard + * + * Added support to import/export the NetLabel category bitmap + * + * (c) Copyright Hewlett-Packard Development Company, L.P., 2006 + */ #include #include @@ -57,6 +64,121 @@ return 0; } +#ifdef CONFIG_NETLABEL +/** + * ebitmap_netlbl_export - Export an ebitmap into a NetLabel category bitmap + * @ebmap: the ebitmap to export + * @catmap: the NetLabel category bitmap + * + * Description: + * Export a SELinux extensibile bitmap into a NetLabel category bitmap. + * Returns zero on success, negative values on error. + * + */ +int ebitmap_netlbl_export(struct ebitmap *ebmap, + struct netlbl_lsm_secattr_catmap **catmap) +{ + struct ebitmap_node *e_iter = ebmap->node; + struct netlbl_lsm_secattr_catmap *c_iter; + u32 cmap_idx; + + /* This function is a much simpler because SELinux's MAPTYPE happens + * to be the same as NetLabel's NETLBL_CATMAP_MAPTYPE, if MAPTYPE is + * changed from a u64 this function will most likely need to be changed + * as well. It's not ideal but I think the tradeoff in terms of + * neatness and speed is worth it. */ + + if (e_iter == NULL) { + *catmap = NULL; + return 0; + } + + c_iter = netlbl_secattr_catmap_alloc(GFP_ATOMIC); + if (c_iter == NULL) + return ENOMEM; + *catmap = c_iter; + c_iter->startbit = e_iter->startbit & ~(NETLBL_CATMAP_SIZE - 1); + + while (e_iter != NULL) { + if (e_iter->startbit >= + (c_iter->startbit + NETLBL_CATMAP_SIZE)) { + c_iter->next = netlbl_secattr_catmap_alloc(GFP_ATOMIC); + if (c_iter->next == NULL) + goto netlbl_export_failure; + c_iter = c_iter->next; + c_iter->startbit = e_iter->startbit & + ~(NETLBL_CATMAP_SIZE - 1); + } + cmap_idx = (e_iter->startbit - c_iter->startbit) / + NETLBL_CATMAP_MAPSIZE; + c_iter->bitmap[cmap_idx] = e_iter->map; + e_iter = e_iter->next; + } + + return 0; + +netlbl_export_failure: + netlbl_secattr_catmap_free(*catmap); + return ENOMEM; +} + +/** + * ebitmap_netlbl_import - Import a NetLabel category bitmap into an ebitmap + * @ebmap: the ebitmap to export + * @catmap: the NetLabel category bitmap + * + * Description: + * Import a NetLabel category bitmap into a SELinux extensibile bitmap. + * Returns zero on success, negative values on error. + * + */ +int ebitmap_netlbl_import(struct ebitmap *ebmap, + struct netlbl_lsm_secattr_catmap *catmap) +{ + struct ebitmap_node *e_iter = NULL; + struct ebitmap_node *emap_prev = NULL; + struct netlbl_lsm_secattr_catmap *c_iter = catmap; + u32 c_idx; + + /* This function is a much simpler because SELinux's MAPTYPE happens + * to be the same as NetLabel's NETLBL_CATMAP_MAPTYPE, if MAPTYPE is + * changed from a u64 this function will most likely need to be changed + * as well. It's not ideal but I think the tradeoff in terms of + * neatness and speed is worth it. */ + + do { + for (c_idx = 0; c_idx < NETLBL_CATMAP_MAPCNT; c_idx++) { + if (c_iter->bitmap[c_idx] == 0) + continue; + + e_iter = kzalloc(sizeof(*e_iter), GFP_ATOMIC); + if (e_iter == NULL) + goto netlbl_import_failure; + if (emap_prev == NULL) + ebmap->node = e_iter; + else + emap_prev->next = e_iter; + emap_prev = e_iter; + + e_iter->startbit = c_iter->startbit + + NETLBL_CATMAP_MAPSIZE * c_idx; + e_iter->map = c_iter->bitmap[c_idx]; + } + c_iter = c_iter->next; + } while (c_iter != NULL); + if (e_iter != NULL) + ebmap->highbit = e_iter->startbit + MAPSIZE; + else + ebitmap_destroy(ebmap); + + return 0; + +netlbl_import_failure: + ebitmap_destroy(ebmap); + return ENOMEM; +} +#endif /* CONFIG_NETLABEL */ + int ebitmap_contains(struct ebitmap *e1, struct ebitmap *e2) { struct ebitmap_node *n1, *n2; ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/ebitmap.h#6 (text+ko) ==== @@ -79,4 +79,24 @@ void ebitmap_destroy(struct ebitmap *e); int ebitmap_read(struct ebitmap *e, void *fp); +#ifdef __linux__ +#ifdef CONFIG_NETLABEL +int ebitmap_netlbl_export(struct ebitmap *ebmap, + struct netlbl_lsm_secattr_catmap **catmap); +int ebitmap_netlbl_import(struct ebitmap *ebmap, + struct netlbl_lsm_secattr_catmap *catmap); +#else +static inline int ebitmap_netlbl_export(struct ebitmap *ebmap, + struct netlbl_lsm_secattr_catmap **catmap) +{ + return ENOMEM; +} +static inline int ebitmap_netlbl_import(struct ebitmap *ebmap, + struct netlbl_lsm_secattr_catmap *catmap) +{ + return ENOMEM; +} +#endif +#endif + #endif /* _SS_EBITMAP_H_ */ ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/hashtab.c#6 (text+ko) ==== @@ -10,8 +10,8 @@ #include #include -struct hashtab *hashtab_create(u32 (*hash_value)(struct hashtab *h, void *key), - int (*keycmp)(struct hashtab *h, void *key1, void *key2), >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Feb 15 20:26:08 2007 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 B3C9A16A524; Thu, 15 Feb 2007 20:26:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5E77D16A4F8 for ; Thu, 15 Feb 2007 20:26:07 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E391413C49D for ; Thu, 15 Feb 2007 20:26:07 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1FKQ7NV073495 for ; Thu, 15 Feb 2007 20:26:07 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1FKQ7s5073488 for perforce@freebsd.org; Thu, 15 Feb 2007 20:26:07 GMT (envelope-from millert@freebsd.org) Date: Thu, 15 Feb 2007 20:26:07 GMT Message-Id: <200702152026.l1FKQ7s5073488@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 114582 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, 15 Feb 2007 20:26:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=114582 Change 114582 by millert@millert_p4 on 2007/02/15 20:26:02 Add sysctl_canon_context, sysctl_compute_create, and sysctl_compute_member for use by new libselinux. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_sysctl.c#12 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_sysctl.c#12 (text+ko) ==== @@ -333,7 +333,169 @@ return (error); } +/* + * Sysctl handler for security.mac.sebsd.canon_context. + * Check sid validity, returns canonical name of context. + */ +static int +sysctl_canon_context(SYSCTL_HANDLER_ARGS) +{ + u_int32_t sid, len; + char *context, *canon; + int error; + +#ifdef SECURITY__COMPUTE_CHECK + error = thread_has_security(curthread, SECURITY__COMPUTE_CHECK); + if (error) + return (error); +#endif + + if (req->newlen < 2) + return (EINVAL); + if (req->newlen > 512) /* arbitrary */ + return (ENAMETOOLONG); + MALLOC(context, char *, req->newlen, M_SEBSD, M_WAITOK); + error = SYSCTL_IN(req, context, req->newlen); + if (error) + goto out; + if (context[req->newlen - 1] != '\0') { + error = EINVAL; + goto out; + } + /* + * XXX We need POLICY_RDLOCK here, but it's not exported! + */ + error = security_context_to_sid(context, strlen(context) + 1, &sid); + if (error) + goto out; + + error = security_sid_to_context(sid, &canon, &len); + if (error == 0) { + error = SYSCTL_OUT(req, canon, len); + FREE(canon, M_SEBSD); + } +out: + FREE(context, M_SEBSD); + return (error); +} + +/* + * Sysctl handler for security.mac.sebsd.compute_create. Create new sid + * given input "scontext\0tcontext\0", tclass. + */ static int +sysctl_compute_create(SYSCTL_HANDLER_ARGS) +{ + u_int32_t sid, tsid, newsid, len; + u_int16_t tclass; + char *scontext, *tcontext, *newcontext; + int error; + + error = thread_has_security(curthread, SECURITY__COMPUTE_CREATE); + if (error) + return (error); + + if (req->newlen < 4 + sizeof(tclass)) + return (EINVAL); + if (req->newlen > 512) /* arbitrary */ + return (ENAMETOOLONG); + MALLOC(scontext, char *, req->newlen, M_SEBSD, M_WAITOK); + error = SYSCTL_IN(req, scontext, req->newlen); + if (error) + goto out; + if (scontext[req->newlen - (1 + sizeof(tclass))] != '\0') { + error = EINVAL; + goto out; + } + tcontext = &scontext[strlen(scontext) + 1]; + if (tcontext >= &scontext[req->newlen - (1 + sizeof(tclass))]) { + error = EINVAL; + goto out; + } + bcopy(&tcontext[strlen(tcontext) + 1], &tclass, sizeof(tclass)); + /* + * XXX We need POLICY_RDLOCK here, but it's not exported! + */ + error = security_context_to_sid(scontext, strlen(scontext) + 1, &sid); + if (error) + goto out; + error = security_context_to_sid(tcontext, strlen(tcontext) + 1, &tsid); + if (error) + goto out; + + error = security_transition_sid(sid, tsid, tclass, &newsid); + if (error) + goto out; + + error = security_sid_to_context(newsid, &newcontext, &len); + if (error == 0) { + error = SYSCTL_OUT(req, newcontext, len); + FREE(newcontext, M_SEBSD); + } +out: + FREE(scontext, M_SEBSD); + return (error); +} + +/* + * Sysctl handler for security.mac.sebsd.compute_member. Compute member sid + * given input "scontext\0tcontext\0", tclass. + */ +static int +sysctl_compute_member(SYSCTL_HANDLER_ARGS) +{ + u_int32_t sid, tsid, newsid, len; + u_int16_t tclass; + char *scontext, *tcontext, *newcontext; + int error; + + error = thread_has_security(curthread, SECURITY__COMPUTE_MEMBER); + if (error) + return (error); + + if (req->newlen < 4 + sizeof(tclass)) + return (EINVAL); + if (req->newlen > 512) /* arbitrary */ + return (ENAMETOOLONG); + MALLOC(scontext, char *, req->newlen, M_SEBSD, M_WAITOK); + error = SYSCTL_IN(req, scontext, req->newlen); + if (error) + goto out; + if (scontext[req->newlen - (1 + sizeof(tclass))] != '\0') { + error = EINVAL; + goto out; + } + tcontext = &scontext[strlen(scontext) + 1]; + if (tcontext >= &scontext[req->newlen - (1 + sizeof(tclass))]) { + error = EINVAL; + goto out; + } + bcopy(&tcontext[strlen(tcontext) + 1], &tclass, sizeof(tclass)); + /* + * XXX We need POLICY_RDLOCK here, but it's not exported! + */ + error = security_context_to_sid(scontext, strlen(scontext) + 1, &sid); + if (error) + goto out; + error = security_context_to_sid(tcontext, strlen(tcontext) + 1, &tsid); + if (error) + goto out; + + error = security_member_sid(sid, tsid, tclass, &newsid); + if (error) + goto out; + + error = security_sid_to_context(newsid, &newcontext, &len); + if (error == 0) { + error = SYSCTL_OUT(req, newcontext, len); + FREE(newcontext, M_SEBSD); + } +out: + FREE(scontext, M_SEBSD); + return (error); +} + +static int sysctl_sebsd_policypath(SYSCTL_HANDLER_ARGS) { @@ -360,6 +522,15 @@ SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, compute_av, CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_compute_av, "A", "SEBSD access vector decision query"); +SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, canon_context, CTLTYPE_STRING | + CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_canon_context, "A", + "SEBSD context verification query"); +SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, compute_create, CTLTYPE_STRING | + CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_compute_create, "A", + "SEBSD context computation query"); +SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, compute_member, CTLTYPE_STRING | + CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_compute_member, "A", + "SEBSD context member query"); SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, auditing, CTLTYPE_INT | CTLFLAG_RW, NULL, 0, sysctl_sebsd_auditing, "I", "SEBSD avc auditing"); TUNABLE_INT("security.mac.sebsd.auditing", &selinux_auditing); From owner-p4-projects@FreeBSD.ORG Thu Feb 15 20:27:10 2007 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 0273C16A407; Thu, 15 Feb 2007 20:27:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D44F016A402 for ; Thu, 15 Feb 2007 20:27:09 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C3AA113C4B2 for ; Thu, 15 Feb 2007 20:27:09 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1FKR9sn073649 for ; Thu, 15 Feb 2007 20:27:09 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1FKR9Fm073646 for perforce@freebsd.org; Thu, 15 Feb 2007 20:27:09 GMT (envelope-from millert@freebsd.org) Date: Thu, 15 Feb 2007 20:27:09 GMT Message-Id: <200702152027.l1FKR9Fm073646@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 114583 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, 15 Feb 2007 20:27:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=114583 Change 114583 by millert@millert_p4 on 2007/02/15 20:26:37 Remove linux-specific types from sebsd_syscalls.h, use BSD-style bit types instead. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_syscall.c#10 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_syscalls.h#9 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_syscall.c#10 (text+ko) ==== @@ -47,6 +47,7 @@ #include #include +#include #include #include ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_syscalls.h#9 (text+ko) ==== @@ -1,8 +1,46 @@ +/*- + * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2005-2006 SPARTA, Inc. + * All rights reserved. + * + * This software was developed for the FreeBSD Project by NAI Labs, 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. + * + * This software was enhanced by SPARTA ISSO under SPAWAR contract + * N66001-04-C-6019 ("SEFOS"). + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The names of the authors may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + #ifndef _SEBSD_SYSCALLS_H_ #define _SEBSD_SYSCALLS_H_ -#include - /* * TBD: Should we really try to line up with SELinux? */ @@ -16,19 +54,19 @@ /* Structure definitions for compute_av call. */ struct security_query { - char *scontext; - char *tcontext; - u16 tclass; - u32 requested; + char *scontext; + char *tcontext; + u_int16_t tclass; + u_int32_t requested; }; struct security_response { - u32 allowed; - u32 decided; - u32 auditallow; - u32 auditdeny; - u32 notify; - u32 seqno; + u_int32_t allowed; + u_int32_t decided; + u_int32_t auditallow; + u_int32_t auditdeny; + u_int32_t notify; + u_int32_t seqno; }; struct sebsd_get_bools { From owner-p4-projects@FreeBSD.ORG Thu Feb 15 20:28:12 2007 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 DFB5F16A408; Thu, 15 Feb 2007 20:28:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BDADA16A400 for ; Thu, 15 Feb 2007 20:28:11 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A286D13C4B5 for ; Thu, 15 Feb 2007 20:28:11 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1FKSBYW073747 for ; Thu, 15 Feb 2007 20:28:11 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1FKSBgm073734 for perforce@freebsd.org; Thu, 15 Feb 2007 20:28:11 GMT (envelope-from millert@freebsd.org) Date: Thu, 15 Feb 2007 20:28:11 GMT Message-Id: <200702152028.l1FKSBgm073734@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 114584 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, 15 Feb 2007 20:28:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=114584 Change 114584 by millert@millert_p4 on 2007/02/15 20:27:17 Make avc audit rouines use uma_zalloc() and keep a spare buffer around for efficiency. Also add some more types to linux-compat.h and remove the non-kernel pieces. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/avc_audit.c#2 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/linux-compat.h#5 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/avc_audit.c#2 (text+ko) ==== @@ -33,11 +33,13 @@ #include #include #include +#include #include #include #include +#include /* * Emulate Linux audit API. @@ -45,7 +47,7 @@ * TBD: use a freelist so we don't have to mallc/free so much. */ -static struct mtx avc_log_lock; +struct mtx avc_log_lock; MTX_SYSINIT(avc_log_lock, &avc_log_lock, "SEBSD message lock", MTX_DEF); struct audit_buffer { @@ -53,15 +55,34 @@ char buf[1024]; }; +static uma_zone_t avc_audit_zone; /* audit buffer zone */ +static struct audit_buffer *spare_buf; /* spare buffer */ + +void +avc_audit_init(void) +{ + + avc_audit_zone = uma_zcreate("avc_audit", sizeof(struct audit_buffer), + NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + spare_buf = uma_zalloc(avc_audit_zone, M_WAITOK); +} + struct audit_buffer * -audit_log_start(void) +_audit_log_start(int flag) { - struct audit_buffer *ab; + struct audit_buffer *ab = spare_buf; - ab = sebsd_malloc(sizeof(*ab), M_SEBSD, M_NOWAIT); + /* Use a free buffer if available, else alloc a new one. */ + if (ab != NULL && + atomic_cmpset_ptr((intptr_t *)&spare_buf, (intptr_t)ab, 0) == 0) + ab = NULL; if (ab == NULL) { - printf("%s: unable to allocate audit buffer\n", __func__); - return (NULL); + ab = uma_zalloc(avc_audit_zone, flag); + if (ab == NULL) { + printf("%s: unable to allocate audit buffer\n", + __func__); + return (NULL); + } } sbuf_new(&ab->sbuf, ab->buf, sizeof(ab->buf), SBUF_FIXEDLEN); return (ab); @@ -75,24 +96,13 @@ mtx_lock(&avc_log_lock); printf("\n%s\n", sbuf_data(&ab->sbuf)); mtx_unlock(&avc_log_lock); - sbuf_delete(&ab->sbuf); - sebsd_free(ab, M_SEBSD); + /* Always keep a free buffer around. */ + if (spare_buf != NULL || + atomic_cmpset_ptr((intptr_t *)&spare_buf, 0, (intptr_t)ab) == 0) + uma_zfree(avc_audit_zone, ab); } void -audit_log(const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - mtx_lock(&avc_log_lock); - vprintf(fmt, ap); - printf("\n"); - mtx_unlock(&avc_log_lock); - va_end(ap); -} - -void audit_log_format(struct audit_buffer *ab, const char *fmt, ...) { va_list ap; @@ -106,5 +116,5 @@ audit_log_untrustedstring(struct audit_buffer *ab, const char *s) { - sbuf_cat(&ab->sbuf, s); + sbuf_cat(&ab->sbuf, s); /* XXX - wants vis(3) support */ } ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/linux-compat.h#5 (text+ko) ==== @@ -48,51 +48,31 @@ #include #include +#include typedef u_int64_t u64; typedef u_int64_t __le64; typedef u_int32_t u32; typedef u_int32_t __le32; +typedef u_int32_t __be32; typedef u_int16_t u16; typedef u_int16_t __le16; typedef u_int16_t __be16; typedef u_int8_t u8; +typedef int gfp_t; -#ifndef _KERNEL - -#if BYTE_ORDER == LITTLE_ENDIAN -#define cpu_to_le16(x) ((__uint16_t)(x)) -#define cpu_to_le32(x) ((__uint32_t)(x)) -#define cpu_to_le64(x) ((__uint64_t)(x)) -#define le16_to_cpu(x) ((__uint16_t)(x)) -#define le32_to_cpu(x) ((__uint32_t)(x)) -#define le64_to_cpu(x) ((__uint64_t)(x)) -#else /* BYTE_ORDER != LITTLE_ENDIAN */ -#define cpu_to_le16(x) bswap16((x)) -#define cpu_to_le32(x) bswap32((x)) -#define cpu_to_le64(x) bswap64((x)) -#define le16_to_cpu(x) bswap16((x)) -#define le32_to_cpu(x) bswap32((x)) -#define le64_to_cpu(x) bswap64((x)) -#endif /* BYTE_ORDER */ - -/* sebsd uses same ss source files for userspace */ - -#define kcalloc(nmemb, size, flags) calloc(nmemb, size) -#define kmalloc(size,flags) malloc(size) -#define kzalloc(size,flags) calloc(1, size) -#define kfree(v) free(v) -#define __get_free_page(flags) malloc (4096) /* XXX need page size */ -#define GFP_ATOMIC 1 -#define GFP_KERNEL 2 - -#else /* _KERNEL */ - +#define cpu_to_le16(a) htole16(a) +#define cpu_to_le32(a) htole32(a) +#define cpu_to_le64(a) htole64(a) #define le16_to_cpu(a) le16toh(a) #define le32_to_cpu(a) le32toh(a) #define le64_to_cpu(a) le64toh(a) +/* branch prediction macros, uses a GCC extension. */ +#define likely(exp) __builtin_expect(!!(exp), 1) +#define unlikely(exp) __builtin_expect(!!(exp), 0) + #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #define NIPQUAD(addr) \ @@ -104,13 +84,13 @@ #define __init /* kmalloc */ -#define kcalloc(nmemb, size, flags) sebsd_malloc(nmemb * size, M_SEBSD, flags | M_ZERO) -#define kmalloc(size,flags) malloc(size, M_SEBSD, flags) -#define kzalloc(size,flags) malloc(size, M_SEBSD, flags | M_ZERO) -#define kfree(v) free(v, M_SEBSD) -#define __get_free_page(flags) malloc(4096, M_SEBSD, flags) /* XXX need page size */ #define GFP_ATOMIC M_NOWAIT #define GFP_KERNEL M_NOWAIT +#define kcalloc(nmemb, size, flags) malloc(nmemb * size, M_SEBSD, flags | M_ZERO) +#define kmalloc(size,flags) malloc(size, M_SEBSD, flags) +#define kzalloc(size,flags) malloc(size, M_SEBSD, flags | M_ZERO) +#define kfree(v) free(v, M_SEBSD) +#define __get_free_page(flags) malloc(4096, M_SEBSD, flags) /* XXX need page size */ /* also defined in sebsd.h */ #ifndef sebsd_malloc @@ -124,22 +104,46 @@ #define _M_SEBSD_DEF #endif -/* spinlock */ +static inline char * +kstrdup(const char *str, int mflag) +{ + char *newstr; + size_t len = strlen(str) + 1; + + newstr = malloc(len, M_SEBSD, mflag); + if (newstr != NULL) + memcpy(newstr, str, len); + return (newstr); +} + +/* FreeBSD has no spinlock, use mutex instead */ #define spinlock_t struct mtx #define spin_lock_irqsave(m,flags) mtx_lock(m) #define spin_unlock_irqrestore(m,flags) mtx_unlock(m) /* emulate linux audit support */ +extern struct mtx avc_log_lock; struct audit_buffer; -struct audit_buffer *audit_log_start(void); -void audit_log(const char *, ...); +struct audit_buffer *_audit_log_start(int); void audit_log_end(struct audit_buffer *); void audit_log_format(struct audit_buffer *, const char *, ...); void audit_log_untrustedstring(struct audit_buffer *, const char *); +#define audit_log_start(ac, mf, af) _audit_log_start(mf) +#define audit_log(ac, mf, af, ...) do { \ + mtx_lock(&avc_log_lock); \ + printf(__VA_ARGS__); \ + printf("\n"); \ + mtx_unlock(&avc_log_lock); \ +} while (0) +#define sebsd_log(fmt, ...) printf(fmt "\n", __VA_ARGS__) + +/* we don't enable the selinux netlbl support */ +#define selinux_netlbl_cache_invalidate() /* * Atomic integer operations, Linux style */ +typedef unsigned int atomic_t; #define atomic_inc(p) atomic_add_acq_32(p, 1) #define atomic_inc_return(p) atomic_fetchadd_32(p, 1) #define atomic_dec(p) atomic_subtract_acq_32(p, 1) @@ -150,8 +154,6 @@ /* FreeBSD has index() not strchr() in the kernel. */ #define strchr(s, c) index(s, c) -#endif /* _KERNEL */ - #define BUG() printf("BUG: %s:%d", __FILE__, __LINE__) #define BUG_ON(x) do { if (x) BUG(); } while(0) From owner-p4-projects@FreeBSD.ORG Thu Feb 15 20:30:15 2007 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 1F2ED16A408; Thu, 15 Feb 2007 20:30:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C6C7416A400 for ; Thu, 15 Feb 2007 20:30:14 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B6BFD13C48E for ; Thu, 15 Feb 2007 20:30:14 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1FKUEYM073953 for ; Thu, 15 Feb 2007 20:30:14 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1FKUETx073950 for perforce@freebsd.org; Thu, 15 Feb 2007 20:30:14 GMT (envelope-from millert@freebsd.org) Date: Thu, 15 Feb 2007 20:30:14 GMT Message-Id: <200702152030.l1FKUETx073950@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 114585 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, 15 Feb 2007 20:30:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=114585 Change 114585 by millert@millert_p4 on 2007/02/15 20:29:16 Implement more networking entrypoints. Comment out entrypoints that are not currently supported by the reference policy. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#44 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#44 (text+ko) ==== @@ -119,6 +119,22 @@ return perm; } +static void +copy_network_label(struct label *src, struct label *dest) +{ + if (src == NULL) + printf("copy_network_label: src is NULL\n"); + if (dest == NULL) + printf("copy_network_label: dest is NULL\n"); + if (SLOT(dest) == NULL) + printf("copy_network_label: slot(dest) is NULL\n"); + if (SLOT(src) == NULL) + printf("copy_network_label: slot(src) is NULL\n"); + + *(struct network_security_struct *) SLOT(dest) = + *(struct network_security_struct *) SLOT(src); +} + /* * Check whether a task is allowed to use a capability. */ @@ -430,6 +446,14 @@ } static void +sebsd_relabel_ifnet(struct ucred *cred, struct ifnet *ifn, + struct label *ilabel, struct label *newlabel) +{ + + copy_network_label(newlabel, ilabel); +} + +static void sebsd_cleanup_sysv_label(struct label *label) { struct ipc_security_struct *ipcsec; @@ -572,7 +596,106 @@ fsec->sid = tsec->sid; } +#if 0 +static void +sebsd_create_fragment(struct mbuf *datagram, struct label *dlabel, + struct mbuf *frag, struct label *flabel) +{ + + copy_network_label(dlabel, flabel); +} +#endif + +/* + * XXX: What's are sensible values to assign to an interface? + */ +static void +sebsd_create_ifnet(struct ifnet *ifn, struct label *iflabel) +{ + + struct network_security_struct *nsec; + + nsec = SLOT(iflabel); + nsec->sid = 0; + nsec->task_sid = 0; +} + static void +sebsd_create_inpcb_from_socket(struct socket *so, struct label *solabel, + struct inpcb *inp, struct label *ilabel) +{ + + copy_network_label(solabel, ilabel); +} + +#if 0 +static void +sebsd_create_ipq(struct mbuf *frag, struct label *fraglabel, struct ipq *ipq, + struct label *ipqlabel) +{ + + copy_network_label(fraglabel, ipqlabel); +} + +static void +sebsd_create_mbuf_from_bpfdesc(struct bpf_d *b, struct label *blabel, + struct mbuf *m, struct label *mlabel) +{ + + copy_network_label(blabel, mlabel); +} + +static void +sebsd_create_mbuf_from_ifnet(struct ifnet *ifn, struct label *ilabel, + struct mbuf *m, struct label *mlabel) +{ + + copy_network_label(ilabel, mlabel); +} + +static void +sebsd_create_mbuf_from_inpcb(struct inpcb *in, struct label *ilabel, + struct mbuf *m, struct label *mlabel) +{ + + copy_network_label(ilabel, mlabel); +} + +static void +sebsd_create_mbuf_linklayer(struct ifnet *ifn, struct label *iflabel, + struct mbuf *m, struct label *mlabel) +{ + + copy_network_label(iflabel, mlabel); +} + +static void +sebsd_create_mbuf_netlayer(struct mbuf *oldmbuf, struct label *oldlabel, + struct mbuf *newmbuf, struct label *newlabel) +{ + + copy_network_label(oldlabel, newlabel); +} + +static void +sebsd_create_mbuf_multicast_encap(struct mbuf *oldmbuf, struct label *oldlabel, + struct ifnet *ifn, struct label *iflabel, struct mbuf *newmbuf, + struct label *newlabel) +{ + + copy_network_label(oldlabel, newlabel); +} + +static void +sebsd_create_datagram_from_ipq(struct ipq *ipq, struct label *ipqlabel, + struct mbuf *datagram, struct label *datagramlabel) +{ + + copy_network_label(ipqlabel, datagramlabel); +} +#endif + +static void sebsd_create_sysv_msgmsg(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqlabel, struct msg *msgptr, struct label *msglabel) { @@ -653,7 +776,20 @@ ipcsec = SLOT(ks_label); ipcsec->sid = tsec->sid; - ipcsec->sclass = SECCLASS_POSIX_SEM; + ipcsec->sclass = SECCLASS_SEM; +} + +static void +sebsd_create_bpfdesc(struct ucred *cred, struct bpf_d *b, + struct label *blabel) +{ + struct network_security_struct *nsec; + struct task_security_struct *tsec; + + nsec = SLOT(blabel); + tsec = SLOT(cred->cr_label); + + nsec->sid = nsec->task_sid = tsec->sid; } static void @@ -834,7 +970,17 @@ SECINITSID_KERNEL); } +#if 0 static void +sebsd_create_mbuf_from_socket(struct socket *so, struct label *solabel, + struct mbuf *m, struct label *mlabel) +{ + + copy_network_label(solabel, mlabel); +} +#endif + +static void sebsd_create_mount(struct ucred *cred, struct mount *mp, struct label *mntlabel, struct label *fslabel, struct label *mount_arg_label) @@ -922,6 +1068,26 @@ } } +static void +sebsd_create_socket(struct ucred *cred, struct socket *so, + struct label *solabel) +{ + struct task_security_struct *tsec; + struct network_security_struct *nsec; + + tsec = SLOT(cred->cr_label); + nsec = SLOT(solabel); + nsec->sid = nsec->task_sid = tsec->sid; +} + +static void +sebsd_create_socket_from_socket(struct socket *olds, struct label *oldslabel, + struct socket *news, struct label *newslabel) +{ + + copy_network_label(oldslabel, newslabel); +} + static int sebsd_create_vnode_extattr(struct ucred *cred, struct mount *mp, struct label *fslabel, struct vnode *parent, struct label *parentlabel, @@ -959,8 +1125,26 @@ security_free_context(context); return (error); +} + +#if 0 +static void +sebsd_update_ipq(struct mbuf *frag, struct label *fraglabel, struct ipq *ipq, + struct label *ipqlabel) +{ + + copy_network_label(fraglabel, ipqlabel); } +#endif + +static void +sebsd_inpcb_sosetlabel(struct socket *so, struct label *solabel, + struct inpcb *inp, struct label *ilabel) +{ + copy_network_label(solabel, ilabel); +} + static int sebsd_check_cap(struct ucred *cred, cap_value_t capv) { @@ -1060,6 +1244,7 @@ return (pipe_has_perm(cred, pp, FIFO_FILE__IOCTL)); } +#if 0 static int sebsd_check_pipe_poll(struct ucred *cred, struct pipepair *pp, struct label *pipelabel) @@ -1067,6 +1252,7 @@ return (pipe_has_perm(cred, pp, FIFO_FILE__POLL)); } +#endif static int sebsd_check_pipe_read(struct ucred *cred, struct pipepair *pp, @@ -1359,6 +1545,14 @@ } static void +sebsd_relabel_socket(struct ucred *cred, struct socket *so, + struct label *oldlabel, struct label *newlabel) +{ + + copy_network_label(oldlabel, newlabel); +} + +static void sebsd_relabel_vnode(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, struct label *label) { @@ -1402,6 +1596,24 @@ return (error); } +#if 0 +static void +sebsd_set_socket_peer_from_mbuf(struct mbuf *m, struct label *mlabel, + struct socket *so, struct label *sopeerlabel) +{ + + copy_network_label(mlabel, sopeerlabel); +} +#endif + +static void +sebsd_set_socket_peer_from_socket(struct socket *olds, struct label *oldslabel, + struct socket *news, struct label *newsockpeerlabel) +{ + + copy_network_label(oldslabel, newsockpeerlabel); +} + static int sebsd_check_vnode_access(struct ucred *cred, struct vnode *vp, struct label *label, int acc_mode) @@ -1644,6 +1856,7 @@ acc_mode))); } +#if 0 static int sebsd_check_vnode_poll(struct ucred *cred, struct ucred *file_cred, struct vnode *vp, struct label *label) @@ -1651,6 +1864,7 @@ return (vnode_has_perm(cred, vp, FILE__POLL)); } +#endif static int sebsd_check_vnode_read(struct ucred *cred, struct ucred *file_cred, @@ -2053,6 +2267,7 @@ *(struct mount_security_struct *)SLOT(src); } +#if 0 static int sebsd_check_file_create(struct ucred *cred) { @@ -2062,6 +2277,7 @@ return (avc_has_perm(tsec->sid, tsec->sid, SECCLASS_FD, FD__CREATE, NULL)); } +#endif static int sebsd_check_file_ioctl(struct ucred *cred, struct file *fp, @@ -2192,6 +2408,7 @@ return (ipc_has_perm(cred, msglabel, MSG__RECEIVE)); } +#if 0 static int sebsd_check_sysv_msgrmid(struct ucred *cred, struct msg *msgptr, struct label *msglabel) @@ -2199,6 +2416,7 @@ return (ipc_has_perm(cred, msglabel, MSG__DESTROY)); } +#endif static int sebsd_check_sysv_msqget(struct ucred *cred, struct msqid_kernel *msqkptr, @@ -2400,7 +2618,7 @@ struct label *ks_label) { - return (ipc_has_perm(cred, ks_label, POSIX_SEM__DISASSOCIATE)); + return (ipc_has_perm(cred, ks_label, SEM__DISASSOCIATE)); } #endif @@ -2409,7 +2627,7 @@ struct label *ks_label) { - return (ipc_has_perm(cred, ks_label, POSIX_SEM__DESTROY)); + return (ipc_has_perm(cred, ks_label, SEM__DESTROY)); } static int @@ -2417,7 +2635,7 @@ struct label *ks_label) { - return (ipc_has_perm(cred, ks_label, POSIX_SEM__READ)); + return (ipc_has_perm(cred, ks_label, SEM__READ)); } static int @@ -2425,7 +2643,7 @@ struct label *ks_label) { - return (ipc_has_perm(cred, ks_label, POSIX_SEM__ASSOCIATE)); + return (ipc_has_perm(cred, ks_label, SEM__ASSOCIATE)); } static int @@ -2433,7 +2651,7 @@ struct label *ks_label) { - return (ipc_has_perm(cred, ks_label, POSIX_SEM__WRITE)); + return (ipc_has_perm(cred, ks_label, SEM__WRITE)); } static int @@ -2441,7 +2659,7 @@ struct label *ks_label) { - return (ipc_has_perm(cred, ks_label, POSIX_SEM__DESTROY)); + return (ipc_has_perm(cred, ks_label, SEM__DESTROY)); } static int @@ -2449,7 +2667,7 @@ struct label *ks_label) { - return (ipc_has_perm(cred, ks_label, POSIX_SEM__WRITE)); + return (ipc_has_perm(cred, ks_label, SEM__WRITE)); } static struct mac_policy_ops sebsd_ops = { @@ -2460,12 +2678,13 @@ .mpo_init_devfsdirent_label = sebsd_init_vnode_label, .mpo_init_file_label = sebsd_init_file_label, .mpo_init_ifnet_label = sebsd_init_network_label, + .mpo_init_inpcb_label = sebsd_init_network_label_waitcheck, .mpo_init_sysv_msgmsg_label = sebsd_init_sysv_label, .mpo_init_sysv_msgqueue_label = sebsd_init_sysv_label, .mpo_init_sysv_sem_label = sebsd_init_sysv_label, .mpo_init_sysv_shm_label = sebsd_init_sysv_label, - .mpo_init_ipq_label = sebsd_init_network_label_waitcheck, - .mpo_init_mbuf_label = sebsd_init_network_label_waitcheck, + //.mpo_init_ipq_label = sebsd_init_network_label_waitcheck, + //.mpo_init_mbuf_label = sebsd_init_network_label_waitcheck, .mpo_init_mount_label = sebsd_init_mount_label, .mpo_init_mount_fs_label = sebsd_init_mount_fs_label, .mpo_init_pipe_label = sebsd_init_vnode_label, @@ -2480,12 +2699,13 @@ .mpo_destroy_cred_label = sebsd_destroy_label, .mpo_destroy_devfsdirent_label = sebsd_destroy_label, .mpo_destroy_ifnet_label = sebsd_destroy_label, + .mpo_destroy_inpcb_label = sebsd_destroy_label, .mpo_destroy_sysv_msgmsg_label = sebsd_destroy_label, .mpo_destroy_sysv_msgqueue_label = sebsd_destroy_label, .mpo_destroy_sysv_sem_label = sebsd_destroy_label, .mpo_destroy_sysv_shm_label = sebsd_destroy_label, - .mpo_destroy_ipq_label = sebsd_destroy_label, - .mpo_destroy_mbuf_label = sebsd_destroy_label, + //.mpo_destroy_ipq_label = sebsd_destroy_label, + //.mpo_destroy_mbuf_label = sebsd_destroy_label, .mpo_destroy_file_label = sebsd_destroy_label, .mpo_destroy_mount_label = sebsd_destroy_label, .mpo_destroy_mount_fs_label = sebsd_destroy_label, @@ -2496,7 +2716,10 @@ .mpo_destroy_vnode_label = sebsd_destroy_label, /* Copy labels */ + .mpo_copy_ifnet_label = copy_network_label, + //.mpo_copy_mbuf_label = copy_network_label, .mpo_copy_pipe_label = sebsd_copy_vnode_label, + .mpo_copy_socket_label = copy_network_label, .mpo_copy_vnode_label = sebsd_copy_vnode_label, .mpo_copy_mount_label = sebsd_copy_mount_label, @@ -2515,45 +2738,40 @@ .mpo_internalize_vnode_label = sebsd_internalize_vnode_label, .mpo_internalize_mount_label = sebsd_internalize_mount_label, -#ifdef notdef - void (*mpo_create_mbuf_from_socket)(struct socket *so, - struct label *socketlabel, struct mbuf *m, - struct label *mbuflabel); - void (*mpo_create_socket)(struct ucred *cred, struct socket *so, - struct label *socketlabel); - void (*mpo_create_socket_from_socket)(struct socket *oldsocket, - struct label *oldsocketlabel, struct socket *newsocket, - struct label *newsocketlabel); - void (*mpo_relabel_socket)(struct ucred *cred, struct socket *so, - struct label *oldlabel, struct label *newlabel); - void (*mpo_set_socket_peer_from_mbuf)(struct mbuf *mbuf, - struct label *mbuflabel, struct socket *so, - struct label *socketpeerlabel); - void (*mpo_set_socket_peer_from_socket)(struct socket *oldsocket, - struct label *oldsocketlabel, struct socket *newsocket, - struct label *newsocketpeerlabel); -#endif - /* Create Labels */ .mpo_copy_cred_label = sebsd_copy_cred_label, + .mpo_create_bpfdesc = sebsd_create_bpfdesc, + //.mpo_create_datagram_from_ipq = sebsd_create_datagram_from_ipq, .mpo_create_devfs_device = sebsd_create_devfs_device, .mpo_create_devfs_directory = sebsd_create_devfs_directory, .mpo_create_devfs_symlink = sebsd_create_devfs_symlink, .mpo_create_file = sebsd_create_file, - .mpo_create_sysv_msgmsg = sebsd_create_sysv_msgmsg, - .mpo_create_sysv_msgqueue = sebsd_create_sysv_msgqueue, - .mpo_create_sysv_sem = sebsd_create_sysv_sem, - .mpo_create_sysv_shm = sebsd_create_sysv_shm, - /* .mpo_create_mbuf_from_socket = sebsd_create_mbuf_from_socket, */ + //.mpo_create_fragment = sebsd_create_fragment, + .mpo_create_ifnet = sebsd_create_ifnet, + .mpo_create_inpcb_from_socket = sebsd_create_inpcb_from_socket, + //.mpo_create_ipq = sebsd_create_ipq, + //.mpo_create_mbuf_from_bpfdesc = sebsd_create_mbuf_from_bpfdesc, + //.mpo_create_mbuf_from_ifnet = sebsd_create_mbuf_from_ifnet, + //.mpo_create_mbuf_from_inpcb = sebsd_create_mbuf_from_inpcb, + //.mpo_create_mbuf_multicast_encap = sebsd_create_mbuf_multicast_encap, + //.mpo_create_mbuf_from_socket = sebsd_create_mbuf_from_socket, + //.mpo_create_mbuf_linklayer = sebsd_create_mbuf_linklayer, + //.mpo_create_mbuf_netlayer = sebsd_create_mbuf_netlayer, .mpo_create_mount = sebsd_create_mount, .mpo_create_pipe = sebsd_create_pipe, .mpo_create_posix_sem = sebsd_create_posix_sem, .mpo_create_proc0 = sebsd_create_kernel_proc, .mpo_create_proc1 = sebsd_create_kernel_proc, - /* .mpo_create_socket = sebsd_create_socket, */ - /* .mpo_create_socket_from_socket = sebsd_create_socket_from_socket, */ + .mpo_create_socket = sebsd_create_socket, + .mpo_create_socket_from_socket = sebsd_create_socket_from_socket, + .mpo_create_sysv_msgmsg = sebsd_create_sysv_msgmsg, + .mpo_create_sysv_msgqueue = sebsd_create_sysv_msgqueue, + .mpo_create_sysv_sem = sebsd_create_sysv_sem, + .mpo_create_sysv_shm = sebsd_create_sysv_shm, .mpo_create_vnode_extattr = sebsd_create_vnode_extattr, .mpo_update_devfsdirent = sebsd_update_devfsdirent, + //.mpo_update_ipq = sebsd_update_ipq, + .mpo_inpcb_sosetlabel = sebsd_inpcb_sosetlabel, .mpo_associate_vnode_devfs = sebsd_associate_vnode_devfs, .mpo_associate_vnode_singlelabel = sebsd_associate_vnode_singlelabel, .mpo_associate_vnode_extattr = sebsd_associate_vnode_extattr, @@ -2561,7 +2779,7 @@ /* Check Labels */ .mpo_check_cap = sebsd_check_cap, .mpo_check_cred_relabel = sebsd_check_cred_relabel, - .mpo_check_file_create = sebsd_check_file_create, + /* .mpo_check_file_create = sebsd_check_file_create, */ .mpo_check_file_ioctl = sebsd_check_file_ioctl, /* @@ -2580,7 +2798,7 @@ .mpo_check_remount = sebsd_check_remount, .mpo_check_sysv_msgmsq = sebsd_check_sysv_msgmsq, .mpo_check_sysv_msgrcv = sebsd_check_sysv_msgrcv, - .mpo_check_sysv_msgrmid = sebsd_check_sysv_msgrmid, + /* .mpo_check_sysv_msgrmid = sebsd_check_sysv_msgrmid, */ .mpo_check_sysv_msqget = sebsd_check_sysv_msqget, .mpo_check_sysv_msqsnd = sebsd_check_sysv_msqsnd, .mpo_check_sysv_msqrcv = sebsd_check_sysv_msqrcv, @@ -2595,7 +2813,7 @@ .mpo_check_mount_stat = sebsd_check_mount_stat, .mpo_check_pipe_ioctl = sebsd_check_pipe_ioctl, - .mpo_check_pipe_poll = sebsd_check_pipe_poll, + /* .mpo_check_pipe_poll = sebsd_check_pipe_poll, */ .mpo_check_pipe_read = sebsd_check_pipe_read, .mpo_check_pipe_relabel = sebsd_check_pipe_relabel, .mpo_check_pipe_stat = sebsd_check_pipe_stat, @@ -2644,7 +2862,7 @@ .mpo_check_vnode_mprotect = sebsd_check_vnode_mmap, #endif .mpo_check_vnode_open = sebsd_check_vnode_open, - .mpo_check_vnode_poll = sebsd_check_vnode_poll, + /* .mpo_check_vnode_poll = sebsd_check_vnode_poll, */ .mpo_check_vnode_read = sebsd_check_vnode_read, .mpo_check_vnode_readdir = sebsd_check_vnode_readdir, .mpo_check_vnode_readlink = sebsd_check_vnode_readlink, @@ -2665,12 +2883,13 @@ .mpo_execve_transition = sebsd_execve_transition, .mpo_execve_will_transition = sebsd_execve_will_transition, .mpo_relabel_cred = sebsd_relabel_cred, + .mpo_relabel_ifnet = sebsd_relabel_ifnet, .mpo_relabel_pipe = sebsd_relabel_pipe, - /* .mpo_relabel_socket = sebsd_relabel_socket, */ + .mpo_relabel_socket = sebsd_relabel_socket, .mpo_relabel_vnode = sebsd_relabel_vnode, .mpo_setlabel_vnode_extattr = sebsd_setlabel_vnode_extattr, - /*.mpo_set_socket_peer_from_mbuf = sebsd_set_socket_peer_from_mbuf,*/ - /*.mpo_set_socket_peer_from_socket = sebsd_set_socket_peer_from_socket,*/ + //.mpo_set_socket_peer_from_mbuf = sebsd_set_socket_peer_from_mbuf, + .mpo_set_socket_peer_from_socket = sebsd_set_socket_peer_from_socket, .mpo_cleanup_sysv_msgmsg = sebsd_cleanup_sysv_label, .mpo_cleanup_sysv_msgqueue = sebsd_cleanup_sysv_label, .mpo_cleanup_sysv_sem = sebsd_cleanup_sysv_label, From owner-p4-projects@FreeBSD.ORG Thu Feb 15 20:47:37 2007 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 9383C16A46B; Thu, 15 Feb 2007 20:47:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4102D16A41F for ; Thu, 15 Feb 2007 20:47:37 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1A27913C481 for ; Thu, 15 Feb 2007 20:47:37 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1FKlanX085258 for ; Thu, 15 Feb 2007 20:47:36 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1FKla9m085255 for perforce@freebsd.org; Thu, 15 Feb 2007 20:47:36 GMT (envelope-from millert@freebsd.org) Date: Thu, 15 Feb 2007 20:47:36 GMT Message-Id: <200702152047.l1FKla9m085255@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 114586 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, 15 Feb 2007 20:47:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=114586 Change 114586 by millert@millert_p4 on 2007/02/15 20:47:11 Crank the binary policy version number Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/boot/forth/loader.conf.sebsd#6 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/boot/forth/loader.conf.sebsd#6 (text+ko) ==== @@ -10,4 +10,4 @@ # Default SEBSD policy location: # Note: This ONLY supports the default targeted policy. -sebsdpolicy_name="/etc/security/sebsd/targeted/policy/policy.20" +sebsdpolicy_name="/etc/security/sebsd/targeted/policy/policy.21" From owner-p4-projects@FreeBSD.ORG Thu Feb 15 22:36:04 2007 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 9981116A402; Thu, 15 Feb 2007 22:36:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 448EB16A400 for ; Thu, 15 Feb 2007 22:36:04 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 355F113C481 for ; Thu, 15 Feb 2007 22:36:04 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1FMa4eO007143 for ; Thu, 15 Feb 2007 22:36:04 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1FMa1NQ007140 for perforce@freebsd.org; Thu, 15 Feb 2007 22:36:01 GMT (envelope-from mjacob@freebsd.org) Date: Thu, 15 Feb 2007 22:36:01 GMT Message-Id: <200702152236.l1FMa1NQ007140@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 114596 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, 15 Feb 2007 22:36:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=114596 Change 114596 by mjacob@mjexp on 2007/02/15 22:34:56 IFC Affected files ... .. //depot/projects/mjexp/ObsoleteFiles.inc#8 integrate .. //depot/projects/mjexp/UPDATING#6 integrate .. //depot/projects/mjexp/etc/devd.conf#2 integrate .. //depot/projects/mjexp/etc/rc.d/dhclient#3 integrate .. //depot/projects/mjexp/etc/rc.d/hostname#2 integrate .. //depot/projects/mjexp/gnu/usr.bin/binutils/Makefile.inc0#2 integrate .. //depot/projects/mjexp/gnu/usr.bin/binutils/libbfd/bfd.h#2 integrate .. //depot/projects/mjexp/include/Makefile#6 integrate .. //depot/projects/mjexp/lib/libc/gen/getcap.3#3 integrate .. //depot/projects/mjexp/lib/libc/sys/kse.2#3 integrate .. //depot/projects/mjexp/lib/libypclnt/Makefile#2 integrate .. //depot/projects/mjexp/lib/libypclnt/ypclnt.3#1 branch .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#5 integrate .. //depot/projects/mjexp/sbin/ffsinfo/ffsinfo.c#2 integrate .. //depot/projects/mjexp/sbin/geom/class/journal/Makefile#2 integrate .. //depot/projects/mjexp/sbin/kldload/kldload.8#3 integrate .. //depot/projects/mjexp/sbin/kldstat/kldstat.8#2 integrate .. //depot/projects/mjexp/sbin/kldunload/kldunload.8#2 integrate .. //depot/projects/mjexp/sbin/mount_unionfs/Makefile#3 integrate .. //depot/projects/mjexp/sbin/mount_unionfs/mount_unionfs.c#4 integrate .. //depot/projects/mjexp/share/man/man4/Makefile#7 integrate .. //depot/projects/mjexp/share/man/man4/hwpmc.4#2 integrate .. //depot/projects/mjexp/share/man/man4/joy.4#4 integrate .. //depot/projects/mjexp/share/man/man4/kame.4#2 delete .. //depot/projects/mjexp/share/man/man4/kld.4#2 integrate .. //depot/projects/mjexp/share/man/man4/pim.4#2 integrate .. //depot/projects/mjexp/share/man/man9/Makefile#7 integrate .. //depot/projects/mjexp/sys/amd64/amd64/msi.c#3 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux.h#7 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_machdep.c#8 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_proto.h#7 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_syscall.h#7 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_sysent.c#7 integrate .. //depot/projects/mjexp/sys/amd64/linux32/syscalls.master#6 integrate .. //depot/projects/mjexp/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/mjexp/sys/arm/arm/cpufunc.c#5 integrate .. //depot/projects/mjexp/sys/arm/arm/db_interface.c#2 integrate .. //depot/projects/mjexp/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/mjexp/sys/arm/arm/mem.c#2 integrate .. //depot/projects/mjexp/sys/arm/arm/sys_machdep.c#2 integrate .. //depot/projects/mjexp/sys/arm/at91/if_ate.c#7 integrate .. //depot/projects/mjexp/sys/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/mjexp/sys/arm/xscale/ixp425/ixp425_npe.c#2 integrate .. //depot/projects/mjexp/sys/conf/NOTES#12 integrate .. //depot/projects/mjexp/sys/conf/files#12 integrate .. //depot/projects/mjexp/sys/conf/options#11 integrate .. //depot/projects/mjexp/sys/dev/aac/aac.c#2 integrate .. //depot/projects/mjexp/sys/dev/arcmsr/arcmsr.c#5 integrate .. //depot/projects/mjexp/sys/dev/arcmsr/arcmsr.h#3 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/mjexp/sys/dev/bge/if_bge.c#8 integrate .. //depot/projects/mjexp/sys/dev/bge/if_bgereg.h#6 integrate .. //depot/projects/mjexp/sys/dev/exca/exca.c#2 integrate .. //depot/projects/mjexp/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/mjexp/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.h#7 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_pci.c#12 integrate .. //depot/projects/mjexp/sys/dev/iwi/if_iwi.c#7 integrate .. //depot/projects/mjexp/sys/dev/iwi/if_iwivar.h#2 integrate .. //depot/projects/mjexp/sys/dev/mii/brgphy.c#6 integrate .. //depot/projects/mjexp/sys/dev/mii/brgphyreg.h#2 integrate .. //depot/projects/mjexp/sys/dev/mpt/mpt_pci.c#6 integrate .. //depot/projects/mjexp/sys/dev/msk/if_msk.c#3 integrate .. //depot/projects/mjexp/sys/dev/mxge/if_mxge.c#6 integrate .. //depot/projects/mjexp/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/mjexp/sys/dev/pci/pci.c#10 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/envy24.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/envy24ht.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/spicds.c#2 integrate .. //depot/projects/mjexp/sys/fs/cd9660/TODO#2 integrate .. //depot/projects/mjexp/sys/fs/cd9660/TODO.hibler#2 integrate .. //depot/projects/mjexp/sys/fs/cd9660/cd9660_bmap.c#2 integrate .. //depot/projects/mjexp/sys/fs/cd9660/cd9660_iconv.c#2 integrate .. //depot/projects/mjexp/sys/fs/cd9660/cd9660_lookup.c#2 integrate .. //depot/projects/mjexp/sys/fs/cd9660/cd9660_mount.h#2 integrate .. //depot/projects/mjexp/sys/fs/cd9660/cd9660_node.c#2 integrate .. //depot/projects/mjexp/sys/fs/cd9660/cd9660_node.h#2 integrate .. //depot/projects/mjexp/sys/fs/cd9660/cd9660_rrip.c#2 integrate .. //depot/projects/mjexp/sys/fs/cd9660/cd9660_rrip.h#2 integrate .. //depot/projects/mjexp/sys/fs/cd9660/cd9660_util.c#2 integrate .. //depot/projects/mjexp/sys/fs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/mjexp/sys/fs/cd9660/cd9660_vnops.c#2 integrate .. //depot/projects/mjexp/sys/fs/cd9660/iso.h#2 integrate .. //depot/projects/mjexp/sys/fs/cd9660/iso_rrip.h#2 integrate .. //depot/projects/mjexp/sys/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/mjexp/sys/fs/hpfs/hpfs_vnops.c#3 integrate .. //depot/projects/mjexp/sys/fs/msdosfs/msdosfs_vfsops.c#7 integrate .. //depot/projects/mjexp/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate .. //depot/projects/mjexp/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/mjexp/sys/fs/ntfs/ntfs_vnops.c#4 integrate .. //depot/projects/mjexp/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/mjexp/sys/fs/nullfs/null_vnops.c#3 integrate .. //depot/projects/mjexp/sys/fs/udf/udf.h#2 integrate .. //depot/projects/mjexp/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/mjexp/sys/fs/udf/udf_vnops.c#4 integrate .. //depot/projects/mjexp/sys/fs/umapfs/umap_vfsops.c#3 integrate .. //depot/projects/mjexp/sys/fs/umapfs/umap_vnops.c#2 integrate .. //depot/projects/mjexp/sys/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/mjexp/sys/fs/unionfs/union_vnops.c#4 integrate .. //depot/projects/mjexp/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/mjexp/sys/gnu/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/mjexp/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate .. //depot/projects/mjexp/sys/gnu/fs/reiserfs/reiserfs_vnops.c#2 integrate .. //depot/projects/mjexp/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate .. //depot/projects/mjexp/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/mjexp/sys/i386/i386/msi.c#3 integrate .. //depot/projects/mjexp/sys/i386/linux/linux.h#6 integrate .. //depot/projects/mjexp/sys/i386/linux/linux_machdep.c#8 integrate .. //depot/projects/mjexp/sys/i386/linux/linux_proto.h#7 integrate .. //depot/projects/mjexp/sys/i386/linux/linux_syscall.h#6 integrate .. //depot/projects/mjexp/sys/i386/linux/linux_sysent.c#6 integrate .. //depot/projects/mjexp/sys/i386/linux/syscalls.master#6 integrate .. //depot/projects/mjexp/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/mjexp/sys/isofs/cd9660/TODO#2 delete .. //depot/projects/mjexp/sys/isofs/cd9660/TODO.hibler#2 delete .. //depot/projects/mjexp/sys/isofs/cd9660/cd9660_bmap.c#2 delete .. //depot/projects/mjexp/sys/isofs/cd9660/cd9660_iconv.c#2 delete .. //depot/projects/mjexp/sys/isofs/cd9660/cd9660_lookup.c#2 delete .. //depot/projects/mjexp/sys/isofs/cd9660/cd9660_mount.h#2 delete .. //depot/projects/mjexp/sys/isofs/cd9660/cd9660_node.c#2 delete .. //depot/projects/mjexp/sys/isofs/cd9660/cd9660_node.h#3 delete .. //depot/projects/mjexp/sys/isofs/cd9660/cd9660_rrip.c#2 delete .. //depot/projects/mjexp/sys/isofs/cd9660/cd9660_rrip.h#2 delete .. //depot/projects/mjexp/sys/isofs/cd9660/cd9660_util.c#2 delete .. //depot/projects/mjexp/sys/isofs/cd9660/cd9660_vfsops.c#3 delete .. //depot/projects/mjexp/sys/isofs/cd9660/cd9660_vnops.c#2 delete .. //depot/projects/mjexp/sys/isofs/cd9660/iso.h#2 delete .. //depot/projects/mjexp/sys/isofs/cd9660/iso_rrip.h#2 delete .. //depot/projects/mjexp/sys/kern/Make.tags.inc#3 integrate .. //depot/projects/mjexp/sys/kern/kern_descrip.c#5 integrate .. //depot/projects/mjexp/sys/kern/kern_ktrace.c#6 integrate .. //depot/projects/mjexp/sys/kern/subr_firmware.c#4 integrate .. //depot/projects/mjexp/sys/kern/uipc_debug.c#1 branch .. //depot/projects/mjexp/sys/kern/uipc_socket.c#8 integrate .. //depot/projects/mjexp/sys/kern/uipc_usrreq.c#6 integrate .. //depot/projects/mjexp/sys/kern/vfs_default.c#3 integrate .. //depot/projects/mjexp/sys/kern/vfs_export.c#5 integrate .. //depot/projects/mjexp/sys/kern/vfs_init.c#2 integrate .. //depot/projects/mjexp/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/mjexp/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/mjexp/sys/kern/vfs_syscalls.c#6 integrate .. //depot/projects/mjexp/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/mjexp/sys/kern/vnode_if.src#3 integrate .. //depot/projects/mjexp/sys/modules/cd9660/Makefile#2 integrate .. //depot/projects/mjexp/sys/modules/cd9660_iconv/Makefile#2 integrate .. //depot/projects/mjexp/sys/netinet/in_proto.c#3 integrate .. //depot/projects/mjexp/sys/netinet/ip_mroute.c#5 integrate .. //depot/projects/mjexp/sys/netinet/sctp_asconf.c#5 integrate .. //depot/projects/mjexp/sys/netinet/sctp_auth.c#4 integrate .. //depot/projects/mjexp/sys/netinet/sctp_auth.h#2 integrate .. //depot/projects/mjexp/sys/netinet/sctp_constants.h#4 integrate .. //depot/projects/mjexp/sys/netinet/sctp_crc32.c#3 integrate .. //depot/projects/mjexp/sys/netinet/sctp_indata.c#5 integrate .. //depot/projects/mjexp/sys/netinet/sctp_input.c#5 integrate .. //depot/projects/mjexp/sys/netinet/sctp_os.h#4 integrate .. //depot/projects/mjexp/sys/netinet/sctp_os_bsd.h#5 integrate .. //depot/projects/mjexp/sys/netinet/sctp_output.c#5 integrate .. //depot/projects/mjexp/sys/netinet/sctp_pcb.c#5 integrate .. //depot/projects/mjexp/sys/netinet/sctp_peeloff.c#4 integrate .. //depot/projects/mjexp/sys/netinet/sctp_structs.h#5 integrate .. //depot/projects/mjexp/sys/netinet/sctp_timer.c#5 integrate .. //depot/projects/mjexp/sys/netinet/sctp_uio.h#4 integrate .. //depot/projects/mjexp/sys/netinet/sctp_usrreq.c#5 integrate .. //depot/projects/mjexp/sys/netinet/sctp_var.h#4 integrate .. //depot/projects/mjexp/sys/netinet/sctputil.c#5 integrate .. //depot/projects/mjexp/sys/netinet/sctputil.h#4 integrate .. //depot/projects/mjexp/sys/netinet6/icmp6.c#4 integrate .. //depot/projects/mjexp/sys/netinet6/sctp6_usrreq.c#5 integrate .. //depot/projects/mjexp/sys/nfsclient/nfs_socket.c#4 integrate .. //depot/projects/mjexp/sys/nfsserver/nfs_serv.c#4 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/machdep.c#5 integrate .. //depot/projects/mjexp/sys/security/mac_biba/mac_biba.c#5 integrate .. //depot/projects/mjexp/sys/sys/firmware.h#2 integrate .. //depot/projects/mjexp/sys/sys/mount.h#5 integrate .. //depot/projects/mjexp/sys/sys/systm.h#6 integrate .. //depot/projects/mjexp/sys/sys/vnode.h#4 integrate .. //depot/projects/mjexp/sys/tools/fw_stub.awk#2 integrate .. //depot/projects/mjexp/sys/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/mjexp/sys/ufs/ffs/ffs_vnops.c#4 integrate .. //depot/projects/mjexp/sys/ufs/ufs/ufs_quota.c#5 integrate .. //depot/projects/mjexp/sys/vm/uma.h#4 integrate .. //depot/projects/mjexp/sys/vm/uma_core.c#6 integrate .. //depot/projects/mjexp/sys/vm/vm_page.c#6 integrate .. //depot/projects/mjexp/sys/vm/vm_zeroidle.c#6 integrate .. //depot/projects/mjexp/usr.bin/gzip/Makefile#2 integrate .. //depot/projects/mjexp/usr.bin/gzip/zgrep#2 delete .. //depot/projects/mjexp/usr.bin/gzip/zgrep.1#2 delete .. //depot/projects/mjexp/usr.bin/ktrace/ktrace.c#2 integrate .. //depot/projects/mjexp/usr.bin/netstat/route.c#3 integrate .. //depot/projects/mjexp/usr.bin/quota/quota.1#3 integrate .. //depot/projects/mjexp/usr.bin/quota/quota.c#4 integrate .. //depot/projects/mjexp/usr.bin/tar/write.c#5 integrate .. //depot/projects/mjexp/usr.sbin/pstat/pstat.c#2 integrate .. //depot/projects/mjexp/usr.sbin/rpc.ypupdated/update.c#2 integrate Differences ... ==== //depot/projects/mjexp/ObsoleteFiles.inc#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.71 2007/02/01 08:45:26 rafan Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.73 2007/02/12 21:41:17 brueffer Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070212: kame.4 removed +OLD_FILES+=usr/share/man/man4/kame.4.gz # 20070201: remove libmytinfo link OLD_FILES+=usr/lib/libmytinfo.a OLD_FILES+=usr/lib/libmytinfo.so @@ -33,7 +35,7 @@ OLD_FILES+=usr/lib/libalias_pptp.so OLD_FILES+=usr/lib/libalias_skinny.so OLD_FILES+=usr/lib/libalias_smedia.so -# 20061201: remove old *.so.4 liablias modules +# 20061201: remove old *.so.4 libalias modules OLD_FILES+=lib/libalias_cuseeme.so.4 OLD_FILES+=lib/libalias_dummy.so.4 OLD_FILES+=lib/libalias_ftp.so.4 ==== //depot/projects/mjexp/UPDATING#6 (text+ko) ==== @@ -21,6 +21,24 @@ developers choose to disable these features on build machines to maximize performance. +20070214: + The output of netstat -r has changed. Without -n, we now only + print a "network name" without the prefix length if the network + address and mask exactly match a Class A/B/C network, and an entry + exists in the nsswitch "networks" map. + With -n, we print the full unabbreviated CIDR network prefix in + the form "a.b.c.d/p". 0.0.0.0/0 is always printed as "default". + This change is in preparation for changes such as equal-cost + multipath, and to more generally assist operational deployment + of FreeBSD as a modern IPv4 router. + +20070210: + PIM has been turned on by default in the IPv4 multicast + routing code. The kernel option 'PIM' has now been removed. + PIM is now built by default if option 'MROUTING' is specified. + It may now be loaded into GENERIC kernels by loading the + ip_mroute.ko module. + 20070207: Support for IPIP tunnels (VIFF_TUNNEL) in IPv4 multicast routing has been removed. Its functionality may be achieved by explicitly @@ -712,4 +730,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.471 2007/02/07 16:04:11 bms Exp $ +$FreeBSD: src/UPDATING,v 1.473 2007/02/14 14:17:01 bms Exp $ ==== //depot/projects/mjexp/etc/devd.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.33 2006/06/01 00:41:07 thompsa Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.34 2007/02/14 08:13:54 joerg Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -160,6 +160,36 @@ # action "logger Unknown device: $pnpinfo $location $bus"; }; +# Various logging of unknown devices. +nomatch 10 { + match "bus" "uhub[0-9]+"; + action "logger Unknown USB device: vendor $vendor product $product \ + bus $bus"; +}; + +# Some PC-CARDs don't offer numerical manufacturer/product IDs, just +# show the CIS info there. +nomatch 20 { + match "bus" "pccard[0-9]+"; + match "manufacturer" "0xffffffff"; + match "product" "0xffffffff"; + action "logger Unknown PCCARD device: CISproduct $cisproduct \ + CIS-vendor $cisvendor bus $bus"; +}; + +nomatch 10 { + match "bus" "pccard[0-9]+"; + action "logger Unknown PCCARD device: manufacturer $manufacturer \ + product $product CISproduct $cisproduct CIS-vendor \ + $cisvendor bus $bus"; +}; + +nomatch 10 { + match "bus" "cardbus[0-9]+"; + action "logger Unknown Cardbus device: device $device class $class \ + vendor $vendor bus $bus"; +}; + # Switch power profiles when the AC line state changes. notify 10 { match "system" "ACPI"; ==== //depot/projects/mjexp/etc/rc.d/dhclient#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.25 2006/10/02 18:50:58 brooks Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.26 2007/02/15 06:51:31 yar Exp $ # # PROVIDE: dhclient @@ -19,9 +19,9 @@ dhclient_start() { # prevent unnecessary restarts - # XXX: should use a pidfile - if [ -x /usr/bin/pgrep ]; then - pids=`/usr/bin/pgrep -f "dhclient: $ifn(\$| .*)"` + # XXX: dhclient had better create a pidfile + if [ -x /bin/pgrep ]; then + pids=`/bin/pgrep -f "dhclient: $ifn(\$| .*)"` if [ -n "$pids" ]; then exit 0 fi ==== //depot/projects/mjexp/etc/rc.d/hostname#2 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/hostname,v 1.8 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/hostname,v 1.11 2007/02/15 06:46:33 yar Exp $ # # PROVIDE: hostname @@ -31,6 +31,7 @@ # BEFORE: netif . /etc/rc.subr +. /etc/network.subr name="hostname" start_cmd="hostname_start" @@ -58,8 +59,21 @@ fi fi - /bin/hostname ${hostname} - echo "Setting hostname: `hostname`." + # Have we got a hostname yet? + # + if [ -z "${hostname}" ]; then + # Null hostname is probably OK if DHCP is in use. + # + if [ -z "`list_net_interfaces dhcp`" ]; then + warn "\$hostname is not set -- see ${rcvar_manpage}." + fi + return + fi + + # All right, it is safe to invoke hostname(1) now. + # + echo "Setting hostname: ${hostname}." + /bin/hostname "${hostname}" } load_rc_config $name ==== //depot/projects/mjexp/gnu/usr.bin/binutils/Makefile.inc0#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc0,v 1.37 2004/07/08 17:05:30 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc0,v 1.38 2007/02/11 07:15:05 marcel Exp $ # # This is included explicitly at the top of each sub-Makefile. We can't # use the normal "Makefile.inc" mechanism, because we need some of these @@ -22,6 +22,12 @@ RELSRC= ${RELTOP}/../../../contrib/binutils SRCDIR= ${.CURDIR}/${RELSRC} +.if ${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "powerpc" +CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=32 +.else +CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=64 +.endif + CFLAGS+= -I. .if exists(${.CURDIR}/${TARGET_ARCH}) CFLAGS+= -I${.CURDIR}/${TARGET_ARCH} ==== //depot/projects/mjexp/gnu/usr.bin/binutils/libbfd/bfd.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/bfd.h,v 1.3 2004/07/08 17:05:32 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/bfd.h,v 1.4 2007/02/11 07:15:06 marcel Exp $ */ /* DO NOT EDIT! -*- buffer-read-only: t -*- This file is automatically generated from "bfd-in.h", "init.c", "opncls.c", "libbfd.c", @@ -58,14 +58,10 @@ #if defined(__i386__) || defined(__powerpc__) || defined(__arm__) -/* The word size of the default bfd target. */ -#define BFD_DEFAULT_TARGET_SIZE 32 #define BFD_HOST_64BIT_LONG 0 #define BFD_HOST_64_BIT long long #define BFD_HOST_U_64_BIT unsigned long long #elif defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) || defined(__ia64__) -/* The word size of the default bfd target. */ -#define BFD_DEFAULT_TARGET_SIZE 64 #define BFD_HOST_64BIT_LONG 1 #define BFD_HOST_64_BIT long #define BFD_HOST_U_64_BIT unsigned long ==== //depot/projects/mjexp/include/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.267 2007/01/25 22:38:04 peter Exp $ +# $FreeBSD: src/include/Makefile,v 1.268 2007/02/11 14:01:32 rodrigc Exp $ # # Doing a "make install" builds /usr/include. @@ -47,7 +47,6 @@ fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ geom/mirror geom/multipath geom/nop geom/raid3 geom/shsec geom/stripe \ - isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ netgraph/atm netgraph/netflow \ security/audit \ @@ -163,6 +162,9 @@ cd ${.CURDIR}/../sys/contrib/altq/altq; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/altq + cd ${.CURDIR}/../sys/fs/cd9660/; \ + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ + ${DESTDIR}${INCLUDEDIR}/isofs/cd9660 .if ${MK_IPFILTER} != "no" cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ @@ -287,3 +289,8 @@ done .endif .endif + cd ${.CURDIR}/../sys/fs/cd9660; \ + for h in *.h; do \ + ln -fs ../../../../sys/fs/cd9660/$$h \ + ${DESTDIR}${INCLUDEDIR}/isofs/cd9660; \ + done ==== //depot/projects/mjexp/lib/libc/gen/getcap.3#3 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getcap.3 8.4 (Berkeley) 5/13/94 -.\" $FreeBSD: src/lib/libc/gen/getcap.3,v 1.29 2007/01/09 00:27:53 imp Exp $ +.\" $FreeBSD: src/lib/libc/gen/getcap.3,v 1.30 2007/02/11 18:14:49 maxim Exp $ .\" .Dd March 22, 2002 .Dt GETCAP 3 @@ -527,7 +527,7 @@ The .Fn cgetent , and -.Fn cgetseq +.Fn cgetset functions may fail and set .Va errno for any of the errors specified for the library functions: ==== //depot/projects/mjexp/lib/libc/sys/kse.2#3 (text+ko) ==== @@ -33,9 +33,9 @@ .\" THE USE OF THIS SOFTWARE, EVEN IF PACKET DESIGN IS ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.19 2006/12/12 08:13:02 julian Exp $ +.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.22 2007/02/14 07:38:39 brueffer Exp $ .\" -.Dd July 12, 2004 +.Dd February 13, 2007 .Dt KSE 2 .Os .Sh NAME @@ -47,7 +47,7 @@ .In sys/types.h .In sys/kse.h .Ft int -.Fn kse_create "struct kse_mailbox *mbx" "int newgroup" +.Fn kse_create "struct kse_mailbox *mbx" "int sys-scope" .Ft int .Fn kse_exit void .Ft int @@ -103,9 +103,6 @@ .It All operations that block in the kernel become asynchronous, allowing the user process to schedule another thread when any thread blocks. -.It -Multiple thread schedulers within the same process are possible, and they -may operate independently of each other. .El .\" .Ss Definitions @@ -124,6 +121,8 @@ The KSE is said to be .Sy assigned to the thread. +KSEs (a user abstraction) are implemented on top +of kernel threads using an 'upcall' entity. .Pp The KSE becomes .Sy unassigned , @@ -160,22 +159,13 @@ KSEs always complete as much work as possible in the kernel before becoming unassigned. .Pp -A -.Sy "KSE group" -is a collection of KSEs that are scheduled uniformly and which share -access to the same pool of threads, which are associated with the KSE group. -A KSE group is the smallest entity to which a kernel scheduling -priority may be assigned. -For the purposes of process scheduling and accounting, each -KSE group -counts similarly to a traditional unthreaded process. -Individual KSEs within a KSE group are effectively indistinguishable, -and any KSE in a KSE group may be assigned by the kernel to any runnable -(in the kernel) thread associated with that KSE group. +Individual KSEs within a process are effectively indistinguishable, +and any KSE in a process may be assigned by the kernel to any runnable +(in the kernel) thread associated with that process. In practice, the kernel attempts to preserve the affinity between threads and actual CPUs to optimize cache behavior, but this is invisible to the user process. -(Affinity is not yet implemented.) +(Affinity is not yet fully implemented.) .Pp Each KSE has a unique .Sy "KSE mailbox" @@ -199,17 +189,17 @@ This pointer is saved when the thread blocks in the kernel. .Pp Whenever a thread blocked in the kernel is ready to return to user space, -it is added to the KSE group's list of +it is added to the process's list of .Sy completed threads. This list is presented to the user code at the next upcall as a linked list of thread mailboxes. .Pp -There is a kernel-imposed limit on the number of threads in a KSE group +There is a kernel-imposed limit on the number of threads in a process that may be simultaneously blocked in the kernel (this number is not currently visible to the user). When this limit is reached, upcalls are blocked and no work is performed -for the KSE group until one of the threads completes (or a signal is +for the process until one of the threads completes (or a signal is received). .\" .Ss Managing KSEs @@ -223,27 +213,32 @@ The KSE will be associated with the mailbox pointed to by .Fa mbx . If -.Fa newgroup -is non-zero, a new KSE group is also created containing the KSE. -Otherwise, the new KSE is added to the current KSE group. -Newly created KSEs are initially unassigned; therefore, -they will upcall immediately. +.Fa sys_scope +is non-zero, then the new thread will be counted as a system scope +thread. Other things must be done as well to make a system scope thread +so this is not sufficient (yet). +System scope variables are not covered +in detail in this manual page yet, but briefly, they never perform +upcalls and do not return to the user thread scheduler. +Once launched they run autonomously. +The pthreads library knows how to make system +scope threads and users are encouraged to use the library interface. .Pp -Each process initially has a single KSE in a single KSE group executing -a single user thread. +Each process initially has a single KSE executing a single user thread. Since the KSE does not have an associated mailbox, it must remain assigned to the thread and does not perform any upcalls. +(It is by definition a system scope thread). The result is the traditional, unthreaded mode of operation. Therefore, as a special case, the first call to .Fn kse_create by this initial thread with -.Fa newgroup +.Fa sys_scope equal to zero does not create a new KSE; instead, it simply associates the current KSE with the supplied KSE mailbox, and no immediate upcall results. However, an upcall will be triggered the next time the thread blocks and the required conditions are met. .Pp -The kernel does not allow more KSEs to exist in a KSE group than the +The kernel does not allow more KSEs to exist in a process than the number of physical CPUs in the system (this number is available as the .Xr sysctl 3 variable @@ -261,8 +256,8 @@ .Fn kse_exit system call causes the KSE assigned to the currently running thread to be destroyed. -If this KSE is the last one in the KSE group, there must be no remaining -threads associated with the KSE group blocked in the kernel. +If this KSE is the last one in the process, there must be no remaining +threads associated with that process blocked in the kernel. This system call does not return unless there is an error. Calling .Fn kse_exit @@ -309,7 +304,7 @@ may be .Dv NULL to specify -.Dq "any KSE in the current KSE group" . +.Dq "any KSE in the current process" . .Pp The .Fn kse_thr_interrupt @@ -460,7 +455,7 @@ in the kernel since the last upcall. The user thread scheduler should put these threads back into its own runnable queue. -Each thread in a KSE group that completes a kernel operation +Each thread in a process that completes a kernel operation (synchronous or asynchronous) that results in an upcall is guaranteed to be linked into exactly one KSE's .Va km_completed @@ -571,24 +566,8 @@ will fail if: .Bl -tag -width Er .It Bq Er ENXIO -There are already as many KSEs in the KSE group as hardware processors. +There are already as many KSEs in the process as hardware processors. .It Bq Er EAGAIN -The system-imposed limit on the total number of KSE groups under -execution would be exceeded. -The limit is given by the -.Xr sysctl 3 -MIB variable -.Dv KERN_MAXPROC . -(The limit is actually ten less than this -except for the super user.) -.It Bq Er EAGAIN -The user is not the super user, and the system-imposed limit on the total -number of KSE groups under execution by a single user would be exceeded. -The limit is given by the -.Xr sysctl 3 -MIB variable -.Dv KERN_MAXPROCPERUID . -.It Bq Er EAGAIN The user is not the super user, and the soft resource limit corresponding to the .Fa resource @@ -609,8 +588,8 @@ will fail if: .Bl -tag -width Er .It Bq Er EDEADLK -The current KSE is the last in its KSE group and there are still one or more -threads associated with the KSE group blocked in the kernel. +The current KSE is the last in its process and there are still one or more +threads associated with the process blocked in the kernel. .It Bq Er ESRCH The current KSE has no associated mailbox, i.e., the process is operating in traditional, unthreaded mode (in this case use ==== //depot/projects/mjexp/lib/libypclnt/Makefile#2 (text+ko) ==== @@ -1,7 +1,8 @@ -# $FreeBSD: src/lib/libypclnt/Makefile,v 1.13 2005/07/22 17:19:04 kensmith Exp $ +# $FreeBSD: src/lib/libypclnt/Makefile,v 1.14 2007/02/15 02:43:14 trhodes Exp $ LIB= ypclnt SHLIB_MAJOR= 2 +MAN= ypclnt.3 SRCS= ypclnt_connect.c \ ypclnt_error.c \ ypclnt_free.c \ ==== //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#5 (text+ko) ==== @@ -30,7 +30,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.997 2007/01/11 19:44:45 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.998 2007/02/10 19:55:18 bmah Exp $ 2000 @@ -271,6 +271,11 @@ fixed. More information is available in FreeBSD-SA-07:01.jail. &merged; + Two remote denials of service in BIND (one involving DNSSEC and + one involving recursive DNS queries) have been fixed. For more + information, see security advisory + FreeBSD-SA-07:02.bind. &merged; + @@ -977,6 +982,14 @@ supporting TSO currently include &man.em.4; and &man.mxge.4;. + &os; now supports auto-sizing of TCP socket buffers. This + allows the socket buffer sizes to adapt dynamically to network + conditions, rather than being set statically. The behavior of + this feature can be controlled using + the net.inet.tcp.sendbuf_* + and net.inet.tcp.recvbuf_* sysctl + variables. + Support for &man.kqueue.2; operations has been added to the &man.tun.4; driver. &merged; @@ -1733,7 +1746,7 @@ has been updated to 20051021. BIND has been updated from 9.3.1 - to 9.3.3. &merged; + to 9.3.4. &merged; BSNMPD has been updated from 1.11 to 1.12. @@ -1745,6 +1758,9 @@ FILE has been updated from 4.12 to 4.17. + The GNU version of gzip has been + replaced with a version of gzip imported from NetBSD. + netcat has been updated from the version in a 4 February 2005 OpenBSD snapshot to the version included in OpenBSD 3.9. &merged; @@ -1753,7 +1769,7 @@ to 3.4.6. &merged; GNU Readline library has been - updated from 5.0 to 5.1. + updated from 5.0 to 5.2 patch 1. GNU Troff has been updated from version 1.19 to version 1.19.2. @@ -1778,6 +1794,9 @@ OpenSSL has been updated from 0.9.7e to 0.9.8d. + ncurses has been updated from + 5.2-20010512 to 5.6-20061217. + hostapd has been updated from version 0.3.9 to version 0.4.8. &merged; ==== //depot/projects/mjexp/sbin/ffsinfo/ffsinfo.c#2 (text+ko) ==== @@ -48,7 +48,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/ffsinfo/ffsinfo.c,v 1.10 2005/03/31 04:05:17 rwatson Exp $"; + "$FreeBSD: src/sbin/ffsinfo/ffsinfo.c,v 1.13 2007/02/14 23:22:33 brian Exp $"; #endif /* not lint */ /* ********************************************************** INCLUDES ***** */ @@ -138,43 +138,39 @@ DBG_ENTER; - cfg_lv=0xff; - cfg_in=-2; - cfg_cg=-2; - out_file=NULL; + cfg_lv = 0xff; + cfg_in = -2; + cfg_cg = -2; + out_file = "-"; - while ((ch=getopt(argc, argv, "g:i:l:o:")) != -1) { - switch(ch) { + while ((ch = getopt(argc, argv, "g:i:l:o:")) != -1) { + switch (ch) { case 'g': - cfg_cg=strtol(optarg, NULL, 0); - if(errno == EINVAL||errno == ERANGE) + cfg_cg = strtol(optarg, NULL, 0); + if (errno == EINVAL || errno == ERANGE) err(1, "%s", optarg); - if(cfg_cg < -1) { + if (cfg_cg < -1) usage(); - } break; case 'i': - cfg_in=strtol(optarg, NULL, 0); - if(errno == EINVAL||errno == ERANGE) + cfg_in = strtol(optarg, NULL, 0); + if (errno == EINVAL || errno == ERANGE) err(1, "%s", optarg); - if(cfg_in < 0) { + if (cfg_in < 0) usage(); - } break; case 'l': - cfg_lv=strtol(optarg, NULL, 0); - if(errno == EINVAL||errno == ERANGE) + cfg_lv = strtol(optarg, NULL, 0); + if (errno == EINVAL||errno == ERANGE) err(1, "%s", optarg); - if(cfg_lv < 0x1||cfg_lv > 0x3ff) { + if (cfg_lv < 0x1 || cfg_lv > 0x3ff) usage(); - } break; case 'o': free(out_file); - out_file=strdup(optarg); - if(out_file == NULL) { + out_file = strdup(optarg); + if (out_file == NULL) errx(1, "strdup failed"); - } break; case '?': /* FALLTHROUGH */ @@ -185,19 +181,16 @@ argc -= optind; argv += optind; - if(argc != 1) { + if (argc != 1) usage(); - } - device=*argv; - if (out_file == NULL) - errx(1, "out_file not specified"); - + device = *argv; + /* * Now we try to guess the (raw)device name. */ - if (0 == strrchr(device, '/') && (stat(device, &st) == -1)) { - /* - * No path prefix was given, so try in that order: + if (0 == strrchr(device, '/') && stat(device, &st) == -1) { + /*- + * No path prefix was given, so try in this order: * /dev/r%s * /dev/%s * /dev/vinum/r%s @@ -206,24 +199,20 @@ * FreeBSD now doesn't distinguish between raw and block * devices any longer, but it should still work this way. */ - len=strlen(device)+strlen(_PATH_DEV)+2+strlen("vinum/"); - special=(char *)malloc(len); - if(special == NULL) { + len = strlen(device) + strlen(_PATH_DEV) + 2 + strlen("vinum/"); + special = (char *)malloc(len); + if (special == NULL) errx(1, "malloc failed"); - } snprintf(special, len, "%sr%s", _PATH_DEV, device); if (stat(special, &st) == -1) { snprintf(special, len, "%s%s", _PATH_DEV, device); if (stat(special, &st) == -1) { snprintf(special, len, "%svinum/r%s", _PATH_DEV, device); - if (stat(special, &st) == -1) { - /* - * For now this is the 'last resort'. - */ + if (stat(special, &st) == -1) + /* For now this is the 'last resort' */ snprintf(special, len, "%svinum/%s", _PATH_DEV, device); - } } } device = special; @@ -232,55 +221,44 @@ if (ufs_disk_fillout(&disk, device) == -1) err(1, "ufs_disk_fillout(%s) failed: %s", device, disk.d_error); - DBG_OPEN(out_file); /* already here we need a superblock */ + DBG_OPEN(out_file); /* already here we need a superblock */ - if(cfg_lv & 0x001) { - DBG_DUMP_FS(&sblock, - "primary sblock"); - } + if (cfg_lv & 0x001) + DBG_DUMP_FS(&sblock, "primary sblock"); - /* - * Determine here what cylinder groups to dump. - */ - if(cfg_cg==-2) { - cg_start=0; - cg_stop=sblock.fs_ncg; - } else if (cfg_cg==-1) { - cg_start=sblock.fs_ncg-1; - cg_stop=sblock.fs_ncg; - } else if (cfg_cg>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 16 00:29:30 2007 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 59B0C16A402; Fri, 16 Feb 2007 00:29:30 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0B77F16A400 for ; Fri, 16 Feb 2007 00:29:30 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0086613C48E for ; Fri, 16 Feb 2007 00:29:30 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1G0TTsd028424 for ; Fri, 16 Feb 2007 00:29:29 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1G0TThv028421 for perforce@freebsd.org; Fri, 16 Feb 2007 00:29:29 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 16 Feb 2007 00:29:29 GMT Message-Id: <200702160029.l1G0TThv028421@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 114601 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, 16 Feb 2007 00:29:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=114601 Change 114601 by gonzo@gonzo_jeeves on 2007/02/16 00:28:45 o Add suport of hw.machine sysctl for MIPS. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/cpu.c#16 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/cpu.c#16 (text+ko) ==== @@ -32,6 +32,7 @@ #include #include +#include #include #include @@ -56,6 +57,11 @@ void mips_get_identity(struct mips_cpuinfo *cpuinfo); +char machine[] = "mips"; + +SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, + machine, 0, "Machine class"); + /* * Exception vector table management. */ From owner-p4-projects@FreeBSD.ORG Fri Feb 16 00:34:38 2007 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 DE6D216A409; Fri, 16 Feb 2007 00:34:37 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9BF6F16A402 for ; Fri, 16 Feb 2007 00:34:37 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9084013C4B9 for ; Fri, 16 Feb 2007 00:34:37 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1G0YbWU029824 for ; Fri, 16 Feb 2007 00:34:37 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1G0YbA5029821 for perforce@freebsd.org; Fri, 16 Feb 2007 00:34:37 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 16 Feb 2007 00:34:37 GMT Message-Id: <200702160034.l1G0YbA5029821@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 114603 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, 16 Feb 2007 00:34:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=114603 Change 114603 by gonzo@gonzo_jeeves on 2007/02/16 00:34:11 o Prevent pmap_remove_pte on invalid pte. This happened when there was no segtab for proviede va. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/pmap.c#20 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/pmap.c#20 (text+ko) ==== @@ -228,6 +228,13 @@ if (va < MIPS_KSEG0_START) { pte = pmap_segmap(pmap, va); + /* + * If there is no segtab for this va return NULL + * to indicate absence of mapping instead of broken + * pte address. + */ + if(pte == NULL) + return NULL; pte += (va >> PAGE_SHIFT) & (NPTEPG - 1); } else pte = tlb_kern_pte_find(kptmap, va); @@ -1017,8 +1024,12 @@ va = sva; while (count--) { pte = pmap_pte(pmap, va); - pmap_remove_pte(pmap, pte, va); - tlb_remove(pmap, va); + /* NULL means there is no segtab for this area */ + if(pte != NULL) + { + pmap_remove_pte(pmap, pte, va); + tlb_remove(pmap, va); + } va += PAGE_SIZE; } From owner-p4-projects@FreeBSD.ORG Fri Feb 16 00:37:42 2007 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 11B4816A409; Fri, 16 Feb 2007 00:37:42 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E0D7616A400 for ; Fri, 16 Feb 2007 00:37:41 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D5B7613C4A6 for ; Fri, 16 Feb 2007 00:37:41 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1G0bfkd030005 for ; Fri, 16 Feb 2007 00:37:41 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1G0bft7030002 for perforce@freebsd.org; Fri, 16 Feb 2007 00:37:41 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 16 Feb 2007 00:37:41 GMT Message-Id: <200702160037.l1G0bft7030002@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 114604 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, 16 Feb 2007 00:37:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=114604 Change 114604 by gonzo@gonzo_jeeves on 2007/02/16 00:36:55 o _fini should use .abicalls if compiled with respective gcc option. Affected files ... .. //depot/projects/mips2/src/lib/csu/mips/crti.S#3 edit Differences ... ==== //depot/projects/mips2/src/lib/csu/mips/crti.S#3 (text+ko) ==== @@ -18,10 +18,20 @@ subu sp, sp, 32 sw ra, 28(sp) #endif + .section .fini,"ax",%progbits .align 4 .globl _fini .type _fini,%function _fini: +#ifdef __ABICALLS__ + .set noreorder + .cpload $25 + .set reorder + subu sp, sp, 32 + .cprestore 16 + sw ra, 28(sp) +#else subu sp, sp, 32 sw ra, 28(sp) +#endif From owner-p4-projects@FreeBSD.ORG Fri Feb 16 14:00:02 2007 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 D0A9F16A41F; Fri, 16 Feb 2007 14:00:01 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A66B116A407 for ; Fri, 16 Feb 2007 14:00:01 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 73E2713C46B for ; Fri, 16 Feb 2007 14:00:01 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1GE01Ra013867 for ; Fri, 16 Feb 2007 14:00:01 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1GE01eW013864 for perforce@freebsd.org; Fri, 16 Feb 2007 14:00:01 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 16 Feb 2007 14:00:01 GMT Message-Id: <200702161400.l1GE01eW013864@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 114626 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, 16 Feb 2007 14:00:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=114626 Change 114626 by gonzo@gonzo_jeeves on 2007/02/16 13:59:15 o Build world with abicalls enabled. Affected files ... .. //depot/projects/mips2/src/share/mk/bsd.cpu.mk#6 edit Differences ... ==== //depot/projects/mips2/src/share/mk/bsd.cpu.mk#6 (text+ko) ==== @@ -115,7 +115,7 @@ _CPUCFLAGS = -mcpu=${CPUTYPE} . endif . elif ${MACHINE_ARCH} == "mips" -_CPUCFLAGS = -mno-abicalls -G0 +_CPUCFLAGS = -G0 -mabicalls . if ${CPUTYPE} == "mips32" _CPUCFLAGS += -march=mips32 . elif ${CPUTYPE} == "mips64" From owner-p4-projects@FreeBSD.ORG Fri Feb 16 15:38:06 2007 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 5A77916A41F; Fri, 16 Feb 2007 15:38:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3077B16A408 for ; Fri, 16 Feb 2007 15:38:06 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 16E1213C48E for ; Fri, 16 Feb 2007 15:38:06 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1GFc5Cd031846 for ; Fri, 16 Feb 2007 15:38:05 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1GFc5vj031843 for perforce@freebsd.org; Fri, 16 Feb 2007 15:38:05 GMT (envelope-from millert@freebsd.org) Date: Fri, 16 Feb 2007 15:38:05 GMT Message-Id: <200702161538.l1GFc5vj031843@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 114629 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, 16 Feb 2007 15:38:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=114629 Change 114629 by millert@millert_p4 on 2007/02/16 15:37:36 Add clearenv() and strdupa() usaed by SELinux user tools/libs. Affected files ... .. //depot/projects/trustedbsd/sebsd/lib/libsecompat/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/lib/libsecompat/clearenv.c#1 add .. //depot/projects/trustedbsd/sebsd/lib/libsecompat/secompat.h#2 edit .. //depot/projects/trustedbsd/sebsd/lib/libsecompat/strdupa.c#1 add Differences ... ==== //depot/projects/trustedbsd/sebsd/lib/libsecompat/Makefile#2 (text+ko) ==== @@ -3,7 +3,7 @@ # LIB= secompat -SRCS= getline.c strndup.c +SRCS= getline.c strndup.c clearenv.c strdupa.c NO_MAN= yes INCSDIR=${INCLUDEDIR}/selinux INCS= secompat.h ==== //depot/projects/trustedbsd/sebsd/lib/libsecompat/secompat.h#2 (text+ko) ==== @@ -3,5 +3,7 @@ ssize_t getline(char **, size_t *, FILE *); char *strndup(const char *, size_t); +char *strdupa(const char *); +int clearenv(void); #endif /* _SECOMPAT_H_ */ From owner-p4-projects@FreeBSD.ORG Fri Feb 16 15:39:08 2007 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 3513016A41F; Fri, 16 Feb 2007 15:39:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EAA3D16A408 for ; Fri, 16 Feb 2007 15:39:07 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D703D13C4B3 for ; Fri, 16 Feb 2007 15:39:07 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1GFd7uq031952 for ; Fri, 16 Feb 2007 15:39:07 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1GFd7k8031949 for perforce@freebsd.org; Fri, 16 Feb 2007 15:39:07 GMT (envelope-from millert@freebsd.org) Date: Fri, 16 Feb 2007 15:39:07 GMT Message-Id: <200702161539.l1GFd7k8031949@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 114630 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, 16 Feb 2007 15:39:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=114630 Change 114630 by millert@millert_p4 on 2007/02/16 15:39:02 Sync with contrib/sebsd Affected files ... .. //depot/projects/trustedbsd/sebsd/lib/libselinux/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/lib/libsemanage/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/lib/libsepol/Makefile#5 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/lib/libselinux/Makefile#2 (text+ko) ==== @@ -15,22 +15,24 @@ #LDADD+= -L${.OBJDIR}/../libpam/libpam ${MINUSLPAM} #DPADD+= ${LIBPAM} -SRCS= booleans.c canonicalize_context.c compute_av.c compute_relabel.c \ - compute_user.c context.c disable.c enabled.c fgetfilecon.c \ - freecon.c freeconary.c fsetfilecon.c get_context_list.c \ - get_default_type.c getcon.c getenforce.c getexeccon.c \ - getfilecon.c getpeercon.c getpidcon.c init.c is_customizable_type.c \ - lgetfilecon.c load_policy.c lsetfilecon.c matchmediacon.c \ - matchpathcon.c policyvers.c query_user_context.c sebsd_config.c \ - setcon.c setenforce.c setfilecon.c seusers.c trans.c +SRCS= avc.c avc_internal.c avc_sidtab.c booleans.c canonicalize_context.c \ + checkAccess.c check_context.c compute_av.c compute_create.c \ + compute_member.c compute_relabel.c compute_user.c context.c \ + disable.c enabled.c fgetfilecon.c freecon.c freeconary.c \ + fsetfilecon.c get_context_list.c get_default_type.c \ + getcon.c getenforce.c getexeccon.c \ + getfilecon.c getpeercon.c getpidcon.c getprevcon.c init.c \ + is_customizable_type.c lgetfilecon.c load_policy.c \ + lsetfilecon.c matchmediacon.c matchpathcon.c policyvers.c \ + query_user_context.c sebsd_config.c \ + selinux_check_securetty_context.c setcon.c setenforce.c \ + setfilecon.c setrans_client.c seusers.c + +# The following require kernel support for fs and exec contexts +#SRCS += getfscreatecon.c setfscreatecon.c setexeccon.c -# Files left out, waiting for supporting functionality in the sebsd kernel -# module -# check_context.c compute_create.c \ -# compute_member.c getfscreatecon.c \ -# getprevcon.c setfscreatecon.c \ -# checkAccess.c rpm.c setexeccon.c -# +# The following are Linux-specific +#SRCS += procattr.c rpm.c INCSDIR=${INCLUDEDIR}/selinux @@ -41,7 +43,7 @@ MAN= avc_add_callback.3 avc_cache_stats.3 avc_context_to_sid.3 \ avc_has_perm.3 avc_init.3 context_new.3 freecon.3 \ get_ordered_context_list.3 getcon.3 getexeccon.3 getfilecon.3 \ - getfscreatecon.3 getseuserbyname.3 is_context_customizable.3 \ + getseuserbyname.3 is_context_customizable.3 \ is_selinux_enabled.3 matchmediacon.3 matchpathcon.3 \ security_check_context.3 security_compute_av.3 \ security_getenforce.3 security_load_booleans.3 \ @@ -102,8 +104,11 @@ matchpathcon.3 set_matchpathcon_printf.3 \ getcon.3 setcon.3 \ getexeccon.3 setexeccon.3 \ - getfscreatecon.3 setfscreatecon.3 \ avc_context_to_sid.3 sidget.3 \ avc_context_to_sid.3 sidput.3 +# Not currently supported +#MAN+= getfscreatecon.3 +#MLINKS+=getfscreatecon.3 setfscreatecon.3 + .include ==== //depot/projects/trustedbsd/sebsd/lib/libsemanage/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/lib/libsepol/Makefile#5 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Feb 16 16:00:35 2007 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 98A3C16A421; Fri, 16 Feb 2007 16:00:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 67A0616A408 for ; Fri, 16 Feb 2007 16:00:35 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5486013C46B for ; Fri, 16 Feb 2007 16:00:35 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1GG0Zs6035194 for ; Fri, 16 Feb 2007 16:00:35 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1GG0Z9i035191 for perforce@freebsd.org; Fri, 16 Feb 2007 16:00:35 GMT (envelope-from millert@freebsd.org) Date: Fri, 16 Feb 2007 16:00:35 GMT Message-Id: <200702161600.l1GG0Z9i035191@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 114631 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, 16 Feb 2007 16:00:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=114631 Change 114631 by millert@millert_p4 on 2007/02/16 16:00:28 Adapt the old policy install path to the new world order. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#26 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#26 (text+ko) ==== @@ -33,7 +33,7 @@ .endif POLICYVER := policy.$(POLICYVERTMP) POLICYBIN = policy.bin -INSTALLDIR = $(DESTDIR)/etc/security/sebsd/targeted +INSTALLDIR = $(DESTDIR)/etc/security/sebsd POLICYPATH = $(INSTALLDIR)/policy SRCPATH = $(INSTALLDIR)/src CONTEXTPATH = $(INSTALLDIR)/contexts @@ -138,10 +138,10 @@ m4 $(M4PARAM) -Imacros -s $(POLICYFILES) > $@.tmp mv $@.tmp $@ -install-src: $(SRCPATH) - rm -rf $(SRCPATH)/policy.old - -mv $(SRCPATH)/policy $(SRCPATH)/policy.old - cd ..; tar cf - policy | (cd $(SRCPATH); tar xf -) +install-src: /etc/security/sebsd + rm -rf $(INSTALLDIR)/policy.old + -mv $(INSTALLDIR)/policy $(INSTALLDIR)/policy.old + cd ..; tar cf - policy | (cd $(INSTALLDIR); tar xf -) tmp/program_used_flags.te: $(wildcard domains/program/*.te) domains/program mkdir -p tmp From owner-p4-projects@FreeBSD.ORG Fri Feb 16 18:04:12 2007 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 1E18E16A468; Fri, 16 Feb 2007 18:04:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D60BC16A407 for ; Fri, 16 Feb 2007 18:04:11 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9AFD813C48D for ; Fri, 16 Feb 2007 18:04:11 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1GI4BVq066904 for ; Fri, 16 Feb 2007 18:04:11 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1GI4B6g066901 for perforce@freebsd.org; Fri, 16 Feb 2007 18:04:11 GMT (envelope-from millert@freebsd.org) Date: Fri, 16 Feb 2007 18:04:11 GMT Message-Id: <200702161804.l1GI4B6g066901@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 114636 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, 16 Feb 2007 18:04:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=114636 Change 114636 by millert@millert_p4 on 2007/02/16 18:03:42 Update policy.conf used for bootstrapping Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/support/policy.conf#3 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Feb 16 18:05:13 2007 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 9CE5B16A409; Fri, 16 Feb 2007 18:05:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7946816A406 for ; Fri, 16 Feb 2007 18:05:13 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 64E9813C442 for ; Fri, 16 Feb 2007 18:05:13 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1GI5DXT067267 for ; Fri, 16 Feb 2007 18:05:13 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1GI5DFt067264 for perforce@freebsd.org; Fri, 16 Feb 2007 18:05:13 GMT (envelope-from millert@freebsd.org) Date: Fri, 16 Feb 2007 18:05:13 GMT Message-Id: <200702161805.l1GI5DFt067264@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 114637 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, 16 Feb 2007 18:05:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=114637 Change 114637 by millert@millert_p4 on 2007/02/16 18:04:27 Sync with SEBSD contrib Affected files ... .. //depot/projects/trustedbsd/sebsd/usr.bin/checkmodule/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/usr.bin/checkpolicy/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/usr.bin/checkmodule/Makefile#2 (text+ko) ==== @@ -4,7 +4,8 @@ PROG= checkmodule MAN= -SRCS= policy_scan.l policy_parse.y checkmodule.c queue.c module_compiler.c +SRCS= policy_scan.l policy_parse.y checkmodule.c queue.c module_compiler.c \ + parse_util.c CFLAGS+=-I${.CURDIR}/../../contrib/sebsd/checkpolicy CFLAGS+=-I${.CURDIR}/../../contrib/sebsd/libsepol/include CFLAGS+=-I${.CURDIR}/../../sys ==== //depot/projects/trustedbsd/sebsd/usr.bin/checkpolicy/Makefile#3 (text+ko) ==== @@ -4,7 +4,8 @@ PROG= checkpolicy MAN= -SRCS= policy_scan.l policy_parse.y checkpolicy.c queue.c module_compiler.c +SRCS= policy_scan.l policy_parse.y checkpolicy.c queue.c module_compiler.c \ + parse_util.c CFLAGS+=-I${.CURDIR}/../../contrib/sebsd/checkpolicy CFLAGS+=-I${.CURDIR}/../../contrib/sebsd/libsepol/include CFLAGS+=-I${.CURDIR}/../../sys From owner-p4-projects@FreeBSD.ORG Fri Feb 16 20:39:30 2007 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 E7EE916A408; Fri, 16 Feb 2007 20:39:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A446216A406 for ; Fri, 16 Feb 2007 20:39:29 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8451713C4AA for ; Fri, 16 Feb 2007 20:39:29 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1GKdTPu093002 for ; Fri, 16 Feb 2007 20:39:29 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1GKdT28092998 for perforce@freebsd.org; Fri, 16 Feb 2007 20:39:29 GMT (envelope-from piso@freebsd.org) Date: Fri, 16 Feb 2007 20:39:29 GMT Message-Id: <200702162039.l1GKdT28092998@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 114641 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, 16 Feb 2007 20:39:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=114641 Change 114641 by piso@piso_newluxor on 2007/02/16 20:39:23 Introduce a per-instance of libalias buffer of memory that will be used to temporary hold the entire mbuf-chain in a 'flat' format (like a contiguous chunk of memory): used only for irc, nbt and smedia modules cause fixing these modules to grok mbuf was too much of a pain without a complete rewrite. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#24 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#20 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#26 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_nbt.c#15 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_smedia.c#19 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#24 (text+ko) ==== @@ -2538,6 +2538,11 @@ #ifdef _KERNEL la->timeStamp = time_uptime; la->lastCleanupTime = time_uptime; + la->buff = malloc(PKT_BUFF); + if (la->buff == NULL) { + free (la); + return (NULL); + } #else gettimeofday(&tv, &tz); la->timeStamp = tv.tv_sec; @@ -2602,6 +2607,9 @@ LIST_REMOVE(la, instancelist); LIBALIAS_UNLOCK(la); LIBALIAS_LOCK_DESTROY(la); +#ifdef _KERNEL + free(la->buff); +#endif free(la); } ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#20 (text+ko) ==== @@ -170,9 +170,6 @@ struct ip *pip; struct tcphdr *tc; int i; /* Iterator through the source */ -#ifdef _KERNEL - char mpkt[65536]; -#endif /* Calculate data length of TCP packet */ PULLUP_TCPHDR(pip, ptr); @@ -205,16 +202,16 @@ * o 2k < pkt < 4k: use a 4k mbuf cluster (jumbo) * o 4k < pkt < 9k: use a 9k mbuf cluster (jumbo9) * o 9k < pkt < 16k: use a 16k mbuf cluster (jumbo16) - * o pkt > 16k: use mpkt buffer (worst case) + * o pkt > 16k: use la->buff buffer (worst case) * * WATCH OUT: pkt could grow, so beware of boundaries in case * an mbuf/mbuf cluster is used, check maxsize. */ // XXX so far only the worst case is implemented... - m_copydata(*ptr, hlen, m_length(*ptr, NULL), mpkt); - sptr = mpkt; - maxsize = 65536; /* size of mpkt */ + m_copydata(*ptr, hlen, m_length(*ptr, NULL), la->buff); + sptr = la->buff; + maxsize = PKT_BUFF; /* size of packet buffer */ #else sptr = (char *)pip; sptr += hlen; ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#26 (text+ko) ==== @@ -156,6 +156,18 @@ * avoid races in libalias: every public function has to use it. */ struct mtx mutex; + /* + * some modules (irc, nbt and smedia) need a contiguos buffer of + * memory to work properly, so copy the entire mbuf chain here + * and pass this buffer to them. + * On return, copy back the data from this buffer to an mbuf + * chain. + * XXX this is supposed to be a stop gap solution until a brave soul + * (NdPiso me?) rewrite these modules to properly handle an mbuf + * chain. + */ +#define PKT_BUFF 65536 + char *buff; #endif }; ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_nbt.c#15 (text+ko) ==== @@ -350,18 +350,24 @@ NbtDataHeader *ndh; u_char *p = NULL; char *pmax; +#ifdef _KERNEL + int size; +#endif (void)la; (void)lnk; /* Calculate data length of UDP packet */ - PULLUP_UDPHDR(pip ,ptr); - if (pip == NULL) - return (-1); +#ifdef _KERNEL + size = m_length(*ptr, NULL); + m_copydata(*ptr, 0, m_length(*ptr, NULL), la->buff); + pip = (struct ip *)la->buff; +#else + pip = (struct ip *)ptr; +#endif uh = (struct udphdr *)ip_next(pip); pmax = (char *)uh + ntohs(uh->uh_ulen); - // XXX broken ndh = (NbtDataHeader *)udp_next(uh); if ((char *)(ndh + 1) > pmax) return (-1); @@ -412,6 +418,9 @@ printf("%s:%d\n", inet_ntoa(ndh->source_ip), ntohs(ndh->source_port)); fflush(stdout); #endif +#ifdef _KERNEL + m_copyback(*ptr, 0, size, la->buff); +#endif return ((p == NULL) ? -1 : 0); } @@ -785,6 +794,9 @@ u_char *p; char *pmax; NBTArguments nbtarg; +#ifdef _KERNEL + int size; +#endif (void)la; (void)lnk; @@ -802,9 +814,13 @@ alias_address = NULL; /* Calculate data length of UDP packet */ - PULLUP_UDPHDR(pip, ptr); - if (pip == NULL) - return (-1); +#ifdef _KERNEL + size = m_length(*ptr, NULL); + m_copydata(*ptr, 0, m_length(*ptr, NULL), la->buff); + pip = (struct ip *)la->buff; +#else + pip = (struct ip *)ptr; +#endif uh = (struct udphdr *)ip_next(pip); nbtarg.uh_sum = &(uh->uh_sum); nsh = (NbtNSHeader *)udp_next(uh); @@ -869,5 +885,8 @@ #ifdef LIBALIAS_DEBUG PrintRcode(nsh->rcode); #endif +#ifdef _KERNEL + m_copyback(*ptr, 0, size, la->buff); +#endif return ((p == NULL) ? -1 : 0); } ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_smedia.c#19 (text+ko) ==== @@ -489,16 +489,19 @@ const char *okstr = "OK", *client_port_str = "client_port"; const char *server_port_str = "server_port"; int i, parseOk; +#ifdef _KERNEL + int size; - PULLUP_TCPHDR(pip, ptr); - if (pip == NULL) - return; + size = m_length(*ptr, NULL); + m_copydata(*ptr, 0, m_length(*ptr, NULL), la->buff); + pip = (struct ip *)la->buff; +#else + pip = (struct ip *)ptr; +#endif tc = (struct tcphdr *)ip_next(pip); hlen = (pip->ip_hl + tc->th_off) << 2; tlen = ntohs(pip->ip_len); dlen = tlen - hlen; - - // XXX broken data = (char *)pip; data += hlen; @@ -549,4 +552,7 @@ } } } +#ifdef _KERNEL + m_copyback(*ptr, 0, size, la->buff); +#endif } From owner-p4-projects@FreeBSD.ORG Sat Feb 17 05:15:54 2007 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 3895316A406; Sat, 17 Feb 2007 05:15:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C7AEC16A401 for ; Sat, 17 Feb 2007 05:15:53 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BACDE13C4AC for ; Sat, 17 Feb 2007 05:15:53 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1H5Frst032560 for ; Sat, 17 Feb 2007 05:15:53 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1H5FC8q032546 for perforce@freebsd.org; Sat, 17 Feb 2007 05:15:12 GMT (envelope-from mjacob@freebsd.org) Date: Sat, 17 Feb 2007 05:15:12 GMT Message-Id: <200702170515.l1H5FC8q032546@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 114642 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, 17 Feb 2007 05:15:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=114642 Change 114642 by mjacob@mjexp_6 on 2007/02/17 05:14:57 Integrate from vendor branch. For a stable branch this has been pretty busy. Affected files ... .. //depot/projects/mjexp_6/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/mjexp_6/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/mjexp_6/sys/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/mjexp_6/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/mjexp_6/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/mjexp_6/sys/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/mjexp_6/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/mjexp_6/sys/conf/NOTES#4 integrate .. //depot/projects/mjexp_6/sys/conf/files#4 integrate .. //depot/projects/mjexp_6/sys/conf/options#3 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/alpha-elf.inc#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/ap30.hal.o.uu#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/ap43.hal.o.uu#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/ap51.hal.o.uu#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/ap61.hal.o.uu#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/wackelf.c#1 branch .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/mjexp_6/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/mjexp_6/sys/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/mjexp_6/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/mjexp_6/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/ath/ath_rate/sample/sample.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/mjexp_6/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/mjexp_6/sys/dev/ath/if_athrate.h#2 integrate .. //depot/projects/mjexp_6/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/mjexp_6/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/mjexp_6/sys/dev/digi/digi.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/mjexp_6/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/mjexp_6/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/mjexp_6/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/mjexp_6/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/mjexp_6/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/mjexp_6/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/mjexp_6/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/mjexp_6/sys/dev/mii/acphy.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/mii/bmtphy.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/mii/ciphy.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/mii/dcphy.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/mii/exphy.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/mii/gentbi.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/mii/lxtphy.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/mii/mii_physubr.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/mii/miivar.h#2 integrate .. //depot/projects/mjexp_6/sys/dev/mii/nsgphy.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/mii/pnaphy.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/mii/pnphy.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/mii/qsphy.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/mii/rlphy.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/mii/tlphy.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/mii/ukphy.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/mii/xmphy.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/pci/pci.c#3 integrate .. //depot/projects/mjexp_6/sys/dev/pci/pci_private.h#3 integrate .. //depot/projects/mjexp_6/sys/dev/pci/pcib_private.h#3 integrate .. //depot/projects/mjexp_6/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/mjexp_6/sys/dev/pci/pcivar.h#3 integrate .. //depot/projects/mjexp_6/sys/dev/re/if_re.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/mjexp_6/sys/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/usb/if_aue.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/usb/ubsa.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/mjexp_6/sys/dev/usb/usbdi_util.h#2 integrate .. //depot/projects/mjexp_6/sys/dev/wi/if_wi.c#3 integrate .. //depot/projects/mjexp_6/sys/dev/wi/if_wivar.h#2 integrate .. //depot/projects/mjexp_6/sys/fs/deadfs/dead_vnops.c#2 integrate .. //depot/projects/mjexp_6/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/mjexp_6/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/mjexp_6/sys/fs/procfs/procfs.c#2 integrate .. //depot/projects/mjexp_6/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/mjexp_6/sys/fs/udf/udf_vnops.c#3 integrate .. //depot/projects/mjexp_6/sys/fs/unionfs/union.h#2 integrate .. //depot/projects/mjexp_6/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/mjexp_6/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/mjexp_6/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/mjexp_6/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/mjexp_6/sys/isofs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/mjexp_6/sys/kern/kern_linker.c#2 integrate .. //depot/projects/mjexp_6/sys/kern/kern_mbuf.c#2 integrate .. //depot/projects/mjexp_6/sys/kern/subr_firmware.c#2 integrate .. //depot/projects/mjexp_6/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/mjexp_6/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/mjexp_6/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/mjexp_6/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/mjexp_6/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/mjexp_6/sys/modules/Makefile#3 integrate .. //depot/projects/mjexp_6/sys/modules/netgraph/Makefile#2 integrate .. //depot/projects/mjexp_6/sys/modules/netgraph/deflate/Makefile#1 branch .. //depot/projects/mjexp_6/sys/modules/netgraph/pred1/Makefile#1 branch .. //depot/projects/mjexp_6/sys/modules/wlan_amrr/Makefile#1 branch .. //depot/projects/mjexp_6/sys/net/if_media.h#2 integrate .. //depot/projects/mjexp_6/sys/net80211/_ieee80211.h#2 integrate .. //depot/projects/mjexp_6/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/mjexp_6/sys/net80211/ieee80211_amrr.c#1 branch .. //depot/projects/mjexp_6/sys/net80211/ieee80211_amrr.h#1 branch .. //depot/projects/mjexp_6/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/mjexp_6/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/mjexp_6/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/mjexp_6/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/mjexp_6/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/mjexp_6/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/mjexp_6/sys/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/mjexp_6/sys/netgraph/ng_deflate.c#1 branch .. //depot/projects/mjexp_6/sys/netgraph/ng_deflate.h#1 branch .. //depot/projects/mjexp_6/sys/netgraph/ng_nat.c#2 integrate .. //depot/projects/mjexp_6/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/mjexp_6/sys/netgraph/ng_ppp.h#2 integrate .. //depot/projects/mjexp_6/sys/netgraph/ng_pred1.c#1 branch .. //depot/projects/mjexp_6/sys/netgraph/ng_pred1.h#1 branch .. //depot/projects/mjexp_6/sys/netgraph/ng_tcpmss.c#2 integrate .. //depot/projects/mjexp_6/sys/netgraph/ng_vlan.c#2 integrate .. //depot/projects/mjexp_6/sys/netinet/if_ether.c#2 integrate .. //depot/projects/mjexp_6/sys/netinet/in.h#2 integrate .. //depot/projects/mjexp_6/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/mjexp_6/sys/netinet6/ah_core.c#2 integrate .. //depot/projects/mjexp_6/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/mjexp_6/sys/netinet6/nd6.c#2 integrate .. //depot/projects/mjexp_6/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/mjexp_6/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/mjexp_6/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/mjexp_6/sys/nfsclient/nfs_node.c#3 integrate .. //depot/projects/mjexp_6/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/mjexp_6/sys/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/mjexp_6/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/mjexp_6/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/mjexp_6/sys/nfsclient/nfsnode.h#2 integrate .. //depot/projects/mjexp_6/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/mjexp_6/sys/pci/agp_ati.c#2 integrate .. //depot/projects/mjexp_6/sys/pci/if_pcn.c#2 integrate .. //depot/projects/mjexp_6/sys/pci/if_pcnreg.h#2 integrate .. //depot/projects/mjexp_6/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/mjexp_6/sys/powerpc/include/ipl.h#2 delete .. //depot/projects/mjexp_6/sys/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/mjexp_6/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/mjexp_6/sys/sys/ata.h#2 integrate .. //depot/projects/mjexp_6/sys/sys/linker.h#2 integrate .. //depot/projects/mjexp_6/sys/sys/mbuf.h#2 integrate .. //depot/projects/mjexp_6/sys/sys/mount.h#2 integrate .. //depot/projects/mjexp_6/sys/sys/param.h#4 integrate .. //depot/projects/mjexp_6/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/mjexp_6/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/mjexp_6/sys/ufs/ufs/quota.h#2 integrate .. //depot/projects/mjexp_6/sys/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/mjexp_6/sys/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/mjexp_6/sys/vm/uma.h#3 integrate .. //depot/projects/mjexp_6/sys/vm/uma_core.c#3 integrate Differences ... ==== //depot/projects/mjexp_6/sys/amd64/amd64/mp_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.260.2.7 2006/10/30 18:03:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.260.2.8 2007/02/12 21:20:43 jhb Exp $"); #include "opt_cpu.h" #include "opt_kdb.h" @@ -601,6 +601,8 @@ continue; if (cpu_info[apic_id].cpu_bsp) continue; + if (cpu_info[apic_id].cpu_disabled) + continue; /* Don't let hyperthreads service interrupts. */ if (hyperthreading_cpus > 1 && ==== //depot/projects/mjexp_6/sys/amd64/amd64/trap.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.289.2.3 2005/11/28 20:03:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.289.2.5 2007/02/03 03:14:21 alc Exp $"); /* * AMD64 Trap and System call handling @@ -92,6 +92,7 @@ #include #endif #include +#include extern void trap(struct trapframe frame); extern void syscall(struct trapframe frame); @@ -532,8 +533,14 @@ map = &vm->vm_map; } + /* + * PGEX_I is defined only if the execute disable bit capability is + * supported and enabled. + */ if (frame->tf_err & PGEX_W) ftype = VM_PROT_WRITE; + else if ((frame->tf_err & PGEX_I) && pg_nx != 0) + ftype = VM_PROT_EXECUTE; else ftype = VM_PROT_READ; @@ -604,9 +611,10 @@ #endif if (type == T_PAGEFLT) { printf("fault virtual address = 0x%lx\n", eva); - printf("fault code = %s %s, %s\n", + printf("fault code = %s %s %s, %s\n", code & PGEX_U ? "user" : "supervisor", code & PGEX_W ? "write" : "read", + code & PGEX_I ? "instruction" : "data", code & PGEX_P ? "protection violation" : "page not present"); } printf("instruction pointer = 0x%lx:0x%lx\n", @@ -786,10 +794,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/mjexp_6/sys/amd64/include/gdb_machdep.h#2 (text+ko) ==== @@ -23,13 +23,13 @@ * (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/amd64/include/gdb_machdep.h,v 1.3.2.1 2006/08/17 21:26:56 marcel Exp $ + * $FreeBSD: src/sys/amd64/include/gdb_machdep.h,v 1.3.2.2 2007/02/08 17:45:50 jhb Exp $ */ #ifndef _MACHINE_GDB_MACHDEP_H_ #define _MACHINE_GDB_MACHDEP_H_ -#define GDB_BUFSZ 500 +#define GDB_BUFSZ (GDB_NREGS * 16) #define GDB_NREGS 56 #define GDB_REG_PC 16 ==== //depot/projects/mjexp_6/sys/amd64/include/pmap.h#2 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.127 2005/06/29 22:28:45 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.127.2.1 2007/02/03 02:57:02 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -79,6 +79,8 @@ #define PGEX_P 0x01 /* Protection violation vs. not present */ #define PGEX_W 0x02 /* during a Write cycle */ #define PGEX_U 0x04 /* access from User mode (UPL) */ +#define PGEX_RSV 0x08 /* reserved PTE field is non-zero */ +#define PGEX_I 0x10 /* during an instruction fetch */ /* * Pte related macros. This is complicated by having to deal with ==== //depot/projects/mjexp_6/sys/arm/arm/pmap.c#2 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.36.2.2 2006/06/23 17:41:02 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.36.2.3 2007/02/09 00:19:58 cognet Exp $"); #include #include #include @@ -2883,6 +2883,7 @@ npv = TAILQ_NEXT(pv, pv_plist); pmap_nuke_pv(m, pmap, pv); pmap_free_pv_entry(pv); + pmap_free_l2_bucket(pmap, l2b, 1); } vm_page_unlock_queues(); cpu_idcache_wbinv_all(); ==== //depot/projects/mjexp_6/sys/boot/pc98/btx/btx/btx.S#2 (text+ko) ==== @@ -12,7 +12,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/pc98/btx/btx/btx.S,v 1.21 2005/05/08 14:17:27 nyan Exp $ + * $FreeBSD: src/sys/boot/pc98/btx/btx/btx.S,v 1.21.2.1 2007/01/28 05:49:02 nyan Exp $ */ /* @@ -206,7 +206,7 @@ #ifdef PAGING or $0x80000001,%eax # mode and enable paging #else - or $0x01,%eax # mode + inc %ax # mode #endif mov %eax,%cr0 # ljmp $SEL_SCODE,$init.8 # To 32-bit code @@ -473,12 +473,12 @@ movb $0x4,%cl # Update seg regs rep # in INT_V86 movsl # args -intrtn.2: movl %edx,%esi # Segment registers +intrtn.2: xchgl %edx,%esi # Segment registers leal 0x28(%ebp),%edi # Set up seg movb $0x4,%cl # regs for rep # later movsl # pop - movl %ebx,%esi # Restore exception + xchgl %ebx,%esi # Restore exception movb $0x5,%cl # frame to rep # supervisor movsl # stack @@ -523,9 +523,7 @@ je v86wrmsr # Yes cmpb $0x32,(%esi) # Is it a RDMSR? je v86rdmsr # Yes - cmpb $0x20,(%esi) # Is this a - jne v86mon.4 # MOV EAX,CR0 - cmpb $0xc0,0x1(%esi) # instruction? + cmpb $0x20,(%esi) # Is this a MOV reg,CRx? je v86mov # Yes v86mon.4: cmpb $0xfa,%al # CLI? je v86cli # Yes @@ -557,10 +555,24 @@ leal 0x8(%esp,1),%esp # Discard int no, error iret # To V86 mode /* - * Emulate MOV EAX,CR0. + * Emulate MOV reg,CRx. */ -v86mov: movl %cr0,%eax # CR0 to - movl %eax,0x1c(%ebp) # saved EAX +v86mov: movb 0x1(%esi),%bl # Fetch Mod R/M byte + testb $0x10,%bl # Read CR2 or CR3? + jnz v86mov.1 # Yes + movl %cr0,%eax # Read CR0 + testb $0x20,%bl # Read CR4 instead? + jz v86mov.2 # No + movl %cr4,%eax # Read CR4 + jmp v86mov.2 +v86mov.1: movl %cr2,%eax # Read CR2 + testb $0x08,%bl # Read CR3 instead? + jz v86mov.2 # No + movl %cr3,%eax # Read CR3 +v86mov.2: andl $0x7,%ebx # Compute offset in + shl $2,%ebx # frame of destination + neg %ebx # register + movl %eax,0x1c(%ebp,%ebx,1) # Store CR to reg incl %esi # Adjust IP /* * Return from emulating a 0x0f prefixed instruction @@ -636,41 +648,28 @@ * reads count of words from saved %cx * returns success by setting %ah to 0 */ -int15_87: pushl %eax # Save - pushl %ebx # some information - pushl %esi # onto the stack. - pushl %edi - xorl %eax,%eax # clean EAX - xorl %ebx,%ebx # clean EBX - movl 0x4(%ebp),%esi # Get user's ESI - movl 0x3C(%ebp),%ebx # store ES - movw %si,%ax # store SI - shll $0x4,%ebx # Make it a seg. - addl %eax,%ebx # ebx=(es<<4)+si - movb 0x14(%ebx),%al # Grab the - movb 0x17(%ebx),%ah # necessary - shll $0x10,%eax # information - movw 0x12(%ebx),%ax # from - movl %eax,%esi # the - movb 0x1c(%ebx),%al # GDT in order to - movb 0x1f(%ebx),%ah # have %esi offset - shll $0x10,%eax # of source and %edi - movw 0x1a(%ebx),%ax # of destination. - movl %eax,%edi +int15_87: pushl %esi # Save + pushl %edi # registers + movl 0x3C(%ebp),%edi # Load ES + movzwl 0x4(%ebp),%eax # Load user's SI + shll $0x4,%edi # EDI = (ES << 4) + + addl %eax,%edi # SI + movl 0x11(%edi),%eax # Read base of + movb 0x17(%edi),%al # GDT entry + ror $8,%eax # for source + xchgl %eax,%esi # into %esi + movl 0x19(%edi),%eax # Read base of + movb 0x1f(%edi),%al # GDT entry for + ror $8,%eax # destination + xchgl %eax,%edi # into %edi pushl %ds # Make: popl %es # es = ds - pushl %ecx # stash ECX - xorl %ecx,%ecx # highw of ECX is clear - movw 0x18(%ebp),%cx # Get user's ECX - shll $0x1,%ecx # Convert from num words to num - # bytes + movzwl 0x18(%ebp),%ecx # Get user's CX + shll $0x1,%ecx # Convert count from words rep # repeat... movsb # perform copy. - popl %ecx # Restore - popl %edi - popl %esi # previous - popl %ebx # register - popl %eax # values. + popl %edi # Restore + popl %esi # registers movb $0x0,0x1d(%ebp) # set ah = 0 to indicate # success andb $0xfe,%dl # clear CF @@ -689,23 +688,16 @@ cmpb $0x19,%al # is it int 19? je reboot # yes, reboot the machine cmpb $0x15,%al # is it int 15? - jne v86intn.3 # no, skip parse - pushl %eax # stash EAX - movl 0x1c(%ebp),%eax # user's saved EAX - cmpb $0x87,%ah # is it the memcpy subfunction? - jne v86intn.1 # no, keep checking - popl %eax # get the stack straight - jmp int15_87 # it's our cue -v86intn.1: cmpw $0x4f53,%ax # is it the delete key callout? - jne v86intn.2 # no, handle the int normally - movb BDA_KEYFLAGS,%al # get the shift key state - andb $0x18,%al # mask off just Ctrl and Alt - cmpb $0x18,%al # are both Ctrl and Alt down? - jne v86intn.2 # no, handle the int normally - popl %eax # restore EAX - jmp reboot # reboot the machine -v86intn.2: popl %eax # restore EAX -v86intn.3: subl %edi,%esi # From + jne v86intn.1 # no, skip parse + cmpb $0x87,0x1d(%ebp) # is it the memcpy subfunction? + je int15_87 # yes + cmpw $0x4f53,0x1c(%ebp) # is it the delete key callout? + jne v86intn.1 # no, handle the int normally + movb BDA_KEYFLAGS,%ch # get the shift key state + andb $0x18,%ch # mask off just Ctrl and Alt + cmpb $0x18,%ch # are both Ctrl and Alt down? + je reboot # yes, reboot the machine +v86intn.1: subl %edi,%esi # From shrl $0x4,%edi # linear movw %dx,-0x2(%ebx) # Save flags movw %di,-0x4(%ebx) # Save CS ==== //depot/projects/mjexp_6/sys/compat/ndis/subr_ntoskrnl.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.71.2.5 2005/12/16 17:33:47 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.71.2.6 2007/01/26 06:45:33 sam Exp $"); #include #include @@ -198,6 +198,11 @@ static uint32_t InterlockedIncrement(volatile uint32_t *); static uint32_t InterlockedDecrement(volatile uint32_t *); static void ExInterlockedAddLargeStatistic(uint64_t *, uint32_t); +static void *MmAllocateContiguousMemory(uint32_t, uint64_t); +static void *MmAllocateContiguousMemorySpecifyCache(uint32_t, + uint64_t, uint64_t, uint64_t, uint32_t); +static void MmFreeContiguousMemory(void *); +static void MmFreeContiguousMemorySpecifyCache(void *, uint32_t, uint32_t); static uint32_t MmSizeOfMdl(void *, size_t); static void *MmMapLockedPages(mdl *, uint8_t); static void *MmMapLockedPagesSpecifyCache(mdl *, @@ -235,6 +240,7 @@ static uint32_t IoWMIRegistrationControl(device_object *, uint32_t); static void *ntoskrnl_memset(void *, int, size_t); static void *ntoskrnl_memmove(void *, void *, size_t); +static void *ntoskrnl_memchr(void *, unsigned char, size_t); static char *ntoskrnl_strstr(char *, char *); static int ntoskrnl_toupper(int); static int ntoskrnl_tolower(int); @@ -434,6 +440,23 @@ return(dst); } +static void * +ntoskrnl_memchr(buf, ch, len) + void *buf; + unsigned char ch; + size_t len; +{ + if (len != 0) { + unsigned char *p = buf; + + do { + if (*p++ == ch) + return (p - 1); + } while (--len != 0); + } + return (NULL); +} + static char * ntoskrnl_strstr(s, find) char *s, *find; @@ -2472,6 +2495,52 @@ return; } +static void * +MmAllocateContiguousMemory(size, highest) + uint32_t size; + uint64_t highest; +{ + void *addr; + size_t pagelength = roundup(size, PAGE_SIZE); + + addr = ExAllocatePoolWithTag(NonPagedPool, pagelength, 0); + + return(addr); +} + +static void * +MmAllocateContiguousMemorySpecifyCache(size, lowest, highest, + boundary, cachetype) + uint32_t size; + uint64_t lowest; + uint64_t highest; + uint64_t boundary; + uint32_t cachetype; +{ + void *addr; + size_t pagelength = roundup(size, PAGE_SIZE); + + addr = ExAllocatePoolWithTag(NonPagedPool, pagelength, 0); + + return(addr); +} + +static void +MmFreeContiguousMemory(base) + void *base; +{ + ExFreePool(base); +} + +static void +MmFreeContiguousMemorySpecifyCache(base, size, cachetype) + void *base; + uint32_t size; + uint32_t cachetype; +{ + ExFreePool(base); +} + static uint32_t MmSizeOfMdl(vaddr, len) void *vaddr; @@ -4145,6 +4214,7 @@ IMPORT_SFUNC(DbgBreakPoint, 0), IMPORT_CFUNC(strncmp, 0), IMPORT_CFUNC(strcmp, 0), + IMPORT_CFUNC_MAP(stricmp, strcasecmp, 0), IMPORT_CFUNC(strncpy, 0), IMPORT_CFUNC(strcpy, 0), IMPORT_CFUNC(strlen, 0), @@ -4152,9 +4222,11 @@ IMPORT_CFUNC_MAP(tolower, ntoskrnl_tolower, 0), IMPORT_CFUNC_MAP(strstr, ntoskrnl_strstr, 0), IMPORT_CFUNC_MAP(strchr, index, 0), + IMPORT_CFUNC_MAP(strrchr, rindex, 0), IMPORT_CFUNC(memcpy, 0), IMPORT_CFUNC_MAP(memmove, ntoskrnl_memmove, 0), IMPORT_CFUNC_MAP(memset, ntoskrnl_memset, 0), + IMPORT_CFUNC_MAP(memchr, ntoskrnl_memchr, 0), IMPORT_SFUNC(IoAllocateDriverObjectExtension, 4), IMPORT_SFUNC(IoGetDriverObjectExtension, 2), IMPORT_FFUNC(IofCallDriver, 2), @@ -4240,6 +4312,11 @@ IMPORT_FFUNC(ExInterlockedAddLargeStatistic, 2), IMPORT_SFUNC(IoAllocateMdl, 5), IMPORT_SFUNC(IoFreeMdl, 1), + IMPORT_SFUNC(MmAllocateContiguousMemory, 2), + IMPORT_SFUNC(MmAllocateContiguousMemorySpecifyCache, 5), + IMPORT_SFUNC(MmFreeContiguousMemory, 1), + IMPORT_SFUNC(MmFreeContiguousMemorySpecifyCache, 3), + IMPORT_SFUNC_MAP(MmGetPhysicalAddress, pmap_kextract, 1), IMPORT_SFUNC(MmSizeOfMdl, 1), IMPORT_SFUNC(MmMapLockedPages, 2), IMPORT_SFUNC(MmMapLockedPagesSpecifyCache, 6), ==== //depot/projects/mjexp_6/sys/conf/NOTES#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1325.2.25 2006/12/30 17:55:15 maxim Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1325.2.26 2007/01/28 17:14:56 glebius Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -529,6 +529,7 @@ options NETGRAPH_BPF options NETGRAPH_BRIDGE options NETGRAPH_CISCO +options NETGRAPH_DEFLATE options NETGRAPH_DEVICE options NETGRAPH_ECHO options NETGRAPH_EIFACE @@ -553,6 +554,7 @@ options NETGRAPH_PPP options NETGRAPH_PPPOE options NETGRAPH_PPTPGRE +options NETGRAPH_PRED1 options NETGRAPH_RFC1490 options NETGRAPH_SOCKET options NETGRAPH_SPLIT ==== //depot/projects/mjexp_6/sys/conf/files#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1031.2.48 2006/12/30 17:55:15 maxim Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1031.2.50 2007/01/28 17:14:56 glebius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1480,6 +1480,7 @@ net/zlib.c optional geom_uzip net80211/ieee80211.c optional wlan net80211/ieee80211_acl.c optional wlan_acl +net80211/ieee80211_amrr.c optional wlan_amrr net80211/ieee80211_crypto.c optional wlan net80211/ieee80211_crypto_ccmp.c optional wlan_ccmp net80211/ieee80211_crypto_none.c optional wlan @@ -1618,6 +1619,7 @@ netgraph/ng_bpf.c optional netgraph_bpf netgraph/ng_bridge.c optional netgraph_bridge netgraph/ng_cisco.c optional netgraph_cisco +netgraph/ng_deflate.c optional netgraph_deflate netgraph/ng_device.c optional netgraph_device netgraph/ng_echo.c optional netgraph_echo netgraph/ng_eiface.c optional netgraph_eiface @@ -1641,6 +1643,7 @@ netgraph/ng_ppp.c optional netgraph_ppp netgraph/ng_pppoe.c optional netgraph_pppoe netgraph/ng_pptpgre.c optional netgraph_pptpgre +netgraph/ng_pred1.c optional netgraph_pred1 netgraph/ng_rfc1490.c optional netgraph_rfc1490 netgraph/ng_socket.c optional netgraph_socket netgraph/ng_split.c optional netgraph_split ==== //depot/projects/mjexp_6/sys/conf/options#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.510.2.19 2006/09/02 13:12:08 rwatson Exp $ +# $FreeBSD: src/sys/conf/options,v 1.510.2.20 2007/01/28 17:14:56 glebius Exp $ # # On the handling of kernel options # @@ -411,6 +411,7 @@ NETGRAPH_BPF opt_netgraph.h NETGRAPH_BRIDGE opt_netgraph.h NETGRAPH_CISCO opt_netgraph.h +NETGRAPH_DEFLATE opt_netgraph.h NETGRAPH_DEVICE opt_netgraph.h NETGRAPH_ECHO opt_netgraph.h NETGRAPH_EIFACE opt_netgraph.h @@ -435,6 +436,7 @@ NETGRAPH_PPP opt_netgraph.h NETGRAPH_PPPOE opt_netgraph.h NETGRAPH_PPTPGRE opt_netgraph.h +NETGRAPH_PRED1 opt_netgraph.h NETGRAPH_RFC1490 opt_netgraph.h NETGRAPH_SOCKET opt_netgraph.h NETGRAPH_SPLIT opt_netgraph.h ==== //depot/projects/mjexp_6/sys/contrib/dev/ath/ah.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGES. * - * $Id: //depot/sw/branches/sam_hal/ah.h#10 $ + * $Id: //depot/sw/branches/sam_hal/ah.h#19 $ */ #ifndef _ATH_AH_H_ @@ -131,6 +131,8 @@ HAL_CAP_TPC_CTS = 27, /* cts txpower with per-packet tpc */ HAL_CAP_11D = 28, /* 11d beacon support for changing cc */ HAL_CAP_INTMIT = 29, /* interference mitigation */ + HAL_CAP_RXORN_FATAL = 30, /* HAL_INT_RXORN treated as fatal */ + HAL_CAP_RXTSTAMP_PREC = 34, /* rx desc tstamp precision (bits) */ } HAL_CAPABILITY_TYPE; /* @@ -286,9 +288,7 @@ /* 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 @@ -358,7 +358,7 @@ HAL_INT_GPIO = 0x01000000, HAL_INT_CABEND = 0x02000000, /* Non-common mapping */ HAL_INT_FATAL = 0x40000000, /* Non-common mapping */ - HAL_INT_GLOBAL = 0x80000000, /* Set/clear IER */ +#define HAL_INT_GLOBAL 0x80000000 /* Set/clear IER */ HAL_INT_BMISC = HAL_INT_TIM | HAL_INT_DTIM | HAL_INT_DTIMSYNC @@ -377,7 +377,6 @@ | HAL_INT_SWBA | HAL_INT_BMISS | HAL_INT_GPIO, - HAL_INT_NOCARD = 0xffffffff /* To signal the card was removed */ } HAL_INT; typedef enum { @@ -525,6 +524,7 @@ u_int16_t kv_len; /* length in bits */ u_int8_t kv_val[16]; /* enough for 128-bit keys */ u_int8_t kv_mic[8]; /* TKIP MIC key */ + u_int8_t kv_txmic[8]; /* TKIP TX MIC key (optional) */ } HAL_KEYVAL; typedef enum { @@ -592,6 +592,8 @@ #define HAL_RSSI_EP_MULTIPLIER (1<<7) /* pow2 to optimize out * and / */ struct ath_desc; +struct ath_tx_status; +struct ath_rx_status; /* * Hardware Access Layer (HAL) API. @@ -606,7 +608,7 @@ struct ath_hal { u_int32_t ah_magic; /* consistency check magic number */ u_int32_t ah_abi; /* HAL ABI version */ -#define HAL_ABI_VERSION 0x06052200 /* YYMMDDnn */ +#define HAL_ABI_VERSION 0x06102600 /* YYMMDDnn */ u_int16_t ah_devid; /* PCI device ID */ u_int16_t ah_subvendorid; /* PCI subvendor ID */ HAL_SOFTC ah_sc; /* back pointer to driver/os state */ @@ -620,7 +622,7 @@ /* NB: when only one radio is present the rev is in 5Ghz */ u_int16_t ah_analog5GhzRev;/* 5GHz radio revision */ u_int16_t ah_analog2GhzRev;/* 2GHz radio revision */ - u_int8_t ah_decompMask[HAL_DECOMP_MASK_SIZE]; /* decomp mask array */ + const HAL_RATE_TABLE *__ahdecl(*ah_getRateTable)(struct ath_hal *, u_int mode); void __ahdecl(*ah_detach)(struct ath_hal*); @@ -635,12 +637,7 @@ HAL_BOOL __ahdecl(*ah_perCalibration)(struct ath_hal*, HAL_CHANNEL *, HAL_BOOL *); HAL_BOOL __ahdecl(*ah_setTxPowerLimit)(struct ath_hal *, u_int32_t); - void __ahdecl(*ah_arEnable)(struct ath_hal *); - void __ahdecl(*ah_arDisable)(struct ath_hal *); - void __ahdecl(*ah_arReset)(struct ath_hal *); - HAL_BOOL __ahdecl(*ah_radarHaveEvent)(struct ath_hal *); - HAL_BOOL __ahdecl(*ah_processDfs)(struct ath_hal *, HAL_CHANNEL *); - u_int32_t __ahdecl(*ah_dfsNolCheck)(struct ath_hal *, HAL_CHANNEL *, u_int32_t); + /* DFS support */ HAL_BOOL __ahdecl(*ah_radarWait)(struct ath_hal *, HAL_CHANNEL *); /* Transmit functions */ @@ -674,7 +671,8 @@ HAL_BOOL __ahdecl(*ah_fillTxDesc)(struct ath_hal *, struct ath_desc *, u_int segLen, HAL_BOOL firstSeg, HAL_BOOL lastSeg, const struct ath_desc *); - HAL_STATUS __ahdecl(*ah_procTxDesc)(struct ath_hal *, struct ath_desc*); + HAL_STATUS __ahdecl(*ah_procTxDesc)(struct ath_hal *, + struct ath_desc *, struct ath_tx_status *); void __ahdecl(*ah_getTxIntrQueue)(struct ath_hal *, u_int32_t *); void __ahdecl(*ah_reqTxIntrDesc)(struct ath_hal *, struct ath_desc*); @@ -695,9 +693,10 @@ void __ahdecl(*ah_setRxFilter)(struct ath_hal*, u_int32_t); HAL_BOOL __ahdecl(*ah_setupRxDesc)(struct ath_hal *, struct ath_desc *, u_int32_t size, u_int flags); - HAL_STATUS __ahdecl(*ah_procRxDesc)(struct ath_hal *, struct ath_desc *, - u_int32_t phyAddr, struct ath_desc *next, - u_int64_t tsf); + HAL_STATUS __ahdecl(*ah_procRxDesc)(struct ath_hal *, + struct ath_desc *, u_int32_t phyAddr, + struct ath_desc *next, u_int64_t tsf, + struct ath_rx_status *); void __ahdecl(*ah_rxMonitor)(struct ath_hal *, const HAL_NODE_STATS *, HAL_CHANNEL *); void __ahdecl(*ah_procMibEvent)(struct ath_hal *, ==== //depot/projects/mjexp_6/sys/contrib/dev/ath/ah_desc.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGES. * - * $Id: //depot/sw/branches/sam_hal/ah_desc.h#2 $ + * $Id: //depot/sw/branches/sam_hal/ah_desc.h#5 $ */ #ifndef _DEV_ATH_DESC_H @@ -59,6 +59,7 @@ u_int8_t ts_longretry; /* # long retries */ u_int8_t ts_virtcol; /* virtual collision count */ u_int8_t ts_antenna; /* antenna information */ + u_int8_t ts_finaltsi; /* final transmit series index */ }; #define HAL_TXERR_XRETRY 0x01 /* excessive retries */ @@ -153,17 +154,14 @@ u_int32_t ds_ctl0; /* opaque DMA control 0 */ u_int32_t ds_ctl1; /* opaque DMA control 1 */ u_int32_t ds_hw[4]; /* opaque h/w region */ - /* - * The remaining definitions are managed by software; - * these are valid only after the rx/tx process descriptor - * methods return a non-EINPROGRESS code. - */ +}; + +struct ath_desc_status { union { struct ath_tx_status tx;/* xmit status */ struct ath_rx_status rx;/* recv status */ } ds_us; - void *ds_vdata; /* virtual addr of data buffer */ -} __packed; +}; #define ds_txstat ds_us.tx #define ds_rxstat ds_us.rx @@ -180,4 +178,4 @@ /* flags passed to rx descriptor setup methods */ #define HAL_RXDESC_INTREQ 0x0020 /* enable per-descriptor interrupt */ -#endif /* _DEV_ATH_AR521XDMA_H */ +#endif /* _DEV_ATH_DESC_H */ ==== //depot/projects/mjexp_6/sys/contrib/dev/ath/ah_devid.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGES. * - * $Id: //depot/sw/branches/sam_hal/ah_devid.h#1 $ + * $Id: //depot/sw/branches/sam_hal/ah_devid.h#2 $ */ #ifndef _DEV_ATH_DEVID_H_ @@ -88,6 +88,12 @@ #define AR5213_SREV_1_0 0x0055 #define AR5213_SREV_REG 0x4020 +/* AR5416 */ +#define AR5416_DEVID_EMU_PCI 0xff1d /* PCI Owl Emulation*/ +#define AR5416_DEVID_EMU_PCIE 0xff1c /* PCIe Owl Emulation*/ +#define AR5416_DEVID 0x0023 /* PCI (MB/CB) */ +#define AR5418_DEVID 0x0024 /* PCI Express (XB) */ + #define AR_SUBVENDOR_ID_NOG 0x0e11 /* No 11G subvendor ID */ #define AR_SUBVENDOR_ID_NEW_A 0x7065 /* Update device to new RD */ #endif /* _DEV_ATH_DEVID_H */ ==== //depot/projects/mjexp_6/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 (text) ==== @@ -35,9 +35,9 @@ * * $Id: //depot/sw/branches/sam_hal/COPYRIGHT#1 $ */ -#define ATH_HAL_VERSION "0.9.17.2" +#define ATH_HAL_VERSION "0.9.20.3" begin 644 hal.o -M?T5,1@(!`0````````````$`)I`!`````````````````````````"@-!``` +M?T5,1@(!`0````````````$`)I`!`````````````````````````.CP`P`` M`````````$```````$``#@`+````NR<``+TC$`#P0Z(5"T(``#TD```!($\` M0/2A'0M"&@`@Y*%]`T(,`"#DH5D#0D4`(.2A70)"!0`@Y*$Y`D(X`"#DH?4` M0C,`(/1!`.##H74"0CP`(/0^`.##H54*0C,`(/2A70I"!0`@Y**5`T(``#TD @@ -53,8 +53,8 @@ M`"#D`P`@_.SO(B`3`"#D(@#@P^[N(B`6`"#D'P#@PP$`?R0;\6,@H05#0!$` M(/2A#4-`!0`@Y`$`/R03\"$@H05!0`8`(/04`.##`0`_)!G_(2"A!4%`$``@ MY!,`'R(``'VG`$!;:P``NB<``+TC#0#@PP``?:<`0%MK``"Z)P``O2,(`.## -M``!]IP!`6VL``+HG``"](P,`X,,`!/]'`0`_(```-+`(``#D,`0@H`@`(+`T -M!""@+``@L#@$(*`P`""P/`0@H#0`(+```%ZG$`#>(P&`^FM`!#"R`0`?(`&` +M``!]IP!`6VL``+HG``"](P,`X,,`!/]'`0`_(```-+`(``#D>`,@H`@`(+!\ +M`R"@+``@L(`#(*`P`""PA`,@H#0`(+```%ZG$`#>(P&`^FN(`S"R`0`?(`&` M^FL``+LG``"](]#_WB,``%ZW"``^M1``7K48`'ZU(`">M2@`OK4-!/!'#`3Q M1PL$\D<)!/]'*O9A2A`$[4<1!.Q'``!]IP!`6VL``+HG``"](P``"T0@]@%( MH`4*0`$`/R`)``#T"@`?(@``?:<`0%MK``"Z)P``O2,),"!!&?PI(.W_/^P! @@ -64,9 +64,9 @@ MJ0!@Y&$%I2``WB,!@/IK``"[)P``O2/P_]XC``!> -MMP@`/K4)!/%'H!0PIF$%*4%A!2E````A0`@`(.9&_U_3(/8!2```/20``"$@ +MMP@`/K4)!/%'Z!,PIF$%*4%A!2E````A0`@`(.9&_U_3(/8!2```/20``"$@ M``0!0```("S!`"!(```I3```7J<(`#ZE$`#>(P&`^FL``+LG``"](_#_WB,` -M`%ZW"``^M0D$\4>@%#"F"P`@YC+_7],@]@%(```])```(2``!`%````@+Q@` +M`%ZW"``^M0D$\4?H$S"F"P`@YC+_7],@]@%(```])```(2``!`%````@+Q@` MZ4/9`"!+``!]IP!`^VH+`.##(?8A26(%(4!B!T)`8@5!0&(%04!"!D)`(_=! M2",%8D!#!F%`8P5A0)N69$@`!/M'``!>IP@`/J40`-XC`8#Z:P``NR<``+TC MP/_>(P``7K<(`#ZU$`!>M1@`?K4@`)ZU*`"^M3``WK4.!/!'#`3Q1P0`,:`! @@ -105,2507 +105,2515 @@ M!.Y'$03L1PX`7R(3!.M'%`3_1R?^7],,`"HL+`!)($$"(DA@!P)(``0!1`P` M"CP0!.Y'$03L1PX`7R(3!.M'`0"?(AO^7],.`"HL+@`I(4$"*4A@!PE(``0! M1`X`"CP-,*!!```LH*$-+4#(_S_D``!>IP@`/J40`%ZE&`!^I2``GJ4H`+ZE -M,`#>I4``WB,!@/IK``"[)P``O2-(!%`@,?8A2J&7(T)9`"#D```])```(2!! -M!"%"```AH`$$H4-1`.%K;`0PH`(`X,,(`"*@P5(@2"%V($@``#.P``3_1P&` -M^FL(`"*@^O__PP``(J#!4B!()P#@PP``(J"!]B%(``3_1X"R(40!@/IK```B -MH`&0($0"`.##```BH`$0(42A`^%#``3_1X"T(40!@/IK```BH`$0(D3Y___# -M7`0PH.7__\,R]D%*H35`0@<`(/0`!/]'+P!`YJ%50$('`"#TH75`0@<`(/0G -M`.##8`0PH"$7)DB!%R9(U___PV`$,*#3___#9`0PH-/__\,``"*@@38B2``$ -M_T?`LB%$`8#Z:P``(J"!5B)(^O__PP``(J"!%B%(]___PP``(J"!EB)(]/__ -MPP``(J"!MB)(\?__PS+V04JA-4!"!P`@]`,`0.:A54!"!@`@]`<`X,,``"*@ -M@=8B2.?__\.\%#"@R?__P[@4,*"S___##0`?(`&`^FL,`!\@`8#Z:S'V(4JA -M]2%"`P`@]*$U(T('`"#T%@#@PZ%U0$(4`"#DH9=@0A(`(.1D!'"R"`#@PS+V -M04JA-4!"`P`@]*%50$(%`"#T"@#@PZ$#\T.\%#"P`0`?(`&`^FNX%%"@(I9? -M2"%V8$H!!")$N!0PL/C__\,"`(#F#``_(```-+``!/]'`8#Z:P``NR<``+TC -ML/_>(P``7K<(`#ZU$`!>M1@`?K4@`)ZU*`"^M3``WK4X`/ZU#03P1T``/K9( -M`%ZV"@3S1PL$\DI$$$XD$``$$LR0)!2`(` >>> TRUNCATED FOR MAIL (1000 lines) <<<