Date: Mon, 3 May 2010 17:26:07 GMT From: Gabor Pali <pgj@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 177661 for review Message-ID: <201005031726.o43HQ7Le049491@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@177661?ac=10 Change 177661 by pgj@csupor on 2010/05/03 17:25:30 IFC Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/lib/libpam/modules/pam_krb5/pam_krb5.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libpam/modules/pam_krb5/pam_krb5.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/exception.S#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/at91/if_ate.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/linux/linux_ioctl.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ae/if_ae.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/agp/agp.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/agp/agp_i810.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/an/if_an.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bwi/if_bwi.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bwn/if_bwn.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ce/if_ce.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cm/smc90cx6.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cp/if_cp.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cs/if_cs.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ctau/if_ct.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cx/if_cx.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cxgb/cxgb_main.c#7 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/via_dmablit.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ed/if_ed.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ep/if_ep.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ex/if_ex.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/fe/if_fe.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ie/if_ie.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ipw/if_ipw.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/iwn/if_iwn.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/le/lance.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/malo/if_malo.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mwl/if_mwl.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/my/if_my.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/nxge/if_nxge.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/pdq/pdq_ifsubr.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ral/rt2560.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ral/rt2661.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sbni/if_sbni.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sge/if_sge.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/smc/if_smc.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sn/if_sn.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/snc/dp83932.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ti/if_ti.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/uhso.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/usb_ethernet.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_rum.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_run.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_uath.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_upgt.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_ural.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_urtw.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_zyd.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/vx/if_vx.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/wi/if_wi.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/wl/if_wl.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/wpi/if_wpi.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/xe/if_xe.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/tmpfs/tmpfs_vnops.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/uipc_cow.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/uipc_syscalls.c#8 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_bio.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/adm5120/if_admsw.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/atheros/if_arge.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/bpf_zerocopy.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/if.c#7 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/if_ef.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/if_gif.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/if_gre.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/if_stf.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netgraph/ng_base.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netgraph/ng_eiface.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netgraph/ng_fec.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netgraph/ng_iface.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/pci/if_rl.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_contig.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_kern.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_page.c#6 integrate Differences ... ==== //depot/projects/soc2009/pgj_libstat/src/lib/libpam/modules/pam_krb5/pam_krb5.8#2 (text+ko) ==== @@ -1,7 +1,7 @@ .\" .\" $Id: pam_krb5.5,v 1.5 2000/01/05 00:59:56 fcusack Exp $ -.\" $FreeBSD: src/lib/libpam/modules/pam_krb5/pam_krb5.8,v 1.6 2001/11/24 23:41:32 dd Exp $ -.Dd January 15, 1999 +.\" $FreeBSD: src/lib/libpam/modules/pam_krb5/pam_krb5.8,v 1.8 2010/05/03 09:49:42 delphij Exp $ +.Dd May 3, 2010 .Dt PAM_KRB5 8 .Os .Sh NAME @@ -108,6 +108,10 @@ .Ql %p , to designate the current process ID; can be used in .Ar name . +.It Cm no_user_check +Do not verify if a user exists on the local system. This option implies the +.Cm no_ccache +option because there is no secure local uid/gid for the cache file. .El .Ss Kerberos 5 Account Management Module The Kerberos 5 account management component ==== //depot/projects/soc2009/pgj_libstat/src/lib/libpam/modules/pam_krb5/pam_krb5.c#2 (text+ko) ==== @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_krb5/pam_krb5.c,v 1.24 2007/12/21 12:00:15 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_krb5/pam_krb5.c,v 1.26 2010/05/03 07:39:51 mm Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -89,6 +89,7 @@ #define PAM_OPT_DEBUG "debug" #define PAM_OPT_FORWARDABLE "forwardable" #define PAM_OPT_NO_CCACHE "no_ccache" +#define PAM_OPT_NO_USER_CHECK "no_user_check" #define PAM_OPT_REUSE_CCACHE "reuse_ccache" /* @@ -194,34 +195,39 @@ PAM_LOG("Got password"); - /* Verify the local user exists (AFTER getting the password) */ - if (strchr(user, '@')) { - /* get a local account name for this principal */ - krbret = krb5_aname_to_localname(pam_context, princ, - sizeof(luser), luser); - if (krbret != 0) { - PAM_VERBOSE_ERROR("Kerberos 5 error"); - PAM_LOG("Error krb5_aname_to_localname(): %s", - krb5_get_err_text(pam_context, krbret)); + if (openpam_get_option(pamh, PAM_OPT_NO_USER_CHECK)) + PAM_LOG("Skipping local user check"); + else { + + /* Verify the local user exists (AFTER getting the password) */ + if (strchr(user, '@')) { + /* get a local account name for this principal */ + krbret = krb5_aname_to_localname(pam_context, princ, + sizeof(luser), luser); + if (krbret != 0) { + PAM_VERBOSE_ERROR("Kerberos 5 error"); + PAM_LOG("Error krb5_aname_to_localname(): %s", + krb5_get_err_text(pam_context, krbret)); + retval = PAM_USER_UNKNOWN; + goto cleanup2; + } + + retval = pam_set_item(pamh, PAM_USER, luser); + if (retval != PAM_SUCCESS) + goto cleanup2; + + PAM_LOG("PAM_USER Redone"); + } + + pwd = getpwnam(user); + if (pwd == NULL) { retval = PAM_USER_UNKNOWN; goto cleanup2; } - retval = pam_set_item(pamh, PAM_USER, luser); - if (retval != PAM_SUCCESS) - goto cleanup2; - - PAM_LOG("PAM_USER Redone"); + PAM_LOG("Done getpwnam()"); } - pwd = getpwnam(user); - if (pwd == NULL) { - retval = PAM_USER_UNKNOWN; - goto cleanup2; - } - - PAM_LOG("Done getpwnam()"); - /* Get a TGT */ memset(&creds, 0, sizeof(krb5_creds)); krbret = krb5_get_init_creds_password(pam_context, &creds, princ, @@ -366,7 +372,8 @@ return (PAM_SERVICE_ERR); /* If a persistent cache isn't desired, stop now. */ - if (openpam_get_option(pamh, PAM_OPT_NO_CCACHE)) + if (openpam_get_option(pamh, PAM_OPT_NO_CCACHE) || + openpam_get_option(pamh, PAM_OPT_NO_USER_CHECK)) return (PAM_SUCCESS); PAM_LOG("Establishing credentials"); ==== //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/exception.S#5 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.144 2010/04/14 20:04:55 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.145 2010/05/03 14:30:49 kib Exp $ */ #include "opt_atpic.h" @@ -50,14 +50,14 @@ .bss .globl dtrace_invop_jump_addr .align 8 - .type dtrace_invop_jump_addr, @object - .size dtrace_invop_jump_addr, 8 + .type dtrace_invop_jump_addr,@object + .size dtrace_invop_jump_addr,8 dtrace_invop_jump_addr: .zero 8 .globl dtrace_invop_calltrap_addr .align 8 - .type dtrace_invop_calltrap_addr, @object - .size dtrace_invop_calltrap_addr, 8 + .type dtrace_invop_calltrap_addr,@object + .size dtrace_invop_calltrap_addr,8 dtrace_invop_calltrap_addr: .zero 8 #endif @@ -157,7 +157,6 @@ * kernel from userland. Reenable interrupts if they were enabled * before the trap. This approximates SDT_SYS386TGT on the i386 port. */ - SUPERALIGN_TEXT .globl alltraps .type alltraps,@function @@ -211,16 +210,16 @@ * Set our jump address for the jump back in the event that * the breakpoint wasn't caused by DTrace at all. */ - movq $calltrap, dtrace_invop_calltrap_addr(%rip) + movq $calltrap,dtrace_invop_calltrap_addr(%rip) /* Jump to the code hooked in by DTrace. */ - movq dtrace_invop_jump_addr, %rax + movq dtrace_invop_jump_addr,%rax jmpq *dtrace_invop_jump_addr #endif .globl calltrap .type calltrap,@function calltrap: - movq %rsp, %rdi + movq %rsp,%rdi call trap MEXITCOUNT jmp doreti /* Handle any pending ASTs */ @@ -274,9 +273,11 @@ testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ jz 1f /* already running with kernel GS.base */ swapgs -1: movq %rsp, %rdi +1: + movq %rsp,%rdi call dblfault_handler -2: hlt +2: + hlt jmp 2b IDTVEC(page) @@ -369,7 +370,7 @@ movq %r15,TF_R15(%rsp) /* C preserved */ movl $TF_HASSEGS,TF_FLAGS(%rsp) FAKE_MCOUNT(TF_RIP(%rsp)) - movq %rsp, %rdi + movq %rsp,%rdi call syscall movq PCPU(CURPCB),%rax andq $~PCB_FULLCTX,PCB_FLAGS(%rax) @@ -456,7 +457,7 @@ /* Note: this label is also used by ddb and gdb: */ nmi_calltrap: FAKE_MCOUNT(TF_RIP(%rsp)) - movq %rsp, %rdi + movq %rsp,%rdi call trap MEXITCOUNT #ifdef HWPMC_HOOKS @@ -555,9 +556,9 @@ iretq ENTRY(fork_trampoline) - movq %r12, %rdi /* function */ - movq %rbx, %rsi /* arg1 */ - movq %rsp, %rdx /* trapframe pointer */ + movq %r12,%rdi /* function */ + movq %rbx,%rsi /* arg1 */ + movq %rsp,%rdx /* trapframe pointer */ call fork_exit MEXITCOUNT jmp doreti /* Handle any ASTs */ @@ -628,7 +629,7 @@ testl $TDF_ASTPENDING | TDF_NEEDRESCHED,TD_FLAGS(%rax) je doreti_exit sti - movq %rsp, %rdi /* pass a pointer to the trapframe */ + movq %rsp,%rdi /* pass a pointer to the trapframe */ call ast jmp doreti_ast @@ -648,8 +649,8 @@ * Do not reload segment registers for kernel. * Since we do not reload segments registers with sane * values on kernel entry, descriptors referenced by - * segments registers may be not valid. This is fatal - * for the usermode, but is innocent for the kernel. + * segments registers might be not valid. This is fatal + * for user mode, but is not a problem for the kernel. */ testb $SEL_RPL_MASK,TF_CS(%rsp) jz ld_regs @@ -662,14 +663,16 @@ /* Restore %fs and fsbase */ movw TF_FS(%rsp),%ax .globl ld_fs -ld_fs: movw %ax,%fs +ld_fs: + movw %ax,%fs cmpw $KUF32SEL,%ax jne 1f movl $MSR_FSBASE,%ecx movl PCB_FSBASE(%r8),%eax movl PCB_FSBASE+4(%r8),%edx .globl ld_fsbase -ld_fsbase: wrmsr +ld_fsbase: + wrmsr 1: /* Restore %gs and gsbase */ movw TF_GS(%rsp),%si @@ -678,7 +681,8 @@ movl $MSR_GSBASE,%ecx rdmsr .globl ld_gs -ld_gs: movw %si,%gs +ld_gs: + movw %si,%gs wrmsr popfq cmpw $KUG32SEL,%si @@ -687,12 +691,17 @@ movl PCB_GSBASE(%r8),%eax movl PCB_GSBASE+4(%r8),%edx .globl ld_gsbase -ld_gsbase: wrmsr -1: .globl ld_es -ld_es: movw TF_ES(%rsp),%es +ld_gsbase: + wrmsr +1: + .globl ld_es +ld_es: + movw TF_ES(%rsp),%es .globl ld_ds -ld_ds: movw TF_DS(%rsp),%ds -ld_regs:movq TF_RDI(%rsp),%rdi +ld_ds: + movw TF_DS(%rsp),%ds +ld_regs: + movq TF_RDI(%rsp),%rdi movq TF_RSI(%rsp),%rsi movq TF_RDX(%rsp),%rdx movq TF_RCX(%rsp),%rcx @@ -711,7 +720,8 @@ jz 1f /* keep running with kernel GS.base */ cli swapgs -1: addq $TF_RIP,%rsp /* skip over tf_err, tf_trapno */ +1: + addq $TF_RIP,%rsp /* skip over tf_err, tf_trapno */ .globl doreti_iret doreti_iret: iretq @@ -738,7 +748,8 @@ testl $PSL_I,TF_RFLAGS(%rsp) jz 1f sti -1: movw %fs,TF_FS(%rsp) +1: + movw %fs,TF_FS(%rsp) movw %gs,TF_GS(%rsp) movw %es,TF_ES(%rsp) movw %ds,TF_DS(%rsp) @@ -768,7 +779,7 @@ .globl ds_load_fault ds_load_fault: movl $T_PROTFLT,TF_TRAPNO(%rsp) - movq %rsp, %rdi + movq %rsp,%rdi call trap movw $KUDSEL,TF_DS(%rsp) jmp doreti @@ -777,7 +788,7 @@ .globl es_load_fault es_load_fault: movl $T_PROTFLT,TF_TRAPNO(%rsp) - movq %rsp, %rdi + movq %rsp,%rdi call trap movw $KUDSEL,TF_ES(%rsp) jmp doreti @@ -786,7 +797,7 @@ .globl fs_load_fault fs_load_fault: movl $T_PROTFLT,TF_TRAPNO(%rsp) - movq %rsp, %rdi + movq %rsp,%rdi call trap movw $KUF32SEL,TF_FS(%rsp) jmp doreti @@ -796,7 +807,7 @@ gs_load_fault: popfq movl $T_PROTFLT,TF_TRAPNO(%rsp) - movq %rsp, %rdi + movq %rsp,%rdi call trap movw $KUG32SEL,TF_GS(%rsp) jmp doreti @@ -805,7 +816,7 @@ .globl fsbase_load_fault fsbase_load_fault: movl $T_PROTFLT,TF_TRAPNO(%rsp) - movq %rsp, %rdi + movq %rsp,%rdi call trap movq PCPU(CURTHREAD),%r8 movq TD_PCB(%r8),%r8 @@ -816,7 +827,7 @@ .globl gsbase_load_fault gsbase_load_fault: movl $T_PROTFLT,TF_TRAPNO(%rsp) - movq %rsp, %rdi + movq %rsp,%rdi call trap movq PCPU(CURTHREAD),%r8 movq TD_PCB(%r8),%r8 ==== //depot/projects/soc2009/pgj_libstat/src/sys/arm/at91/if_ate.c#6 (text) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.44 2010/02/28 18:06:54 ticso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.45 2010/05/03 07:32:50 sobomax Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -272,8 +272,8 @@ ifp->if_ioctl = ateioctl; ifp->if_init = ateinit; ifp->if_baudrate = 10000000; - IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); - ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; + IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen); + ifp->if_snd.ifq_drv_maxlen = ifqmaxlen; IFQ_SET_READY(&ifp->if_snd); ifp->if_linkmib = &sc->mibdata; ifp->if_linkmiblen = sizeof(sc->mibdata); ==== //depot/projects/soc2009/pgj_libstat/src/sys/arm/xscale/ixp425/if_npe.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.20 2009/06/26 11:45:06 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.21 2010/05/03 07:32:50 sobomax Exp $"); /* * Intel XScale NPE Ethernet driver. @@ -360,7 +360,7 @@ ifp->if_ioctl = npeioctl; ifp->if_init = npeinit; IFQ_SET_MAXLEN(&ifp->if_snd, sc->txdma.nbuf - 1); - ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; + ifp->if_snd.ifq_drv_maxlen = ifqmaxlen; IFQ_SET_READY(&ifp->if_snd); ifp->if_linkmib = &sc->mibdata; ifp->if_linkmiblen = sizeof(sc->mibdata); ==== //depot/projects/soc2009/pgj_libstat/src/sys/compat/linux/linux_ioctl.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ #include "opt_compat.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.163 2010/03/26 08:42:11 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.164 2010/05/03 14:19:58 netchild Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -2628,6 +2628,7 @@ return (0); } +#ifdef COMPAT_LINUX_V4L_CLIPLIST static int linux_to_bsd_v4l_clip(struct l_video_clip *lvc, struct video_clip *vc) { @@ -2638,6 +2639,7 @@ vc->next = PTRIN(lvc->next); /* possible pointer size conversion */ return (0); } +#endif static int linux_to_bsd_v4l_window(struct l_video_window *lvw, struct video_window *vw) @@ -2698,6 +2700,7 @@ return (0); } +#ifdef COMPAT_LINUX_V4L_CLIPLIST static int linux_v4l_clip_copy(void *lvc, struct video_clip **ppvc) { @@ -2772,15 +2775,18 @@ * example of cliplist use. */ plvc = PTRIN(lvw->clips); + vw->clips = NULL; ppvc = &(vw->clips); while (clipcount-- > 0) { - if (plvc == 0) + if (plvc == 0) { error = EFAULT; - if (!error) + break; + } else { error = linux_v4l_clip_copy(plvc, ppvc); - if (error) { - linux_v4l_cliplist_free(vw); - break; + if (error) { + linux_v4l_cliplist_free(vw); + break; + } } ppvc = &((*ppvc)->next); plvc = PTRIN(((struct l_video_clip *) plvc)->next); @@ -2795,6 +2801,7 @@ } return (error); } +#endif static int linux_ioctl_v4l(struct thread *td, struct linux_ioctl_args *args) @@ -2818,6 +2825,12 @@ case LINUX_VIDIOCGTUNER: if ((error = fget(td, args->fd, &fp)) != 0) return (error); + error = copyin((void *) args->arg, &l_vtun, sizeof(l_vtun)); + if (error) { + fdrop(fp, td); + return (error); + } + linux_to_bsd_v4l_tuner(&l_vtun, &vtun); error = fo_ioctl(fp, VIDIOCGTUNER, &vtun, td->td_ucred, td); if (!error) { bsd_to_linux_v4l_tuner(&vtun, &l_vtun); @@ -2836,7 +2849,7 @@ return (error); } linux_to_bsd_v4l_tuner(&l_vtun, &vtun); - error = fo_ioctl(fp, VIDIOCSMICROCODE, &vtun, td->td_ucred, td); + error = fo_ioctl(fp, VIDIOCSTUNER, &vtun, td->td_ucred, td); fdrop(fp, td); return (error); @@ -2865,14 +2878,18 @@ return (error); } linux_to_bsd_v4l_window(&l_vwin, &vwin); +#ifdef COMPAT_LINUX_V4L_CLIPLIST error = linux_v4l_cliplist_copy(&l_vwin, &vwin); if (error) { fdrop(fp, td); return (error); } +#endif error = fo_ioctl(fp, VIDIOCSWIN, &vwin, td->td_ucred, td); fdrop(fp, td); +#ifdef COMPAT_LINUX_V4L_CLIPLIST linux_v4l_cliplist_free(&vwin); +#endif return (error); case LINUX_VIDIOCGFBUF: @@ -2924,7 +2941,7 @@ return (error); } linux_to_bsd_v4l_code(&l_vcode, &vcode); - error = fo_ioctl(fp, VIDIOCSTUNER, &vcode, td->td_ucred, td); + error = fo_ioctl(fp, VIDIOCSMICROCODE, &vcode, td->td_ucred, td); fdrop(fp, td); return (error); ==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/ae/if_ae.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ae/if_ae.c,v 1.9 2010/01/10 14:48:42 gavin Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ae/if_ae.c,v 1.10 2010/05/03 07:32:50 sobomax Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -378,7 +378,7 @@ ifp->if_init = ae_init; ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING; ifp->if_hwassist = 0; - ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; + ifp->if_snd.ifq_drv_maxlen = ifqmaxlen; IFQ_SET_MAXLEN(&ifp->if_snd, ifp->if_snd.ifq_drv_maxlen); IFQ_SET_READY(&ifp->if_snd); if (pci_find_extcap(dev, PCIY_PMG, &pmc) == 0) { ==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/agp/agp.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/agp/agp.c,v 1.67 2010/01/07 21:01:37 mbr Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp.c,v 1.68 2010/05/03 16:55:50 alc Exp $"); #include "opt_agp.h" #include "opt_bus.h" @@ -623,9 +623,11 @@ m = vm_page_lookup(mem->am_obj, OFF_TO_IDX(k)); if (k >= i) vm_page_wakeup(m); + vm_page_lock(m); vm_page_lock_queues(); vm_page_unwire(m, 0); vm_page_unlock_queues(); + vm_page_unlock(m); } VM_OBJECT_UNLOCK(mem->am_obj); @@ -657,9 +659,11 @@ VM_OBJECT_LOCK(mem->am_obj); for (i = 0; i < mem->am_size; i += PAGE_SIZE) { m = vm_page_lookup(mem->am_obj, atop(i)); + vm_page_lock(m); vm_page_lock_queues(); vm_page_unwire(m, 0); vm_page_unlock_queues(); + vm_page_unlock(m); } VM_OBJECT_UNLOCK(mem->am_obj); ==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/agp/agp_i810.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/agp/agp_i810.c,v 1.56 2010/03/12 21:34:23 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp_i810.c,v 1.57 2010/05/03 16:55:50 alc Exp $"); #include "opt_bus.h" @@ -1010,10 +1010,12 @@ VM_OBJECT_LOCK(mem->am_obj); m = vm_page_lookup(mem->am_obj, 0); - VM_OBJECT_UNLOCK(mem->am_obj); + vm_page_lock(m); vm_page_lock_queues(); vm_page_unwire(m, 0); vm_page_unlock_queues(); + vm_page_unlock(m); + VM_OBJECT_UNLOCK(mem->am_obj); } else { contigfree(sc->argb_cursor, mem->am_size, M_AGP); sc->argb_cursor = NULL; ==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/an/if_an.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.95 2009/11/24 16:57:35 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.96 2010/05/03 07:32:50 sobomax Exp $"); /* * The Aironet 4500/4800 series cards come in PCMCIA, ISA and PCI form. @@ -767,8 +767,8 @@ ifp->if_start = an_start; ifp->if_init = an_init; ifp->if_baudrate = 10000000; - IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); - ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; + IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen); + ifp->if_snd.ifq_drv_maxlen = ifqmaxlen; IFQ_SET_READY(&ifp->if_snd); bzero(sc->an_config.an_nodename, sizeof(sc->an_config.an_nodename)); ==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/ath/if_ath.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.272 2010/04/10 13:54:00 bschmidt Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.273 2010/05/03 07:32:50 sobomax Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -562,8 +562,8 @@ ifp->if_start = ath_start; ifp->if_ioctl = ath_ioctl; ifp->if_init = ath_init; - IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); - ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; + IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen); + ifp->if_snd.ifq_drv_maxlen = ifqmaxlen; IFQ_SET_READY(&ifp->if_snd); ic->ic_ifp = ifp; ==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/bwi/if_bwi.c#5 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/bwi/if_bwi.c,v 1.11 2010/04/07 17:49:47 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bwi/if_bwi.c,v 1.12 2010/05/03 07:32:50 sobomax Exp $"); #include "opt_inet.h" #include "opt_bwi.h" @@ -461,8 +461,8 @@ ifp->if_init = bwi_init; ifp->if_ioctl = bwi_ioctl; ifp->if_start = bwi_start; - IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); - ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; + IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen); + ifp->if_snd.ifq_drv_maxlen = ifqmaxlen; IFQ_SET_READY(&ifp->if_snd); callout_init_mtx(&sc->sc_watchdog_timer, &sc->sc_mtx, 0); ==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/bwn/if_bwn.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/bwn/if_bwn.c,v 1.16 2010/04/24 23:32:24 weongyo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bwn/if_bwn.c,v 1.17 2010/05/03 07:32:50 sobomax Exp $"); /* * The Broadcom Wireless LAN controller driver. @@ -1193,8 +1193,8 @@ ifp->if_init = bwn_init; ifp->if_ioctl = bwn_ioctl; ifp->if_start = bwn_start; - IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); - ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; + IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen); + ifp->if_snd.ifq_drv_maxlen = ifqmaxlen; IFQ_SET_READY(&ifp->if_snd); return (0); ==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/ce/if_ce.c#4 (text+ko) ==== @@ -16,7 +16,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ce/if_ce.c,v 1.16 2009/11/17 16:43:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ce/if_ce.c,v 1.17 2010/05/03 07:32:50 sobomax Exp $"); #include <sys/param.h> @@ -701,9 +701,9 @@ #endif continue; } - d->queue.ifq_maxlen = IFQ_MAXLEN; - d->hi_queue.ifq_maxlen = IFQ_MAXLEN; - d->rqueue.ifq_maxlen = IFQ_MAXLEN; + d->queue.ifq_maxlen = ifqmaxlen; + d->hi_queue.ifq_maxlen = ifqmaxlen; + d->rqueue.ifq_maxlen = ifqmaxlen; #if __FreeBSD_version >= 500000 mtx_init (&d->queue.ifq_mtx, "ce_queue", NULL, MTX_DEF); mtx_init (&d->hi_queue.ifq_mtx, "ce_queue_hi", NULL, MTX_DEF); @@ -732,7 +732,7 @@ d->ifp->if_ioctl = ce_sioctl; d->ifp->if_start = ce_ifstart; d->ifp->if_init = ce_initialize; - d->rqueue.ifq_maxlen = IFQ_MAXLEN; + d->rqueue.ifq_maxlen = ifqmaxlen; #if __FreeBSD_version >= 500000 mtx_init (&d->rqueue.ifq_mtx, "ce_rqueue", NULL, MTX_DEF); #endif ==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/cm/smc90cx6.c#4 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: smc90cx6.c,v 1.38 2001/07/07 15:57:53 thorpej Exp $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/cm/smc90cx6.c,v 1.22 2010/03/01 16:52:11 joel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cm/smc90cx6.c,v 1.23 2010/05/03 07:32:50 sobomax Exp $"); /*- * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc. @@ -189,7 +189,7 @@ ifp->if_ioctl = cm_ioctl; ifp->if_init = cm_init; /* XXX IFQ_SET_READY(&ifp->if_snd); */ - ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + ifp->if_snd.ifq_maxlen = ifqmaxlen; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX; arc_ifattach(ifp, linkaddress); ==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/cp/if_cp.c#4 (text+ko) ==== @@ -22,7 +22,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/cp/if_cp.c,v 1.39 2009/11/17 16:43:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cp/if_cp.c,v 1.40 2010/05/03 07:32:50 sobomax Exp $"); #include <sys/param.h> #include <sys/ucred.h> @@ -505,8 +505,8 @@ NG_NODE_UNREF (d->node); continue; } - d->queue.ifq_maxlen = IFQ_MAXLEN; - d->hi_queue.ifq_maxlen = IFQ_MAXLEN; + d->queue.ifq_maxlen = ifqmaxlen; + d->hi_queue.ifq_maxlen = ifqmaxlen; mtx_init (&d->queue.ifq_mtx, "cp_queue", NULL, MTX_DEF); mtx_init (&d->hi_queue.ifq_mtx, "cp_queue_hi", NULL, MTX_DEF); #else /*NETGRAPH*/ ==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/cs/if_cs.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs.c,v 1.57 2010/01/18 17:52:57 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs.c,v 1.58 2010/05/03 07:32:50 sobomax Exp $"); /* * @@ -500,7 +500,7 @@ ifp->if_start=cs_start; ifp->if_ioctl=cs_ioctl; ifp->if_init=cs_init; - IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); + IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen); ifp->if_flags=(IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST); ==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/ctau/if_ct.c#4 (text+ko) ==== @@ -22,7 +22,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.40 2009/11/17 16:43:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.41 2010/05/03 07:32:50 sobomax Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -722,8 +722,8 @@ ct_bus_dma_mem_free (&d->dmamem); continue; } - d->queue.ifq_maxlen = IFQ_MAXLEN; - d->hi_queue.ifq_maxlen = IFQ_MAXLEN; + d->queue.ifq_maxlen = ifqmaxlen; + d->hi_queue.ifq_maxlen = ifqmaxlen; mtx_init (&d->queue.ifq_mtx, "ct_queue", NULL, MTX_DEF); mtx_init (&d->hi_queue.ifq_mtx, "ct_queue_hi", NULL, MTX_DEF); #else /*NETGRAPH*/ ==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/cx/if_cx.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.62 2009/11/17 16:43:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.63 2010/05/03 07:32:50 sobomax Exp $"); #include <sys/param.h> @@ -831,8 +831,8 @@ cx_bus_dma_mem_free (&d->dmamem); continue; } - d->lo_queue.ifq_maxlen = IFQ_MAXLEN; - d->hi_queue.ifq_maxlen = IFQ_MAXLEN; + d->lo_queue.ifq_maxlen = ifqmaxlen; + d->hi_queue.ifq_maxlen = ifqmaxlen; mtx_init (&d->lo_queue.ifq_mtx, "cx_queue_lo", NULL, MTX_DEF); mtx_init (&d->hi_queue.ifq_mtx, "cx_queue_hi", NULL, MTX_DEF); #else /*NETGRAPH*/ ==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/cxgb/cxgb_main.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ ***************************************************************************/ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.106 2010/04/02 17:50:52 np Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.107 2010/05/03 07:32:50 sobomax Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1012,7 +1012,7 @@ ifp->if_ioctl = cxgb_ioctl; ifp->if_start = cxgb_start; - ifp->if_snd.ifq_drv_maxlen = cxgb_snd_queue_len; + ifp->if_snd.ifq_drv_maxlen = max(cxgb_snd_queue_len, ifqmaxlen); IFQ_SET_MAXLEN(&ifp->if_snd, ifp->if_snd.ifq_drv_maxlen); IFQ_SET_READY(&ifp->if_snd); ==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/via_dmablit.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/drm/via_dmablit.c,v 1.2 2010/04/30 00:46:43 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/via_dmablit.c,v 1.3 2010/05/03 16:55:50 alc Exp $"); /* * Unmaps the DMA mappings. @@ -178,9 +178,11 @@ case dr_via_pages_locked: for (i=0; i < vsg->num_pages; ++i) { if ( NULL != (page = vsg->pages[i])) { + vm_page_lock(page); vm_page_lock_queues(); vm_page_unwire(page, 0); vm_page_unlock_queues(); + vm_page_unlock(page); } } case dr_via_pages_alloc: ==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/ed/if_ed.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.283 2009/11/17 14:23:09 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.284 2010/05/03 07:32:50 sobomax Exp $"); /* * Device driver for National Semiconductor DS8390/WD83C690 based ethernet @@ -283,8 +283,8 @@ ifp->if_start = ed_start; ifp->if_ioctl = ed_ioctl; ifp->if_init = ed_init; - IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); - ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005031726.o43HQ7Le049491>