Date: Mon, 1 Apr 2002 08:24:23 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 8778 for review Message-ID: <200204011624.g31GONS79452@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8778 Change 8778 by jhb@jhb_laptop on 2002/04/01 08:23:45 Catch up to suser() losing its flag. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/promcons.c#9 edit ... //depot/projects/smpng/sys/alpha/alpha/sys_machdep.c#8 edit ... //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#7 edit ... //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#9 edit ... //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#11 edit ... //depot/projects/smpng/sys/compat/svr4/svr4_stat.c#7 edit ... //depot/projects/smpng/sys/dev/an/if_an.c#18 edit ... //depot/projects/smpng/sys/dev/asr/asr.c#9 edit ... //depot/projects/smpng/sys/dev/ata/atapi-cd.c#17 edit ... //depot/projects/smpng/sys/dev/awi/awi.c#5 edit ... //depot/projects/smpng/sys/dev/awi/awi_wep.c#5 edit ... //depot/projects/smpng/sys/dev/awi/awi_wicfg.c#5 edit ... //depot/projects/smpng/sys/dev/cnw/if_cnw.c#7 edit ... //depot/projects/smpng/sys/dev/dgb/dgb.c#7 edit ... //depot/projects/smpng/sys/dev/digi/digi.c#11 edit ... //depot/projects/smpng/sys/dev/nmdm/nmdm.c#9 edit ... //depot/projects/smpng/sys/dev/ofw/ofw_console.c#7 edit ... //depot/projects/smpng/sys/dev/random/randomdev.c#8 edit ... //depot/projects/smpng/sys/dev/rp/rp.c#7 edit ... //depot/projects/smpng/sys/dev/sbni/if_sbni.c#4 edit ... //depot/projects/smpng/sys/dev/si/si.c#4 edit ... //depot/projects/smpng/sys/dev/sio/sio.c#13 edit ... //depot/projects/smpng/sys/dev/syscons/syscons.c#15 edit ... //depot/projects/smpng/sys/dev/syscons/sysmouse.c#4 edit ... //depot/projects/smpng/sys/dev/usb/ucom.c#3 edit ... //depot/projects/smpng/sys/dev/usb/umodem.c#8 edit ... //depot/projects/smpng/sys/dev/vinum/vinum.c#5 edit ... //depot/projects/smpng/sys/dev/wi/if_wi.c#21 edit ... //depot/projects/smpng/sys/dev/wl/if_wl.c#5 edit ... //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#11 edit ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#11 edit ... //depot/projects/smpng/sys/fs/procfs/procfs_ioctl.c#5 edit ... //depot/projects/smpng/sys/fs/umapfs/umap_vfsops.c#7 edit ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#11 edit ... //depot/projects/smpng/sys/i386/i386/machdep.c#26 edit ... //depot/projects/smpng/sys/i386/i386/mem.c#7 edit ... //depot/projects/smpng/sys/i386/i386/sys_machdep.c#18 edit ... //depot/projects/smpng/sys/i386/i386/vm86.c#7 edit ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#5 edit ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_socksys.c#7 edit ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysi86.c#4 edit ... //depot/projects/smpng/sys/i386/isa/cx.c#4 edit ... //depot/projects/smpng/sys/i386/isa/cy.c#14 edit ... //depot/projects/smpng/sys/i386/isa/istallion.c#4 edit ... //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_drv.c#4 edit ... //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_ext.c#8 edit ... //depot/projects/smpng/sys/i386/isa/rc.c#8 edit ... //depot/projects/smpng/sys/i386/isa/spigot.c#8 edit ... //depot/projects/smpng/sys/i386/isa/stallion.c#4 edit ... //depot/projects/smpng/sys/i386/linux/linux_machdep.c#12 edit ... //depot/projects/smpng/sys/i4b/driver/i4b_ipr.c#6 edit ... //depot/projects/smpng/sys/ia64/ia64/ssc.c#6 edit ... //depot/projects/smpng/sys/isa/fd.c#8 edit ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#10 edit ... //depot/projects/smpng/sys/kern/kern_acct.c#10 edit ... //depot/projects/smpng/sys/kern/kern_linker.c#17 edit ... //depot/projects/smpng/sys/kern/kern_ntptime.c#6 edit ... //depot/projects/smpng/sys/kern/kern_prot.c#51 edit ... //depot/projects/smpng/sys/kern/kern_resource.c#16 edit ... //depot/projects/smpng/sys/kern/kern_shutdown.c#17 edit ... //depot/projects/smpng/sys/kern/kern_sysctl.c#15 edit ... //depot/projects/smpng/sys/kern/kern_time.c#8 edit ... //depot/projects/smpng/sys/kern/kern_xxx.c#6 edit ... //depot/projects/smpng/sys/kern/subr_prf.c#12 edit ... //depot/projects/smpng/sys/kern/sysv_ipc.c#8 edit ... //depot/projects/smpng/sys/kern/sysv_msg.c#11 edit ... //depot/projects/smpng/sys/kern/tty.c#14 edit ... //depot/projects/smpng/sys/kern/tty_cons.c#12 edit ... //depot/projects/smpng/sys/kern/tty_pty.c#13 edit ... //depot/projects/smpng/sys/kern/vfs_syscalls.c#30 edit ... //depot/projects/smpng/sys/kern/vfs_vnops.c#20 edit ... //depot/projects/smpng/sys/net/if.c#17 edit ... //depot/projects/smpng/sys/net/if_ppp.c#10 edit ... //depot/projects/smpng/sys/net/if_sl.c#9 edit ... //depot/projects/smpng/sys/net/if_tap.c#10 edit ... //depot/projects/smpng/sys/net/if_tun.c#9 edit ... //depot/projects/smpng/sys/net/net_osdep.h#4 edit ... //depot/projects/smpng/sys/net/ppp_tty.c#6 edit ... //depot/projects/smpng/sys/net/raw_usrreq.c#5 edit ... //depot/projects/smpng/sys/net/rtsock.c#14 edit ... //depot/projects/smpng/sys/netatalk/at_control.c#4 edit ... //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#6 edit ... //depot/projects/smpng/sys/netatm/atm_usrreq.c#5 edit ... //depot/projects/smpng/sys/netgraph/ng_socket.c#9 edit ... //depot/projects/smpng/sys/netgraph/ng_tty.c#6 edit ... //depot/projects/smpng/sys/netinet/in.c#10 edit ... //depot/projects/smpng/sys/netinet/in_pcb.c#20 edit ... //depot/projects/smpng/sys/netinet/ip_divert.c#10 edit ... //depot/projects/smpng/sys/netinet/ip_output.c#20 edit ... //depot/projects/smpng/sys/netinet/raw_ip.c#15 edit ... //depot/projects/smpng/sys/netinet/tcp_subr.c#16 edit ... //depot/projects/smpng/sys/netinet/udp_usrreq.c#17 edit ... //depot/projects/smpng/sys/netinet6/in6.c#8 edit ... //depot/projects/smpng/sys/netinet6/in6_pcb.c#11 edit ... //depot/projects/smpng/sys/netinet6/in6_src.c#6 edit ... //depot/projects/smpng/sys/netinet6/ip6_input.c#8 edit ... //depot/projects/smpng/sys/netinet6/ip6_output.c#7 edit ... //depot/projects/smpng/sys/netinet6/raw_ip6.c#8 edit ... //depot/projects/smpng/sys/netinet6/udp6_output.c#6 edit ... //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#9 edit ... //depot/projects/smpng/sys/netipx/ipx.c#4 edit ... //depot/projects/smpng/sys/netipx/ipx_pcb.c#5 edit ... //depot/projects/smpng/sys/netipx/ipx_usrreq.c#5 edit ... //depot/projects/smpng/sys/nfsclient/nfs_lock.c#16 edit ... //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#8 edit ... //depot/projects/smpng/sys/pc98/i386/machdep.c#21 edit ... //depot/projects/smpng/sys/pc98/pc98/fd.c#7 edit ... //depot/projects/smpng/sys/pc98/pc98/sio.c#14 edit ... //depot/projects/smpng/sys/pc98/pc98/syscons.c#12 edit ... //depot/projects/smpng/sys/pc98/pc98/wd_cd.c#6 edit ... //depot/projects/smpng/sys/pccard/pccard.c#11 edit ... //depot/projects/smpng/sys/security/lomac/kernel_mmap.c#7 edit ... //depot/projects/smpng/sys/security/lomac/kernel_util.c#7 edit ... //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#16 edit ... //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#13 edit ... //depot/projects/smpng/sys/ufs/ufs/ufs_vfsops.c#8 edit ... //depot/projects/smpng/sys/vm/vm_mmap.c#14 edit ... //depot/projects/smpng/sys/vm/vm_swap.c#10 edit Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/promcons.c#9 (text+ko) ==== @@ -123,7 +123,7 @@ ttsetwater(tp); setuptimeout = 1; - } else if ((tp->t_state & TS_XCLUDE) && suser(td, 0)) { + } else if ((tp->t_state & TS_XCLUDE) && suser(td)) { splx(s); return EBUSY; } ==== //depot/projects/smpng/sys/alpha/alpha/sys_machdep.c#8 (text+ko) ==== @@ -118,7 +118,7 @@ if (error) return (error); - error = suser(td, 0); + error = suser(td); if (error) return (error); ==== //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#7 (text+ko) ==== @@ -290,7 +290,7 @@ tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; ttsetwater(tp); setuptimeout = 1; - } else if ((tp->t_state & TS_XCLUDE) && suser(td, 0)) { + } else if ((tp->t_state & TS_XCLUDE) && suser(td)) { splx(s); return EBUSY; } ==== //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#9 (text+ko) ==== @@ -264,7 +264,7 @@ goto out; if (td->td_ucred->cr_uid != vattr.va_uid && - (error = suser(td, 0)) != 0) + (error = suser(td)) != 0) goto out; if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0) ==== //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#11 (text+ko) ==== @@ -607,7 +607,7 @@ struct file *fp; int error; - if ((error = suser(td, 0)) != 0) + if ((error = suser(td)) != 0) return error; if ((error = getvnode(fdp, SCARG(uap, fd), &fp)) != 0) return error; ==== //depot/projects/smpng/sys/compat/svr4/svr4_stat.c#7 (text+ko) ==== @@ -559,13 +559,13 @@ break; #if defined(WHY_DOES_AN_EMULATOR_WANT_TO_SET_HOSTNAMES) case SVR4_SI_SET_HOSTNAME: - if ((error = suser(td, 0)) != 0) + if ((error = suser(td)) != 0) return error; name = KERN_HOSTNAME; return kern_sysctl(&name, 1, 0, 0, SCARG(uap, buf), rlen, td); case SVR4_SI_SET_SRPC_DOMAIN: - if ((error = suser(td, 0)) != 0) + if ((error = suser(td)) != 0) return error; name = KERN_NISDOMAINNAME; return kern_sysctl(&name, 1, 0, 0, SCARG(uap, buf), rlen, td); ==== //depot/projects/smpng/sys/dev/an/if_an.c#18 (text+ko) ==== @@ -1353,7 +1353,7 @@ error = copyout(&sc->areq, ifr->ifr_data, sizeof(sc->areq)); break; case SIOCSAIRONET: - if ((error = suser(td, 0))) + if ((error = suser(td))) goto out; error = copyin(ifr->ifr_data, &sc->areq, sizeof(sc->areq)); if (error != 0) @@ -1361,7 +1361,7 @@ an_setdef(sc, &sc->areq); break; case SIOCGPRIVATE_0: /* used by Cisco client utility */ - if ((error = suser(td, 0))) + if ((error = suser(td))) goto out; copyin(ifr->ifr_data, &l_ioctl, sizeof(l_ioctl)); mode = l_ioctl.command; @@ -1381,7 +1381,7 @@ break; case SIOCGPRIVATE_1: /* used by Cisco client utility */ - if ((error = suser(td, 0))) + if ((error = suser(td))) goto out; copyin(ifr->ifr_data, &l_ioctl, sizeof(l_ioctl)); l_ioctl.command = 0; @@ -1614,7 +1614,7 @@ } break; case SIOCS80211: - if ((error = suser(td, 0))) + if ((error = suser(td))) goto out; sc->areq.an_len = sizeof(sc->areq); /* ==== //depot/projects/smpng/sys/dev/asr/asr.c#9 (text+ko) ==== @@ -3880,7 +3880,7 @@ s = splcam (); if (ASR_ctlr_held) { error = EBUSY; - } else if ((error = suser(td, 0)) == 0) { + } else if ((error = suser(td)) == 0) { ++ASR_ctlr_held; } splx(s); ==== //depot/projects/smpng/sys/dev/ata/atapi-cd.c#17 (text+ko) ==== @@ -576,7 +576,7 @@ break; case CDIOCRESET: - error = suser(td, 0); + error = suser(td); if (error) break; error = atapi_test_ready(cdp->device); ==== //depot/projects/smpng/sys/dev/awi/awi.c#5 (text+ko) ==== @@ -522,7 +522,7 @@ case SIOCS80211NWID: #ifdef __FreeBSD__ #if __FreeBSD__ >= 5 - error = suser(curthread, 0); + error = suser(curthread); #else error = suser(curproc); #endif @@ -560,7 +560,7 @@ case SIOCS80211NWKEY: #ifdef __FreeBSD__ #if __FreeBSD__ >= 5 - error = suser(curthread, 0); + error = suser(curthread); #else error = suser(curproc); #endif @@ -622,7 +622,7 @@ if(error) break; #if __FreeBSD__ >= 5 - if(!suser(curthread, 0)) + if(!suser(curthread)) #else if(!suser(curproc)) #endif @@ -663,7 +663,7 @@ break; case SIOCS80211: #if __FreeBSD__ >= 5 - error = suser(curthread, 0); + error = suser(curthread); #else error = suser(curproc); #endif ==== //depot/projects/smpng/sys/dev/awi/awi_wep.c#5 (text+ko) ==== @@ -190,7 +190,7 @@ /* do not show any keys to non-root user */ #ifdef __FreeBSD__ #if __FreeBSD__ >= 5 - suerr = suser(curthread, 0); + suerr = suser(curthread); #else suerr = suser(curproc); #endif ==== //depot/projects/smpng/sys/dev/awi/awi_wicfg.c#5 (text+ko) ==== @@ -109,7 +109,7 @@ case SIOCSWAVELAN: #ifdef __FreeBSD__ #if __FreeBSD__ >= 5 - error = suser(curthread, 0); + error = suser(curthread); #else error = suser(curproc); #endif @@ -277,7 +277,7 @@ /* do not show keys to non-root user */ #ifdef __FreeBSD__ #if __FreeBSD__ >= 5 - error = suser(curthread, 0); + error = suser(curthread); #else error = suser(curproc); #endif ==== //depot/projects/smpng/sys/dev/cnw/if_cnw.c#7 (text+ko) ==== @@ -1336,7 +1336,7 @@ error = suser(p->p_ucred, &p->p_acflag); #else #if __FreeBSD__ >= 5 - error = suser(td, 0); + error = suser(td); #else error = suser(p); #endif @@ -1351,7 +1351,7 @@ error = suser(p->p_ucred, &p->p_acflag); #else #if __FreeBSD__ >= 5 - error = suser(td, 0); + error = suser(td); #else error = suser(p); #endif @@ -1366,7 +1366,7 @@ error = suser(p->p_ucred, &p->p_acflag); #else #if __FreeBSD__ >= 5 - error = suser(td, 0); + error = suser(td); #else error = suser(p); #endif ==== //depot/projects/smpng/sys/dev/dgb/dgb.c#7 (text+ko) ==== @@ -1050,7 +1050,7 @@ } } if (tp->t_state & TS_XCLUDE && - suser(td, 0)) { + suser(td)) { error = EBUSY; goto out; } @@ -1548,7 +1548,7 @@ } switch (cmd) { case TIOCSETA: - error = suser(td, 0); + error = suser(td); if (error != 0) return (error); *ct = *(struct termios *)data; @@ -1770,7 +1770,7 @@ break; case TIOCMSDTRWAIT: /* must be root since the wait applies to following logins */ - error = suser(td, 0); + error = suser(td); if (error != 0) { splx(s); return (error); ==== //depot/projects/smpng/sys/dev/digi/digi.c#11 (text+ko) ==== @@ -783,7 +783,7 @@ } goto open_top; } - if (tp->t_state & TS_XCLUDE && suser(td, 0) != 0) { + if (tp->t_state & TS_XCLUDE && suser(td) != 0) { error = EBUSY; goto out; } @@ -1146,7 +1146,7 @@ switch (cmd) { case TIOCSETA: - error = suser(td, 0); + error = suser(td); if (error != 0) return (error); *ct = *(struct termios *)data; @@ -1317,7 +1317,7 @@ *(int *)data = digimctl(port, 0, DMGET); break; case TIOCMSDTRWAIT: - error = suser(td, 0); + error = suser(td); if (error != 0) { splx(s); return (error); ==== //depot/projects/smpng/sys/dev/nmdm/nmdm.c#9 (text+ko) ==== @@ -209,7 +209,7 @@ tp->t_lflag = TTYDEF_LFLAG; tp->t_cflag = TTYDEF_CFLAG; tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; - } else if (tp->t_state & TS_XCLUDE && suser(td, 0)) { + } else if (tp->t_state & TS_XCLUDE && suser(td)) { return (EBUSY); } else if (pti->pt_prison != td->td_ucred->cr_prison) { return (EBUSY); ==== //depot/projects/smpng/sys/dev/ofw/ofw_console.c#7 (text+ko) ==== @@ -123,7 +123,7 @@ ttsetwater(tp); setuptimeout = 1; - } else if ((tp->t_state & TS_XCLUDE) && suser(td, 0)) { + } else if ((tp->t_state & TS_XCLUDE) && suser(td)) { return (EBUSY); } ==== //depot/projects/smpng/sys/dev/random/randomdev.c#8 (text+ko) ==== @@ -147,7 +147,7 @@ int error; if (flags & FWRITE) { - error = suser(td, 0); + error = suser(td); if (error) return (error); error = securelevel_gt(td->td_ucred, 0); @@ -162,7 +162,7 @@ random_close(dev_t dev __unused, int flags, int fmt __unused, struct thread *td) { if (flags & FWRITE) { - if (!(suser(td, 0) || + if (!(suser(td) || securelevel_gt(td->td_ucred, 0))) random_reseed(); } ==== //depot/projects/smpng/sys/dev/rp/rp.c#7 (text+ko) ==== @@ -1010,7 +1010,7 @@ goto open_top; } } - if(tp->t_state & TS_XCLUDE && suser(td, 0) != 0) { + if(tp->t_state & TS_XCLUDE && suser(td) != 0) { splx(oldspl); error = EBUSY; goto out2; @@ -1271,7 +1271,7 @@ } switch (cmd) { case TIOCSETA: - error = suser(td, 0); + error = suser(td); if(error != 0) return(error); *ct = *(struct termios *)data; @@ -1416,7 +1416,7 @@ *(int *)data = result; break; case TIOCMSDTRWAIT: - error = suser(td, 0); + error = suser(td); if(error != 0) { splx(oldspl); return(error); ==== //depot/projects/smpng/sys/dev/sbni/if_sbni.c#4 (text+ko) ==== @@ -1116,7 +1116,7 @@ case SIOCSHWFLAGS: /* set flags */ /* root only */ - error = suser(td, 0); + error = suser(td); if (error) break; flags = *(struct sbni_flags*)&ifr->ifr_data; @@ -1138,7 +1138,7 @@ break; case SIOCRINSTATS: - if (!(error = suser(td, 0))) /* root only */ + if (!(error = suser(td))) /* root only */ bzero(&sc->in_stats, sizeof(struct sbni_in_stats)); break; ==== //depot/projects/smpng/sys/dev/si/si.c#4 (text+ko) ==== @@ -607,7 +607,7 @@ /* quickly let in /dev/si_control */ if (IS_CONTROLDEV(mynor)) { - if ((error = suser(td, 0))) + if ((error = suser(td))) return(error); return(0); } @@ -686,7 +686,7 @@ } } if (tp->t_state & TS_XCLUDE && - suser(td, 0)) { + suser(td)) { DPRINT((pp, DBG_OPEN|DBG_FAIL, "already open and EXCLUSIVE set\n")); error = EBUSY; @@ -951,7 +951,7 @@ } switch (cmd) { case TIOCSETA: - error = suser(td, 0); + error = suser(td); if (error != 0) return (error); *ct = *(struct termios *)data; @@ -1064,7 +1064,7 @@ break; case TIOCMSDTRWAIT: /* must be root since the wait applies to following logins */ - error = suser(td, 0); + error = suser(td); if (error == 0) pp->sp_dtr_wait = *(int *)data * hz / 100; break; @@ -1117,7 +1117,7 @@ ip = (int *)data; -#define SUCHECK if ((error = suser(td, 0))) goto out +#define SUCHECK if ((error = suser(td))) goto out switch (cmd) { case TCSIPORTS: ==== //depot/projects/smpng/sys/dev/sio/sio.c#13 (text+ko) ==== @@ -1201,7 +1201,7 @@ } } if (tp->t_state & TS_XCLUDE && - suser(td, 0)) { + suser(td)) { error = EBUSY; goto out; } @@ -1937,7 +1937,7 @@ } switch (cmd) { case TIOCSETA: - error = suser(td, 0); + error = suser(td); if (error != 0) return (error); *ct = *(struct termios *)data; @@ -2028,7 +2028,7 @@ break; case TIOCMSDTRWAIT: /* must be root since the wait applies to following logins */ - error = suser(td, 0); + error = suser(td); if (error != 0) { splx(s); return (error); ==== //depot/projects/smpng/sys/dev/syscons/syscons.c#15 (text+ko) ==== @@ -479,7 +479,7 @@ (*linesw[tp->t_line].l_modem)(tp, 1); } else - if (tp->t_state & TS_XCLUDE && suser(td, 0)) + if (tp->t_state & TS_XCLUDE && suser(td)) return(EBUSY); error = (*linesw[tp->t_line].l_open)(dev, tp); @@ -976,7 +976,7 @@ return 0; case KDENABIO: /* allow io operations */ - error = suser(td, 0); + error = suser(td); if (error != 0) return error; error = securelevel_gt(td->td_ucred, 0); ==== //depot/projects/smpng/sys/dev/syscons/sysmouse.c#4 (text+ko) ==== @@ -99,7 +99,7 @@ tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; smparam(tp, &tp->t_termios); (*linesw[tp->t_line].l_modem)(tp, 1); - } else if (tp->t_state & TS_XCLUDE && suser(td, 0)) { + } else if (tp->t_state & TS_XCLUDE && suser(td)) { return EBUSY; } ==== //depot/projects/smpng/sys/dev/usb/ucom.c#3 (text+ko) ==== @@ -257,7 +257,7 @@ if (ISSET(tp->t_state, TS_ISOPEN) && ISSET(tp->t_state, TS_XCLUDE) && - suser(p, 0)) + suser(p)) return (EBUSY); /* ==== //depot/projects/smpng/sys/dev/usb/umodem.c#8 (text+ko) ==== @@ -602,7 +602,7 @@ if (ISSET(tp->t_state, TS_ISOPEN) && ISSET(tp->t_state, TS_XCLUDE) && - suser(p, 0)) + suser(p)) return (EBUSY); /* ==== //depot/projects/smpng/sys/dev/vinum/vinum.c#5 (text+ko) ==== @@ -375,7 +375,7 @@ } case VINUM_SUPERDEV_TYPE: - error = suser(td, 0); /* are we root? */ + error = suser(td); /* are we root? */ if (error == 0) { /* yes, can do */ if (devminor == VINUM_DAEMON_DEV) /* daemon device */ vinum_conf.flags |= VF_DAEMONOPEN; /* we're open */ ==== //depot/projects/smpng/sys/dev/wi/if_wi.c#21 (text+ko) ==== @@ -1592,7 +1592,7 @@ if (error) break; /* Don't show WEP keys to non-root users. */ - if (wreq.wi_type == WI_RID_DEFLT_CRYPT_KEYS && suser(td, 0)) + if (wreq.wi_type == WI_RID_DEFLT_CRYPT_KEYS && suser(td)) break; if (wreq.wi_type == WI_RID_IFACE_STATS) { bcopy((char *)&sc->wi_stats, (char *)&wreq.wi_val, @@ -1626,7 +1626,7 @@ error = copyout(&wreq, ifr->ifr_data, sizeof(wreq)); break; case SIOCSWAVELAN: - if ((error = suser(td, 0))) + if ((error = suser(td))) goto out; error = copyin(ifr->ifr_data, &wreq, sizeof(wreq)); if (error) @@ -1685,7 +1685,7 @@ break; } len = sc->wi_keys.wi_keys[ireq->i_val].wi_keylen; - if (suser(td, 0)) + if (suser(td)) bcopy(sc->wi_keys.wi_keys[ireq->i_val].wi_keydat, tmpkey, len); else @@ -1738,7 +1738,7 @@ } break; case SIOCS80211: - if ((error = suser(td, 0))) + if ((error = suser(td))) goto out; switch(ireq->i_type) { case IEEE80211_IOC_SSID: ==== //depot/projects/smpng/sys/dev/wl/if_wl.c#5 (text+ko) ==== @@ -1214,7 +1214,7 @@ /* pointer to buffer in user space */ up = (void *)ifr->ifr_data; /* work out if they're root */ - isroot = (suser(td, 0) == 0); + isroot = (suser(td) == 0); for (i = 0; i < 0x40; i++) { /* don't hand the DES key out to non-root users */ @@ -1229,7 +1229,7 @@ /* copy the PSA in from the caller; we only copy _some_ values */ case SIOCSWLPSA: /* root only */ - if ((error = suser(td, 0))) + if ((error = suser(td))) break; error = EINVAL; /* assume the worst */ /* pointer to buffer in user space containing data */ @@ -1283,7 +1283,7 @@ */ case SIOCSWLCNWID: /* root only */ - if ((error = suser(td, 0))) + if ((error = suser(td))) break; if (!(ifp->if_flags & IFF_UP)) { error = EIO; /* only allowed while up */ @@ -1301,7 +1301,7 @@ /* copy the EEPROM in 2.4 Gz WaveMODEM out to the caller */ case SIOCGWLEEPROM: /* root only */ - if ((error = suser(td, 0))) + if ((error = suser(td))) break; /* pointer to buffer in user space */ up = (void *)ifr->ifr_data; @@ -1324,7 +1324,7 @@ /* zero (Delete) the wl cache */ case SIOCDWLCACHE: /* root only */ - if ((error = suser(td, 0))) + if ((error = suser(td))) break; wl_cache_zero(unit); break; ==== //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#11 (text+ko) ==== @@ -718,7 +718,7 @@ if (uid != de->de_uid || gid != de->de_gid) { if (((ap->a_cred->cr_uid != de->de_uid) || uid != de->de_uid || (gid != de->de_gid && !groupmember(gid, ap->a_cred))) && - (error = suser(ap->a_td, PRISON_ROOT)) != 0) + (error = suser_cred(ap->a_td->td_ucred, PRISON_ROOT)) != 0) return (error); de->de_uid = uid; de->de_gid = gid; @@ -735,21 +735,21 @@ if (vap->va_mode != (mode_t)VNOVAL) { if ((ap->a_cred->cr_uid != de->de_uid) && - (error = suser(ap->a_td, PRISON_ROOT))) + (error = suser_cred(ap->a_td->td_ucred, PRISON_ROOT))) return (error); de->de_mode = vap->va_mode; c = 1; } if (vap->va_atime.tv_sec != VNOVAL) { if ((ap->a_cred->cr_uid != de->de_uid) && - (error = suser(ap->a_td, PRISON_ROOT))) + (error = suser_cred(ap->a_td->td_ucred, PRISON_ROOT))) return (error); de->de_atime = vap->va_atime; c = 1; } if (vap->va_mtime.tv_sec != VNOVAL) { if ((ap->a_cred->cr_uid != de->de_uid) && - (error = suser(ap->a_td, PRISON_ROOT))) + (error = suser_cred(ap->a_td->td_ucred, PRISON_ROOT))) return (error); de->de_mtime = vap->va_mtime; c = 1; @@ -775,7 +775,7 @@ struct devfs_dirent *de; struct devfs_mount *dmp; - error = suser(ap->a_cnp->cn_thread, 0); + error = suser(ap->a_cnp->cn_thread); if (error) return(error); dmp = VFSTODEVFS(ap->a_dvp->v_mount); ==== //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#11 (text+ko) ==== @@ -194,7 +194,7 @@ * If upgrade to read-write by non-root, then verify * that user has necessary permissions on the device. */ - if (suser(td, 0)) { + if (suser(td)) { devvp = pmp->pm_devvp; vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); error = VOP_ACCESS(devvp, VREAD | VWRITE, @@ -241,7 +241,7 @@ * If mount by non-root, then verify that user has necessary * permissions on the device. */ - if (suser(td, 0)) { + if (suser(td)) { accessmode = VREAD; if ((mp->mnt_flag & MNT_RDONLY) == 0) accessmode |= VWRITE; ==== //depot/projects/smpng/sys/fs/procfs/procfs_ioctl.c#5 (text+ko) ==== @@ -59,7 +59,7 @@ break; case PIOCSFL: flags = *(unsigned int *)data; - if (flags & PF_ISUGID && (error = suser(td, 0)) != 0) + if (flags & PF_ISUGID && (error = suser(td)) != 0) break; p->p_pfsflags = flags; break; ==== //depot/projects/smpng/sys/fs/umapfs/umap_vfsops.c#7 (text+ko) ==== @@ -105,7 +105,7 @@ /* * Only for root */ - if ((error = suser(td, 0)) != 0) + if ((error = suser(td)) != 0) return (error); #ifdef DEBUG ==== //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#11 (text+ko) ==== @@ -233,7 +233,7 @@ * If upgrade to read-write by non-root, then verify * that user has necessary permissions on the device. */ - if (suser(td, 0)) { + if (suser(td)) { vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); if ((error = VOP_ACCESS(devvp, VREAD | VWRITE, td->td_ucred, td)) != 0) { @@ -286,7 +286,7 @@ * If mount by non-root, then verify that user has necessary * permissions on the device. */ - if (suser(td, 0)) { + if (suser(td)) { accessmode = VREAD; if ((mp->mnt_flag & MNT_RDONLY) == 0) accessmode |= VWRITE; ==== //depot/projects/smpng/sys/i386/i386/machdep.c#26 (text+ko) ==== @@ -2127,7 +2127,7 @@ * from within kernel mode? */ - if (suser(td, 0) != 0) { + if (suser(td) != 0) { if (dbregs->dr7 & 0x3) { /* dr0 is enabled */ if (dbregs->dr0 >= VM_MAXUSER_ADDRESS) ==== //depot/projects/smpng/sys/i386/i386/mem.c#7 (text+ko) ==== @@ -122,7 +122,7 @@ } break; case 14: - error = suser(td, 0); + error = suser(td); if (error != 0) return (error); error = securelevel_gt(td->td_ucred, 0); ==== //depot/projects/smpng/sys/i386/i386/sys_machdep.c#18 (text+ko) ==== @@ -183,7 +183,7 @@ if ((error = copyin(args, &ua, sizeof(struct i386_ioperm_args))) != 0) return (error); - if ((error = suser(td, 0)) != 0) + if ((error = suser(td)) != 0) return (error); if ((error = securelevel_gt(td->td_ucred, 0)) != 0) return (error); ==== //depot/projects/smpng/sys/i386/i386/vm86.c#7 (text+ko) ==== @@ -715,7 +715,7 @@ case VM86_INTCALL: { struct vm86_intcall_args sa; - if ((error = suser(td, 0))) + if ((error = suser(td))) return (error); if ((error = copyin(ua.sub_args, &sa, sizeof(sa)))) return (error); ==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#5 (text+ko) ==== @@ -1013,7 +1013,7 @@ #define IBCS2_DATALOCK 4 - if ((error = suser(td, 0)) != 0) + if ((error = suser(td)) != 0) return EPERM; switch(SCARG(uap, cmd)) { case IBCS2_UNLOCK: @@ -1048,7 +1048,7 @@ #define SCO_AD_GETBMAJ 0 #define SCO_AD_GETCMAJ 1 - if (suser(td, 0)) + if (suser(td)) return EPERM; switch(SCARG(uap, cmd)) { ==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_socksys.c#7 (text+ko) ==== @@ -173,7 +173,7 @@ char hname[MAXHOSTNAMELEN], *ptr; int error, sctl[2], hlen; - if ((error = suser(td, 0))) + if ((error = suser(td))) return (error); /* W/out a hostname a domain-name is nonsense */ ==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysi86.c#4 (text+ko) ==== @@ -73,7 +73,7 @@ int name[2]; int error; - if ((error = suser(td, 0))) + if ((error = suser(td))) return (error); name[0] = CTL_KERN; name[1] = KERN_HOSTNAME; ==== //depot/projects/smpng/sys/i386/isa/cx.c#4 (text+ko) ==== @@ -162,7 +162,7 @@ tp = c->ttyp; tp->t_dev = dev; if ((tp->t_state & TS_ISOPEN) && (tp->t_state & TS_XCLUDE) && - suser(td, 0)) + suser(td)) return (EBUSY); if (! (tp->t_state & TS_ISOPEN)) { ttychars (tp); ==== //depot/projects/smpng/sys/i386/isa/cy.c#14 (text+ko) ==== @@ -718,7 +718,7 @@ } } if (tp->t_state & TS_XCLUDE && - suser(td, 0)) { + suser(td)) { error = EBUSY; goto out; } @@ -1637,7 +1637,7 @@ } switch (cmd) { case TIOCSETA: - error = suser(td, 0); + error = suser(td); if (error != 0) return (error); *ct = *(struct termios *)data; @@ -1736,7 +1736,7 @@ break; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204011624.g31GONS79452>