diff options
| author | gww <none@none> | 2007-12-27 11:07:48 -0800 |
|---|---|---|
| committer | gww <none@none> | 2007-12-27 11:07:48 -0800 |
| commit | d3e55dcdc881b833a707e39ae1e12d8d5d35ad2d (patch) | |
| tree | d4a263b9b1d5f69787f7b9713c35b09dd2d66751 | |
| parent | bbd6719318c24a8a2364080d8a139444e9944311 (diff) | |
| download | illumos-joyent-d3e55dcdc881b833a707e39ae1e12d8d5d35ad2d.tar.gz | |
1162981 Remove C2_AUDIT #defines from the kernel and build files
52 files changed, 542 insertions, 797 deletions
diff --git a/usr/src/cmd/truss/print.c b/usr/src/cmd/truss/print.c index 26439377eb..1fbab85f04 100644 --- a/usr/src/cmd/truss/print.c +++ b/usr/src/cmd/truss/print.c @@ -2107,9 +2107,7 @@ static struct fcntl_flags { const char *name; } fcntl_flags[] = { #define FC_FL(flag) { (long)flag, "|" # flag } -#ifdef C2_AUDIT FC_FL(FREVOKED), -#endif FC_FL(FREAD), FC_FL(FWRITE), FC_FL(FNDELAY), diff --git a/usr/src/uts/common/crypto/io/cryptoadm.c b/usr/src/uts/common/crypto/io/cryptoadm.c index bcc7da3482..6db70712e1 100644 --- a/usr/src/uts/common/crypto/io/cryptoadm.c +++ b/usr/src/uts/common/crypto/io/cryptoadm.c @@ -555,11 +555,9 @@ out: error = EFAULT; } out2: -#ifdef C2_AUDIT if (audit_active) audit_cryptoadm(CRYPTO_LOAD_DEV_DISABLED, dev_name, entries, count, instance, rv, error); -#endif return (error); } @@ -635,11 +633,9 @@ out: error = EFAULT; } out2: -#ifdef C2_AUDIT if (audit_active) audit_cryptoadm(CRYPTO_LOAD_SOFT_DISABLED, name, entries, count, 0, rv, error); -#endif return (error); } @@ -719,11 +715,9 @@ out: error = EFAULT; } out2: -#ifdef C2_AUDIT if (audit_active) audit_cryptoadm(CRYPTO_LOAD_SOFT_CONFIG, name, entries, count, 0, rv, error); -#endif return (error); } @@ -766,11 +760,9 @@ out: error = EFAULT; } out2: -#ifdef C2_AUDIT if (audit_active) audit_cryptoadm(CRYPTO_UNLOAD_SOFT_MODULE, name, NULL, 0, 0, rv, error); -#endif return (error); } @@ -804,11 +796,9 @@ out: error = EFAULT; out2: -#ifdef C2_AUDIT if (audit_active) audit_cryptoadm(CRYPTO_LOAD_DOOR, NULL, NULL, 0, 0, rv, error); -#endif return (error); } @@ -865,11 +855,9 @@ cryptoadm_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *c, * So, this is a no op. We are keeping this ioctl around * to be used for any future threadpool related work. */ -#ifdef C2_AUDIT if (audit_active) audit_cryptoadm(CRYPTO_POOL_CREATE, NULL, NULL, 0, 0, 0, 0); -#endif return (0); case CRYPTO_POOL_WAIT: { @@ -880,11 +868,9 @@ cryptoadm_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *c, == -1) err = EFAULT; } -#ifdef C2_AUDIT if (audit_active) audit_cryptoadm(CRYPTO_POOL_WAIT, NULL, NULL, 0, 0, 0, err); -#endif return (err); } @@ -892,11 +878,9 @@ cryptoadm_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *c, int err; err = kcf_svc_do_run(); -#ifdef C2_AUDIT if (audit_active) audit_cryptoadm(CRYPTO_POOL_RUN, NULL, NULL, 0, 0, 0, err); -#endif return (err); } diff --git a/usr/src/uts/common/disp/thread.c b/usr/src/uts/common/disp/thread.c index aa13609fba..95e21ea1bf 100644 --- a/usr/src/uts/common/disp/thread.c +++ b/usr/src/uts/common/disp/thread.c @@ -352,10 +352,8 @@ thread_create( stksize &= -PTR24_ALIGN; /* make thread aligned */ t = (kthread_t *)(stk + stksize); bzero(t, sizeof (kthread_t)); -#ifdef C2_AUDIT if (audit_active) audit_thread_create(t); -#endif t->t_stk = stk + stksize; t->t_stkbase = stk; #else /* stack grows to larger addresses */ @@ -371,10 +369,8 @@ thread_create( t = kmem_cache_alloc(thread_cache, KM_SLEEP); bzero(t, sizeof (kthread_t)); ASSERT(((uintptr_t)t & (PTR24_ALIGN - 1)) == 0); -#ifdef C2_AUDIT if (audit_active) audit_thread_create(t); -#endif /* * Initialize t_stk to the kernel stack pointer to use * upon entry to the kernel @@ -687,10 +683,8 @@ thread_free(kthread_t *t) kmem_free(t->t_pdmsg, strlen(t->t_pdmsg) + 1); t->t_pdmsg = NULL; } -#ifdef C2_AUDIT if (audit_active) audit_thread_free(t); -#endif #ifndef NPROBE if (t->t_tnf_tpdp) tnf_thread_free(t); diff --git a/usr/src/uts/common/fs/lookup.c b/usr/src/uts/common/fs/lookup.c index d30a358283..5361be7466 100644 --- a/usr/src/uts/common/fs/lookup.c +++ b/usr/src/uts/common/fs/lookup.c @@ -94,10 +94,8 @@ lookupnameat( error = pn_get_buf(fnamep, seg, &lookpn, namebuf, sizeof (namebuf)); if (error == 0) { -#ifdef C2_AUDIT if (audit_active) audit_lookupname(); -#endif error = lookuppnat(&lookpn, NULL, followlink, dirvpp, compvpp, startvp); } @@ -229,10 +227,8 @@ lookuppnvp( pp = &presrvd; } -#ifdef C2_AUDIT if (audit_active) audit_anchorpath(pnp, vp == rootvp); -#endif /* * Eliminate any trailing slashes in the pathname. @@ -261,10 +257,8 @@ next: * Process the next component of the pathname. */ if (error = pn_getcomponent(pnp, component)) { -#ifdef C2_AUDIT if (audit_active) audit_addcomponent(pnp); -#endif goto bad; } @@ -395,12 +389,10 @@ checkforroot: */ if (pn_pathleft(pnp) || dirvpp == NULL || error != ENOENT) goto bad; -#ifdef C2_AUDIT if (audit_active) { /* directory access */ if (error = audit_savepath(pnp, vp, error, cr)) goto bad_noaudit; } -#endif pn_setlast(pnp); /* * We inform the caller that the desired entry must be @@ -455,12 +447,10 @@ checkforroot: */ if (cvp->v_type == VLNK && ((flags & FOLLOW) || pn_pathleft(pnp))) { struct pathname linkpath; -#ifdef C2_AUDIT if (audit_active) { if (error = audit_pathcomp(pnp, cvp, cr)) goto bad; } -#endif if (++nlink > MAXSYMLINKS) { error = ELOOP; @@ -472,10 +462,8 @@ checkforroot: goto bad; } -#ifdef C2_AUDIT if (audit_active) audit_symlink(pnp, &linkpath); -#endif /* C2_AUDIT */ if (pn_pathleft(&linkpath) == 0) (void) pn_set(&linkpath, "."); @@ -498,10 +486,8 @@ checkforroot: vp = rootvp; VN_HOLD(vp); } -#ifdef C2_AUDIT if (audit_active) audit_anchorpath(pnp, vp == rootvp); -#endif if (pn_fixslash(pnp)) { flags |= FOLLOW; must_be_directory = 1; @@ -573,11 +559,9 @@ checkforroot: * an alias of the last component. */ if (vn_compare(vp, cvp)) { -#ifdef C2_AUDIT if (audit_active) (void) audit_savepath(pnp, cvp, EINVAL, cr); -#endif pn_setlast(pnp); VN_RELE(vp); VN_RELE(cvp); @@ -587,19 +571,15 @@ checkforroot: pn_free(pp); return (EINVAL); } -#ifdef C2_AUDIT if (audit_active) { if (error = audit_pathcomp(pnp, vp, cr)) goto bad; } -#endif *dirvpp = vp; } else VN_RELE(vp); -#ifdef C2_AUDIT if (audit_active) (void) audit_savepath(pnp, cvp, 0, cr); -#endif if (pnp->pn_path == pnp->pn_buf) (void) pn_set(pnp, "."); else @@ -622,12 +602,10 @@ checkforroot: return (0); } -#ifdef C2_AUDIT if (audit_active) { if (error = audit_pathcomp(pnp, cvp, cr)) goto bad; } -#endif /* * Skip over slashes from end of last component. @@ -648,11 +626,9 @@ checkforroot: goto next; bad: -#ifdef C2_AUDIT if (audit_active) /* reached end of path */ (void) audit_savepath(pnp, cvp, error, cr); bad_noaudit: -#endif /* * Error. Release vnodes and return. */ diff --git a/usr/src/uts/common/fs/sockfs/sockstr.c b/usr/src/uts/common/fs/sockfs/sockstr.c index fd4e667e24..eb540644be 100644 --- a/usr/src/uts/common/fs/sockfs/sockstr.c +++ b/usr/src/uts/common/fs/sockfs/sockstr.c @@ -20,7 +20,7 @@ */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -260,8 +260,8 @@ so_sock2stream(struct sonode *so) so->so_conn_ind_tail = NULL; } dprintso(so, 0, - ("so_sock2stream(%p): moving T_CONN_IND\n", - so)); + ("so_sock2stream(%p): moving T_CONN_IND\n", + so)); /* Drop lock across put() */ mutex_exit(&so->so_lock); @@ -445,10 +445,10 @@ so_strinit(struct sonode *so, struct sonode *tso) ASSERT(so->so_laddr_sa == NULL && so->so_faddr_sa == NULL); ASSERT(so->so_laddr_len == 0 && so->so_faddr_len == 0); so->so_laddr_maxlen = so->so_faddr_maxlen = - P2ROUNDUP(so->so_addr_size, KMEM_ALIGN); + P2ROUNDUP(so->so_addr_size, KMEM_ALIGN); so->so_laddr_sa = kmem_alloc(so->so_laddr_maxlen * 2, KM_SLEEP); so->so_faddr_sa = (struct sockaddr *)((caddr_t)so->so_laddr_sa - + so->so_laddr_maxlen); + + so->so_laddr_maxlen); if (so->so_family == AF_UNIX) { /* @@ -518,7 +518,7 @@ copy_tinfo(struct sonode *so, struct T_info_ack *tia) if (so->so_addr_size == -1) { /* MAXPATHLEN + soun_family + nul termination */ so->so_addr_size = (t_scalar_t)(MAXPATHLEN + - sizeof (short) + 1); + sizeof (short) + 1); } if (so->so_type == SOCK_STREAM) { /* @@ -580,7 +580,7 @@ check_tinfo(struct sonode *so) so->so_addr_size, so->so_opt_size, so->so_tidu_size)); dprintso(so, 1, ("tinfo: so_state %s\n", - pr_state(so->so_state, so->so_mode))); + pr_state(so->so_state, so->so_mode))); return (0); } @@ -617,7 +617,7 @@ do_tinfo(struct sonode *so) DB_TYPE(mp) = M_PCPROTO; error = kstrputmsg(SOTOV(so), mp, NULL, 0, 0, - MSG_BAND|MSG_HOLDSIG|MSG_IGNERROR, 0); + MSG_BAND|MSG_HOLDSIG|MSG_IGNERROR, 0); if (error) { eprintsoline(so, error); return (error); @@ -925,7 +925,7 @@ sowaitprim(struct sonode *so, t_scalar_t request_prim, t_scalar_t ack_prim, int error; dprintso(so, 1, ("sowaitprim(%p, %d, %d, %d, %p, %lu)\n", - so, request_prim, ack_prim, min_size, mpp, wait)); + so, request_prim, ack_prim, min_size, mpp, wait)); ASSERT(MUTEX_HELD(&so->so_lock)); @@ -968,10 +968,10 @@ sowaitprim(struct sonode *so, t_scalar_t request_prim, t_scalar_t ack_prim, error = tlitosyserr(tpr->error_ack.TLI_error); } dprintso(so, 0, ("error_ack for %d: %d/%d ->%d\n", - tpr->error_ack.ERROR_prim, - tpr->error_ack.TLI_error, - tpr->error_ack.UNIX_error, - error)); + tpr->error_ack.ERROR_prim, + tpr->error_ack.TLI_error, + tpr->error_ack.UNIX_error, + error)); freemsg(mp); return (error); } @@ -981,17 +981,17 @@ sowaitprim(struct sonode *so, t_scalar_t request_prim, t_scalar_t ack_prim, #ifdef DEBUG if (tpr->type == T_ERROR_ACK) { dprintso(so, 0, ("error_ack for %d: %d/%d\n", - tpr->error_ack.ERROR_prim, - tpr->error_ack.TLI_error, - tpr->error_ack.UNIX_error)); + tpr->error_ack.ERROR_prim, + tpr->error_ack.TLI_error, + tpr->error_ack.UNIX_error)); } else if (tpr->type == T_OK_ACK) { dprintso(so, 0, ("ok_ack for %d, expected %d for %d\n", - tpr->ok_ack.CORRECT_prim, - ack_prim, request_prim)); + tpr->ok_ack.CORRECT_prim, + ack_prim, request_prim)); } else { dprintso(so, 0, - ("unexpected primitive %d, expected %d for %d\n", - tpr->type, ack_prim, request_prim)); + ("unexpected primitive %d, expected %d for %d\n", + tpr->type, ack_prim, request_prim)); } #endif /* DEBUG */ @@ -1080,11 +1080,11 @@ sowaitack(struct sonode *so, mblk_t **mpp, clock_t wait) tpr = (union T_primitives *)mp->b_rptr; ASSERT(DB_TYPE(mp) == M_PCPROTO); ASSERT(tpr->type == T_OK_ACK || - tpr->type == T_ERROR_ACK || - tpr->type == T_BIND_ACK || - tpr->type == T_CAPABILITY_ACK || - tpr->type == T_INFO_ACK || - tpr->type == T_OPTMGMT_ACK); + tpr->type == T_ERROR_ACK || + tpr->type == T_BIND_ACK || + tpr->type == T_CAPABILITY_ACK || + tpr->type == T_INFO_ACK || + tpr->type == T_OPTMGMT_ACK); } #endif /* DEBUG */ so->so_ack_mp = NULL; @@ -1184,7 +1184,7 @@ soflushconnind(struct sonode *so, t_scalar_t seqno) tci = (struct T_conn_ind *)mp->b_rptr; if (tci->SEQ_number == seqno) { dprintso(so, 1, - ("t_discon_ind: found T_CONN_IND %d\n", seqno)); + ("t_discon_ind: found T_CONN_IND %d\n", seqno)); /* Deleting last? */ if (so->so_conn_ind_tail == mp) { so->so_conn_ind_tail = prevmp; @@ -1240,7 +1240,7 @@ sowaitconnected(struct sonode *so, int fmode, int nosig) ASSERT(MUTEX_HELD(&so->so_lock)); while ((so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING)) == - SS_ISCONNECTING && so->so_error == 0) { + SS_ISCONNECTING && so->so_error == 0) { dprintso(so, 1, ("waiting for SS_ISCONNECTED on %p\n", so)); if (fmode & (FNDELAY|FNONBLOCK)) @@ -1572,7 +1572,7 @@ strsock_discon_ind(struct sonode *so, mblk_t *discon_mp) */ (void) putnextctl1(strvp2wq(SOTOV(so)), M_FLUSH, FLUSHRW); error = kstrputmsg(SOTOV(so), mp, NULL, 0, 0, - MSG_BAND|MSG_HOLDSIG|MSG_IGNERROR|MSG_IGNFLOW, 0); + MSG_BAND|MSG_HOLDSIG|MSG_IGNERROR|MSG_IGNFLOW, 0); /* LINTED - warning: statement has no consequent: if */ if (error) { eprintsoline(so, error); @@ -1724,7 +1724,7 @@ strsock_proto(vnode_t *vp, mblk_t *mp, t_uscalar_t optlen = tudi->OPT_length; opt = sogetoff(mp, tudi->OPT_offset, - optlen, __TPI_ALIGN_SIZE); + optlen, __TPI_ALIGN_SIZE); if (opt == NULL) { /* The len/off falls outside mp */ freemsg(mp); @@ -1745,11 +1745,9 @@ strsock_proto(vnode_t *vp, mblk_t *mp, *allmsgsigs = S_INPUT | S_RDNORM; *pollwakeups = POLLIN | POLLRDNORM; *wakeups = RSLEEP; -#ifdef C2_AUDIT if (audit_active) audit_sock(T_UNITDATA_IND, strvp2wq(vp), - mp, 0); -#endif /* C2_AUDIT */ + mp, 0); return (mp); } @@ -1782,7 +1780,7 @@ strsock_proto(vnode_t *vp, mblk_t *mp, * a sockaddr_in. */ addr = sogetoff(mp, tudi->SRC_offset, addrlen, - __TPI_ALIGN_SIZE); + __TPI_ALIGN_SIZE); if (addr == NULL) { freemsg(mp); mutex_enter(&so->so_lock); @@ -1805,11 +1803,11 @@ strsock_proto(vnode_t *vp, mblk_t *mp, /* Prevent so_faddr_sa from changing while accessed */ mutex_enter(&so->so_lock); ASSERT(so->so_faddr_len == - (socklen_t)sizeof (struct sockaddr_in)); + (socklen_t)sizeof (struct sockaddr_in)); faddr = (struct sockaddr_in *)so->so_faddr_sa; sin = (struct sockaddr_in *)addr; if (addrlen != - (t_uscalar_t)sizeof (struct sockaddr_in) || + (t_uscalar_t)sizeof (struct sockaddr_in) || (sin->sin_addr.s_addr != faddr->sin_addr.s_addr && faddr->sin_addr.s_addr != INADDR_ANY) || (so->so_type != SOCK_RAW && @@ -1817,13 +1815,13 @@ strsock_proto(vnode_t *vp, mblk_t *mp, faddr->sin_port != 0)) { #ifdef DEBUG dprintso(so, 0, - ("sockfs: T_UNITDATA_IND mismatch: %s", - pr_addr(so->so_family, - (struct sockaddr *)addr, - addrlen))); + ("sockfs: T_UNITDATA_IND mismatch: %s", + pr_addr(so->so_family, + (struct sockaddr *)addr, + addrlen))); dprintso(so, 0, (" - %s\n", - pr_addr(so->so_family, so->so_faddr_sa, - (t_uscalar_t)so->so_faddr_len))); + pr_addr(so->so_family, so->so_faddr_sa, + (t_uscalar_t)so->so_faddr_len))); #endif /* DEBUG */ mutex_exit(&so->so_lock); freemsg(mp); @@ -1848,7 +1846,7 @@ strsock_proto(vnode_t *vp, mblk_t *mp, if (addrlen != (t_uscalar_t)sizeof (struct sockaddr_in6) || (!IN6_ARE_ADDR_EQUAL(&sin6->sin6_addr, - &faddr6->sin6_addr) && + &faddr6->sin6_addr) && !IN6_ARE_ADDR_EQUAL(&faddr6->sin6_addr, &zeroes)) || (so->so_type != SOCK_RAW && sin6->sin6_port != faddr6->sin6_port && @@ -1856,12 +1854,12 @@ strsock_proto(vnode_t *vp, mblk_t *mp, #ifdef DEBUG dprintso(so, 0, ("sockfs: T_UNITDATA_IND mismatch: %s", - pr_addr(so->so_family, - (struct sockaddr *)addr, - addrlen))); + pr_addr(so->so_family, + (struct sockaddr *)addr, + addrlen))); dprintso(so, 0, (" - %s\n", pr_addr(so->so_family, so->so_faddr_sa, - (t_uscalar_t)so->so_faddr_len))); + (t_uscalar_t)so->so_faddr_len))); #endif /* DEBUG */ mutex_exit(&so->so_lock); freemsg(mp); @@ -1879,7 +1877,7 @@ strsock_proto(vnode_t *vp, mblk_t *mp, t_uscalar_t optlen = tudi->OPT_length; opt = sogetoff(mp, tudi->OPT_offset, - optlen, __TPI_ALIGN_SIZE); + optlen, __TPI_ALIGN_SIZE); if (opt == NULL) { /* The len/off falls outside mp */ freemsg(mp); @@ -1941,7 +1939,7 @@ strsock_proto(vnode_t *vp, mblk_t *mp, t_uscalar_t optlen = tdi->OPT_length; opt = sogetoff(mp, tdi->OPT_offset, - optlen, __TPI_ALIGN_SIZE); + optlen, __TPI_ALIGN_SIZE); if (opt == NULL) { /* The len/off falls outside mp */ freemsg(mp); @@ -1997,13 +1995,13 @@ strsock_proto(vnode_t *vp, mblk_t *mp, * that data is available). */ dprintso(so, 1, - ("T_EXDATA_IND(%p): counts %d/%d state %s\n", - vp, so->so_oobsigcnt, so->so_oobcnt, - pr_state(so->so_state, so->so_mode))); + ("T_EXDATA_IND(%p): counts %d/%d state %s\n", + vp, so->so_oobsigcnt, so->so_oobcnt, + pr_state(so->so_state, so->so_mode))); if (msgdsize(mp->b_cont) == 0) { dprintso(so, 0, - ("strsock_proto: zero length T_EXDATA_IND\n")); + ("strsock_proto: zero length T_EXDATA_IND\n")); freemsg(mp); return (NULL); } @@ -2092,18 +2090,18 @@ strsock_proto(vnode_t *vp, mblk_t *mp, #ifdef DEBUG if (mdata == NULL) { dprintso(so, 1, - ("after outofline T_EXDATA_IND(%p): " - "counts %d/%d poll 0x%x sig 0x%x state %s\n", - vp, so->so_oobsigcnt, - so->so_oobcnt, *pollwakeups, *allmsgsigs, - pr_state(so->so_state, so->so_mode))); + ("after outofline T_EXDATA_IND(%p): " + "counts %d/%d poll 0x%x sig 0x%x state %s\n", + vp, so->so_oobsigcnt, + so->so_oobcnt, *pollwakeups, *allmsgsigs, + pr_state(so->so_state, so->so_mode))); } else { dprintso(so, 1, - ("after inline T_EXDATA_IND(%p): " - "counts %d/%d poll 0x%x sig 0x%x state %s\n", - vp, so->so_oobsigcnt, - so->so_oobcnt, *pollwakeups, *allmsgsigs, - pr_state(so->so_state, so->so_mode))); + ("after inline T_EXDATA_IND(%p): " + "counts %d/%d poll 0x%x sig 0x%x state %s\n", + vp, so->so_oobsigcnt, + so->so_oobcnt, *pollwakeups, *allmsgsigs, + pr_state(so->so_state, so->so_mode))); } #endif /* DEBUG */ mutex_exit(&so->so_lock); @@ -2134,7 +2132,7 @@ strsock_proto(vnode_t *vp, mblk_t *mp, SS_ISCONNECTING) { mutex_exit(&so->so_lock); dprintso(so, 1, - ("T_CONN_CON: state %x\n", so->so_state)); + ("T_CONN_CON: state %x\n", so->so_state)); freemsg(mp); return (NULL); } @@ -2238,10 +2236,8 @@ strsock_proto(vnode_t *vp, mblk_t *mp, return (NULL); } -#ifdef C2_AUDIT if (audit_active) audit_sock(T_CONN_IND, strvp2wq(vp), mp, 0); -#endif /* C2_AUDIT */ if (!(so->so_state & SS_ACCEPTCONN)) { zcmn_err(getzoneid(), CE_WARN, "sockfs: T_conn_ind on non-listening socket\n"); @@ -2349,7 +2345,7 @@ strsock_proto(vnode_t *vp, mblk_t *mp, mutex_exit(&so->so_lock); strsetwerror(SOTOV(so), 0, 0, sogetwrerr); dprintso(so, 1, - ("T_DISCON_IND: error %d\n", so->so_error)); + ("T_DISCON_IND: error %d\n", so->so_error)); freemsg(mp); /* * Set these variables for caller to process them. @@ -2382,7 +2378,7 @@ strsock_proto(vnode_t *vp, mblk_t *mp, int error; dprintso(so, 0, - ("T_UDERROR_IND: error %d\n", tudi->ERROR_type)); + ("T_UDERROR_IND: error %d\n", tudi->ERROR_type)); if (MBLKL(mp) < sizeof (struct T_uderror_ind)) { zcmn_err(getzoneid(), CE_WARN, @@ -2441,14 +2437,14 @@ strsock_proto(vnode_t *vp, mblk_t *mp, if (addrlen == sizeof (struct sockaddr_in6) && sin1->sin6_port == sin2->sin6_port && IN6_ARE_ADDR_EQUAL(&sin1->sin6_addr, - &sin2->sin6_addr)) + &sin2->sin6_addr)) match = B_TRUE; break; } case AF_UNIX: faddr = &so->so_ux_faddr; faddr_len = - (t_uscalar_t)sizeof (so->so_ux_faddr); + (t_uscalar_t)sizeof (so->so_ux_faddr); if (faddr_len == addrlen && bcmp(addr, faddr, addrlen) == 0) match = B_TRUE; @@ -2465,13 +2461,13 @@ strsock_proto(vnode_t *vp, mblk_t *mp, if (!match) { #ifdef DEBUG dprintso(so, 0, - ("sockfs: T_UDERR_IND mismatch: %s - ", - pr_addr(so->so_family, - (struct sockaddr *)addr, - addrlen))); + ("sockfs: T_UDERR_IND mismatch: %s - ", + pr_addr(so->so_family, + (struct sockaddr *)addr, + addrlen))); dprintso(so, 0, ("%s\n", - pr_addr(so->so_family, so->so_faddr_sa, - so->so_faddr_len))); + pr_addr(so->so_family, so->so_faddr_sa, + so->so_faddr_len))); #endif /* DEBUG */ mutex_exit(&so->so_lock); freemsg(mp); @@ -2527,10 +2523,10 @@ strsock_proto(vnode_t *vp, mblk_t *mp, case T_ERROR_ACK: dprintso(so, 0, - ("strsock_proto: T_ERROR_ACK for %d, error %d/%d\n", - tpr->error_ack.ERROR_prim, - tpr->error_ack.TLI_error, - tpr->error_ack.UNIX_error)); + ("strsock_proto: T_ERROR_ACK for %d, error %d/%d\n", + tpr->error_ack.ERROR_prim, + tpr->error_ack.TLI_error, + tpr->error_ack.UNIX_error)); if (MBLKL(mp) < sizeof (struct T_error_ack)) { zcmn_err(getzoneid(), CE_WARN, @@ -2569,7 +2565,7 @@ strsock_proto(vnode_t *vp, mblk_t *mp, if ((so->so_flag & SOASYNC_UNBIND) && tpr->ok_ack.CORRECT_prim == T_UNBIND_REQ) { dprintso(so, 1, - ("strsock_proto: T_OK_ACK async unbind\n")); + ("strsock_proto: T_OK_ACK async unbind\n")); so_unlock_single(so, SOASYNC_UNBIND); mutex_exit(&so->so_lock); freemsg(mp); @@ -2631,8 +2627,8 @@ strsock_proto(vnode_t *vp, mblk_t *mp, default: #ifdef DEBUG zcmn_err(getzoneid(), CE_WARN, - "sockfs: unknown TPI primitive %d received\n", - tpr->type); + "sockfs: unknown TPI primitive %d received\n", + tpr->type); #endif /* DEBUG */ freemsg(mp); return (NULL); @@ -2659,7 +2655,7 @@ strsock_misc(vnode_t *vp, mblk_t *mp, so = VTOSO(vp); dprintso(so, 1, ("strsock_misc(%p, %p, 0x%x)\n", - vp, mp, DB_TYPE(mp))); + vp, mp, DB_TYPE(mp))); /* Set default return values */ *wakeups = *allmsgsigs = *firstmsgsigs = *pollwakeups = 0; @@ -2678,17 +2674,17 @@ strsock_misc(vnode_t *vp, mblk_t *mp, if (*mp->b_rptr == SIGURG) { mutex_enter(&so->so_lock); dprintso(so, 1, - ("SIGURG(%p): counts %d/%d state %s\n", - vp, so->so_oobsigcnt, - so->so_oobcnt, - pr_state(so->so_state, so->so_mode))); + ("SIGURG(%p): counts %d/%d state %s\n", + vp, so->so_oobsigcnt, + so->so_oobcnt, + pr_state(so->so_state, so->so_mode))); so_oob_sig(so, 1, allmsgsigs, pollwakeups); dprintso(so, 1, - ("after SIGURG(%p): counts %d/%d " - " poll 0x%x sig 0x%x state %s\n", - vp, so->so_oobsigcnt, - so->so_oobcnt, *pollwakeups, *allmsgsigs, - pr_state(so->so_state, so->so_mode))); + ("after SIGURG(%p): counts %d/%d " + " poll 0x%x sig 0x%x state %s\n", + vp, so->so_oobsigcnt, + so->so_oobcnt, *pollwakeups, *allmsgsigs, + pr_state(so->so_state, so->so_mode))); mutex_exit(&so->so_lock); } freemsg(mp); diff --git a/usr/src/uts/common/fs/sockfs/socksubr.c b/usr/src/uts/common/fs/sockfs/socksubr.c index cbacac2495..9a6e9147e3 100644 --- a/usr/src/uts/common/fs/sockfs/socksubr.c +++ b/usr/src/uts/common/fs/sockfs/socksubr.c @@ -191,7 +191,7 @@ soconfig(int domain, int type, int protocol, int error = 0; dprint(0, ("soconfig(%d,%d,%d,%s,%d)\n", - domain, type, protocol, devpath, devpathlen)); + domain, type, protocol, devpath, devpathlen)); /* * Look for an existing match. @@ -231,7 +231,7 @@ soconfig(int domain, int type, int protocol, error = sogetvp(devpath, &vp, UIO_SYSSPACE); if (error) { dprint(0, ("soconfig: vp %s failed with %d\n", - devpath, error)); + devpath, error)); goto done; } @@ -293,7 +293,7 @@ solookup(int domain, int type, int protocol, char *devpath, int *errorp) } if (sp == NULL) { dprint(0, ("solookup(%d,%d,%d) not found\n", - domain, type, protocol)); + domain, type, protocol)); if (devpath == NULL) { /* Determine correct error code */ int found = 0; @@ -329,7 +329,7 @@ solookup(int domain, int type, int protocol, char *devpath, int *errorp) error = sogetvp(devpath, &vp, UIO_USERSPACE); if (error) { dprint(0, ("solookup: vp %p failed with %d\n", - devpath, error)); + devpath, error)); *errorp = EPROTONOSUPPORT; return (NULL); } @@ -339,7 +339,7 @@ solookup(int domain, int type, int protocol, char *devpath, int *errorp) return (vp); } dprint(0, ("solookup(%d,%d,%d) vp %p devpath %s\n", - domain, type, protocol, sp->sp_vnode, sp->sp_devpath)); + domain, type, protocol, sp->sp_vnode, sp->sp_devpath)); vp = sp->sp_vnode; VN_HOLD(vp); @@ -771,7 +771,7 @@ so_lock_single(struct sonode *so) while (so->so_flag & (SOLOCKED | SOASYNC_UNBIND)) { so->so_flag |= SOWANT; cv_wait_stop(&so->so_want_cv, &so->so_lock, - SO_LOCK_WAKEUP_TIME); + SO_LOCK_WAKEUP_TIME); } so->so_flag |= SOLOCKED; } @@ -816,7 +816,7 @@ so_lock_read(struct sonode *so, int fmode) return (EWOULDBLOCK); so->so_flag |= SOWANT; cv_wait_stop(&so->so_want_cv, &so->so_lock, - SO_LOCK_WAKEUP_TIME); + SO_LOCK_WAKEUP_TIME); } so->so_flag |= SOREADLOCKED; return (0); @@ -899,7 +899,7 @@ so_ux_lookup(struct sonode *so, struct sockaddr_un *soun, int checkaccess, int error; dprintso(so, 1, ("so_ux_lookup(%p) name <%s>\n", - so, soun->sun_path)); + so, soun->sun_path)); error = lookupname(soun->sun_path, UIO_SYSSPACE, FOLLOW, NULLVPP, &vp); if (error) { @@ -1079,7 +1079,7 @@ so_ux_addr_xlate(struct sonode *so, struct sockaddr *name, socklen_t addrlen; dprintso(so, 1, ("so_ux_addr_xlate(%p, %p, %d, %d)\n", - so, name, namelen, checkaccess)); + so, name, namelen, checkaccess)); ASSERT(name != NULL); ASSERT(so->so_family == AF_UNIX); @@ -1107,7 +1107,7 @@ so_ux_addr_xlate(struct sonode *so, struct sockaddr *name, addr = &so->so_ux_faddr; addrlen = (socklen_t)sizeof (so->so_ux_faddr); dprintso(so, 1, ("ux_xlate UNIX: addrlen %d, vp %p\n", - addrlen, vp)); + addrlen, vp)); VN_RELE(vp); *addrp = addr; *addrlenp = (socklen_t)addrlen; @@ -1178,7 +1178,7 @@ fdbuf_extract(struct fdbuf *fdbuf, void *rights, int rightslen) int numfd; dprint(1, ("fdbuf_extract: %d fds, len %d\n", - fdbuf->fd_numfd, rightslen)); + fdbuf->fd_numfd, rightslen)); numfd = fdbuf->fd_numfd; ASSERT(rightslen == numfd * (int)sizeof (int)); @@ -1205,12 +1205,10 @@ fdbuf_extract(struct fdbuf *fdbuf, void *rights, int rightslen) mutex_exit(&fp->f_tlock); setf(fd, fp); *rp++ = fd; -#ifdef C2_AUDIT if (audit_active) audit_fdrecv(fd, fp); -#endif dprint(1, ("fdbuf_extract: [%d] = %d, %p refcnt %d\n", - i, fd, fp, fp->f_count)); + i, fd, fp, fp->f_count)); } return (0); @@ -1263,7 +1261,7 @@ fdbuf_create(void *rights, int rightslen, struct fdbuf **fdbufp) return (EBADF); } dprint(1, ("fdbuf_create: [%d] = %d, %p refcnt %d\n", - i, fds[i], fp, fp->f_count)); + i, fds[i], fp, fp->f_count)); mutex_enter(&fp->f_tlock); fp->f_count++; mutex_exit(&fp->f_tlock); @@ -1281,10 +1279,8 @@ fdbuf_create(void *rights, int rightslen, struct fdbuf **fdbufp) fdbuf->fd_fds[i] = fp; fdbuf->fd_numfd++; releasef(fds[i]); -#ifdef C2_AUDIT if (audit_active) audit_fdsend(fds[i], fp, 0); -#endif } *fdbufp = fdbuf; return (0); @@ -1334,7 +1330,7 @@ fdbuf_verify(mblk_t *mp, struct fdbuf *fdbuf, int fdbuflen) frp->free_arg != NULL && bcmp(frp->free_arg, fdbuf, fdbuflen) == 0) { dprint(1, ("fdbuf_verify: fdbuf %p len %d\n", - fdbuf, fdbuflen)); + fdbuf, fdbuflen)); return (1); } else { zcmn_err(getzoneid(), CE_WARN, @@ -1455,7 +1451,7 @@ so_getfdopt(void *control, t_uscalar_t controllen, int oldflg, fds = CMSG_CONTENT(cmsg); fdlen = (int)CMSG_CONTENTLEN(cmsg); dprint(1, ("so_getfdopt: new %lu\n", - (size_t)CMSG_CONTENTLEN(cmsg))); + (size_t)CMSG_CONTENTLEN(cmsg))); } } if (fds == NULL) { @@ -1497,7 +1493,7 @@ so_optlen(void *control, t_uscalar_t controllen, int oldflg) sizeof (struct T_opthdr)); } dprint(1, ("so_optlen: controllen %d, flg %d -> optlen %d\n", - controllen, oldflg, optlen)); + controllen, oldflg, optlen)); return (optlen); } @@ -1565,7 +1561,7 @@ so_cmsglen(mblk_t *mp, void *opt, t_uscalar_t optlen, int oldflg) tohp && _TPI_TOPT_VALID(tohp, opt, (uintptr_t)opt + optlen); tohp = _TPI_TOPT_NEXTHDR(opt, optlen, tohp)) { dprint(1, ("so_cmsglen: level 0x%x, name %d, len %d\n", - tohp->level, tohp->name, tohp->len)); + tohp->level, tohp->name, tohp->len)); if (tohp->level == SOL_SOCKET && (tohp->name == SO_SRCADDR || tohp->name == SO_UNIX_CLOSE)) { @@ -1612,7 +1608,7 @@ so_cmsglen(mblk_t *mp, void *opt, t_uscalar_t optlen, int oldflg) } cmsglen -= last_roundup; dprint(1, ("so_cmsglen: optlen %d, flg %d -> cmsglen %d\n", - optlen, oldflg, cmsglen)); + optlen, oldflg, cmsglen)); return (cmsglen); } @@ -1645,7 +1641,7 @@ so_opt2cmsg(mblk_t *mp, void *opt, t_uscalar_t optlen, int oldflg, tohp && _TPI_TOPT_VALID(tohp, opt, (uintptr_t)opt + optlen); tohp = _TPI_TOPT_NEXTHDR(opt, optlen, tohp)) { dprint(1, ("so_opt2cmsg: level 0x%x, name %d, len %d\n", - tohp->level, tohp->name, tohp->len)); + tohp->level, tohp->name, tohp->len)); if (tohp->level == SOL_SOCKET && (tohp->name == SO_SRCADDR || @@ -1674,10 +1670,10 @@ so_opt2cmsg(mblk_t *mp, void *opt, t_uscalar_t optlen, int oldflg, cmsg->cmsg_level = tohp->level; cmsg->cmsg_type = SCM_RIGHTS; cmsg->cmsg_len = (socklen_t)(fdlen + - sizeof (struct cmsghdr)); + sizeof (struct cmsghdr)); error = fdbuf_extract(fdbuf, - CMSG_CONTENT(cmsg), fdlen); + CMSG_CONTENT(cmsg), fdlen); if (error != 0) return (error); } @@ -1732,7 +1728,7 @@ so_opt2cmsg(mblk_t *mp, void *opt, t_uscalar_t optlen, int oldflg, /* copy content to control data part */ bcopy(&tohp[1], CMSG_CONTENT(cmsg), - CMSG_CONTENTLEN(cmsg)); + CMSG_CONTENTLEN(cmsg)); } /* move to next CMSG structure! */ cmsg = CMSG_NEXT(cmsg); @@ -1762,7 +1758,7 @@ so_getopt_srcaddr(void *opt, t_uscalar_t optlen, void **srcp, tohp && _TPI_TOPT_VALID(tohp, opt, (uintptr_t)opt + optlen); tohp = _TPI_TOPT_NEXTHDR(opt, optlen, tohp)) { dprint(1, ("so_getopt_srcaddr: level 0x%x, name %d, len %d\n", - tohp->level, tohp->name, tohp->len)); + tohp->level, tohp->name, tohp->len)); if (tohp->level == SOL_SOCKET && tohp->name == SO_SRCADDR) { *srcp = _TPI_TOPT_DATA(tohp); @@ -1785,8 +1781,8 @@ so_getopt_unix_close(void *opt, t_uscalar_t optlen) tohp && _TPI_TOPT_VALID(tohp, opt, (uintptr_t)opt + optlen); tohp = _TPI_TOPT_NEXTHDR(opt, optlen, tohp)) { dprint(1, - ("so_getopt_unix_close: level 0x%x, name %d, len %d\n", - tohp->level, tohp->name, tohp->len)); + ("so_getopt_unix_close: level 0x%x, name %d, len %d\n", + tohp->level, tohp->name, tohp->len)); if (tohp->level == SOL_SOCKET && tohp->name == SO_UNIX_CLOSE) return (1); @@ -2019,8 +2015,8 @@ pr_addr(int family, struct sockaddr *addr, t_uscalar_t addrlen) bcopy(addr, &sin, sizeof (sin)); (void) sprintf(buf, "(len %d) %x/%d", - addrlen, ntohl(sin.sin_addr.s_addr), - ntohs(sin.sin_port)); + addrlen, ntohl(sin.sin_addr.s_addr), + ntohs(sin.sin_port)); break; } case AF_INET6: { @@ -2041,8 +2037,8 @@ pr_addr(int family, struct sockaddr *addr, t_uscalar_t addrlen) struct sockaddr_un *soun = (struct sockaddr_un *)addr; (void) sprintf(buf, "(len %d) %s", - addrlen, - (soun == NULL) ? "(none)" : soun->sun_path); + addrlen, + (soun == NULL) ? "(none)" : soun->sun_path); break; } default: @@ -2082,16 +2078,16 @@ so_verify_oobstate(struct sonode *so) break; default: printf("Bad oob state 1 (%p): counts %d/%d state %s\n", - so, so->so_oobsigcnt, - so->so_oobcnt, pr_state(so->so_state, so->so_mode)); + so, so->so_oobsigcnt, + so->so_oobcnt, pr_state(so->so_state, so->so_mode)); return (0); } /* SS_RCVATMARK should only be set when SS_OOBPEND is set */ if ((so->so_state & (SS_RCVATMARK|SS_OOBPEND)) == SS_RCVATMARK) { printf("Bad oob state 2 (%p): counts %d/%d state %s\n", - so, so->so_oobsigcnt, - so->so_oobcnt, pr_state(so->so_state, so->so_mode)); + so, so->so_oobsigcnt, + so->so_oobcnt, pr_state(so->so_state, so->so_mode)); return (0); } @@ -2099,10 +2095,10 @@ so_verify_oobstate(struct sonode *so) * (so_oobsigcnt != 0 or SS_RCVATMARK) iff SS_OOBPEND */ if (!EQUIV((so->so_oobsigcnt != 0) || (so->so_state & SS_RCVATMARK), - so->so_state & SS_OOBPEND)) { + so->so_state & SS_OOBPEND)) { printf("Bad oob state 3 (%p): counts %d/%d state %s\n", - so, so->so_oobsigcnt, - so->so_oobcnt, pr_state(so->so_state, so->so_mode)); + so, so->so_oobsigcnt, + so->so_oobcnt, pr_state(so->so_state, so->so_mode)); return (0); } @@ -2112,14 +2108,14 @@ so_verify_oobstate(struct sonode *so) if (!(so->so_options & SO_OOBINLINE) && !EQUIV(so->so_oobmsg != NULL, so->so_state & SS_HAVEOOBDATA)) { printf("Bad oob state 4 (%p): counts %d/%d state %s\n", - so, so->so_oobsigcnt, - so->so_oobcnt, pr_state(so->so_state, so->so_mode)); + so, so->so_oobsigcnt, + so->so_oobcnt, pr_state(so->so_state, so->so_mode)); return (0); } if (so->so_oobsigcnt < so->so_oobcnt) { printf("Bad oob state 5 (%p): counts %d/%d state %s\n", - so, so->so_oobsigcnt, - so->so_oobcnt, pr_state(so->so_state, so->so_mode)); + so, so->so_oobsigcnt, + so->so_oobcnt, pr_state(so->so_state, so->so_mode)); return (0); } return (1); @@ -2254,7 +2250,7 @@ sockfs_snapshot(kstat_t *ksp, void *buf, int rw) sizeof (pksi->ks_si.si_laddr_sun_path)); pksi->ks_si.si_laddr_family = - so->so_laddr_sa->sa_family; + so->so_laddr_sa->sa_family; if (sn_len != 0) { /* AF_UNIX socket names are NULL terminated */ (void) strncpy(pksi->ks_si.si_laddr_sun_path, diff --git a/usr/src/uts/common/fs/sockfs/socktpi.c b/usr/src/uts/common/fs/sockfs/socktpi.c index 4556eaa736..d6f9ebb57f 100644 --- a/usr/src/uts/common/fs/sockfs/socktpi.c +++ b/usr/src/uts/common/fs/sockfs/socktpi.c @@ -2286,10 +2286,8 @@ sotpi_connect(struct sonode *so, soisconnecting(so); mutex_exit(&so->so_lock); -#ifdef C2_AUDIT if (audit_active) audit_sock(T_CONN_REQ, strvp2wq(SOTOV(so)), mp, 0); -#endif /* C2_AUDIT */ error = kstrputmsg(SOTOV(so), mp, NULL, 0, 0, MSG_BAND|MSG_HOLDSIG|MSG_IGNERROR, 0); @@ -3664,10 +3662,8 @@ sosend_dgramcmsg(struct sonode *so, struct sockaddr *name, socklen_t namelen, ASSERT(MBLKL(mp) <= (ssize_t)size); ASSERT(mp->b_wptr <= mp->b_datap->db_lim); -#ifdef C2_AUDIT if (audit_active) audit_sock(T_UNITDATA_REQ, strvp2wq(SOTOV(so)), mp, 0); -#endif /* C2_AUDIT */ error = kstrputmsg(SOTOV(so), mp, uiop, len, 0, MSG_BAND, 0); #ifdef SOCK_DEBUG @@ -3951,10 +3947,8 @@ sosend_dgram(struct sonode *so, struct sockaddr *name, socklen_t namelen, ASSERT(mp->b_wptr <= mp->b_datap->db_lim); } -#ifdef C2_AUDIT if (audit_active) audit_sock(T_UNITDATA_REQ, strvp2wq(SOTOV(so)), mp, 0); -#endif /* C2_AUDIT */ error = kstrputmsg(SOTOV(so), mp, uiop, len, 0, MSG_BAND, 0); done: @@ -4416,10 +4410,8 @@ sodgram_direct(struct sonode *so, struct sockaddr *name, linkb(mp, mpdata); else mp = mpdata; -#ifdef C2_AUDIT if (audit_active) audit_sock(T_UNITDATA_REQ, strvp2wq(SOTOV(so)), mp, 0); -#endif /* C2_AUDIT */ udp_wput(udp_wq, mp); return (0); @@ -4438,10 +4430,8 @@ sodgram_direct(struct sonode *so, struct sockaddr *name, if (connected) return (strwrite(SOTOV(so), uiop, CRED())); -#ifdef C2_AUDIT if (audit_active) audit_sock(T_UNITDATA_REQ, strvp2wq(SOTOV(so)), mp, 0); -#endif /* C2_AUDIT */ error = kstrputmsg(SOTOV(so), mp, uiop, len, 0, MSG_BAND, 0); done: diff --git a/usr/src/uts/common/fs/vnode.c b/usr/src/uts/common/fs/vnode.c index 5431d1ed09..4c250e347f 100644 --- a/usr/src/uts/common/fs/vnode.c +++ b/usr/src/uts/common/fs/vnode.c @@ -1253,10 +1253,8 @@ top: */ if (error = pn_get(pnamep, seg, &pn)) return (error); -#ifdef C2_AUDIT if (audit_active) audit_vncreate_start(); -#endif /* C2_AUDIT */ dvp = NULL; *vpp = NULL; /* @@ -1463,10 +1461,8 @@ top: out: -#ifdef C2_AUDIT if (audit_active) audit_vncreate_finish(*vpp, error); -#endif /* C2_AUDIT */ if (in_crit) { nbl_end_crit(vp); in_crit = 0; @@ -1590,10 +1586,8 @@ top: * use the lib directory for the rename. */ -#ifdef C2_AUDIT if (audit_active) audit_setfsat_path(1); -#endif /* C2_AUDIT */ /* * Lookup to and from directories. */ @@ -1609,10 +1603,8 @@ top: goto out; } -#ifdef C2_AUDIT if (audit_active) audit_setfsat_path(3); -#endif /* C2_AUDIT */ if (error = lookuppnat(&tpn, NULL, NO_FOLLOW, &tovp, &targvp, tdvp)) { goto out; } diff --git a/usr/src/uts/common/inet/kssl/kssl.c b/usr/src/uts/common/inet/kssl/kssl.c index 40148dc14c..fbe2b6913f 100644 --- a/usr/src/uts/common/inet/kssl/kssl.c +++ b/usr/src/uts/common/inet/kssl/kssl.c @@ -307,10 +307,8 @@ kssl_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *c, return (EFAULT); } error = kssl_add_entry(kssl_params); -#ifdef C2_AUDIT if (audit_active) audit_kssl(KSSL_ADD_ENTRY, kssl_params, error); -#endif off = offsetof(kssl_params_t, kssl_token) + offsetof(kssl_tokinfo_t, ck_rv); ck_rv = kssl_params->kssl_token.ck_rv; @@ -330,10 +328,8 @@ kssl_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *c, } error = kssl_delete_entry(&server_addr); -#ifdef C2_AUDIT if (audit_active) audit_kssl(KSSL_DELETE_ENTRY, &server_addr, error); -#endif break; } } diff --git a/usr/src/uts/common/io/timod.c b/usr/src/uts/common/io/timod.c index 6b06dcee0c..1f9901742d 100644 --- a/usr/src/uts/common/io/timod.c +++ b/usr/src/uts/common/io/timod.c @@ -20,7 +20,7 @@ */ /* ONC_PLUS EXTRACT START */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ @@ -789,10 +789,8 @@ timodrproc(queue_t *q, mblk_t *mp) default: /* ONC_PLUS EXTRACT END */ -#ifdef C2_AUDIT if (audit_active) audit_sock(T_UNITDATA_IND, q, mp, TIMOD_ID); -#endif /* ONC_PLUS EXTRACT START */ putnext(q, mp); break; @@ -1223,10 +1221,8 @@ timodrproc(queue_t *q, mblk_t *mp) } } /* ONC_PLUS EXTRACT END */ -#ifdef C2_AUDIT if (audit_active) audit_sock(T_CONN_IND, q, mp, TIMOD_ID); -#endif /* ONC_PLUS EXTRACT START */ putnext(q, mp); break; @@ -2005,10 +2001,8 @@ getname: mp = tmp; } } -#ifdef C2_AUDIT if (audit_active) audit_sock(T_UNITDATA_REQ, q, mp, TIMOD_ID); -#endif if (!bcanputnext(q, mp->b_band)) { (void) putbq(q, mp); return (1); @@ -2063,10 +2057,8 @@ getname: if (tp->tim_flags & COTS) tp->tim_flags |= CONNWAIT; /* ONC_PLUS EXTRACT END */ -#ifdef C2_AUDIT if (audit_active) audit_sock(T_CONN_REQ, q, mp, TIMOD_ID); -#endif /* ONC_PLUS EXTRACT START */ putnext(q, mp); break; diff --git a/usr/src/uts/common/os/devpolicy.c b/usr/src/uts/common/os/devpolicy.c index 66dbbafef1..beb573a357 100644 --- a/usr/src/uts/common/os/devpolicy.c +++ b/usr/src/uts/common/os/devpolicy.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -345,8 +344,8 @@ parse_policy(devplcysys_t *ds, devplcy_t *nullp, devplcy_t *defp) if (priv_isemptyset(&ds->dps_rdp) && priv_isemptyset(&ds->dps_wrp)) dphold(np = nullp); else if (defp != nullp && - priv_isequalset(&ds->dps_rdp, &defp->dp_rdp) && - priv_isequalset(&ds->dps_wrp, &defp->dp_wrp)) + priv_isequalset(&ds->dps_rdp, &defp->dp_rdp) && + priv_isequalset(&ds->dps_wrp, &defp->dp_wrp)) dphold(np = defp); else { np = dpget(); @@ -377,7 +376,7 @@ parse_policy(devplcysys_t *ds, devplcy_t *nullp, devplcy_t *defp) de->dpe_plcy = np; ASSERT((de->dpe_flags & (DPE_ALLMINOR|DPE_EXPANDED)) || - de->dpe_expr != NULL); + de->dpe_expr != NULL); return (de); } @@ -463,7 +462,7 @@ devpolicy_load(int nitems, size_t sz, devplcysys_t *uitmp) curmaj = items[i].dps_maj; len = strlen(items[i].dps_minornm); wild = len > 0 && - (tmp = strchr(items[i].dps_minornm, '*')) != NULL; + (tmp = strchr(items[i].dps_minornm, '*')) != NULL; /* Another default major, string too long or too many ``*'' */ if (curmaj == DEVPOLICY_DFLT_MAJ || @@ -476,7 +475,7 @@ devpolicy_load(int nitems, size_t sz, devplcysys_t *uitmp) lastmajor = curmaj; nmaj++; } else if (lastmajor > curmaj || lastwild > wild || - lastwild && lastlen < len) { + lastwild && lastlen < len) { kmem_free(items, mem); return (EINVAL); } @@ -484,10 +483,8 @@ devpolicy_load(int nitems, size_t sz, devplcysys_t *uitmp) lastwild = wild; } -#ifdef C2_AUDIT if (audit_active) audit_devpolicy(nitems, items); -#endif /* * Parse the policy. We create an array for all major numbers @@ -625,7 +622,7 @@ devpolicy_get(int *nitemp, size_t sz, devplcysys_t *uitmp) itmp[ind].dps_wrp = de->dpe_plcy->dp_wrp; if (de->dpe_len) (void) strcpy(itmp[ind].dps_minornm, - de->dpe_expr); + de->dpe_expr); else if (de->dpe_flags & DPE_ALLMINOR) (void) strcpy(itmp[ind].dps_minornm, "*"); else { diff --git a/usr/src/uts/common/os/exec.c b/usr/src/uts/common/os/exec.c index 8823e44e27..9ac97c3146 100644 --- a/usr/src/uts/common/os/exec.c +++ b/usr/src/uts/common/os/exec.c @@ -593,7 +593,7 @@ gexec( if ((privflags & PRIV_INCREASE) != 0 && (pp->p_proc_flag & P_PR_PTRACE) != 0) priv_intersect(&CR_OPPRIV(cred), - &CR_IPRIV(cred)); + &CR_IPRIV(cred)); priv_intersect(&CR_LPRIV(cred), &CR_IPRIV(cred)); CR_EPRIV(cred) = CR_PPRIV(cred) = CR_IPRIV(cred); priv_adjust_PA(cred); @@ -650,7 +650,7 @@ gexec( setidfl |= EXECSETID_PRIVS; error = (*eswp->exec_func)(vp, uap, args, idatap, level, execsz, - setidfl, exec_file, cred, brand_action); + setidfl, exec_file, cred, brand_action); rw_exit(eswp->exec_lock); if (error != 0) { if (newcred != NULL) @@ -796,7 +796,7 @@ findexec_by_hdr(char *header) ASSERT(eswp->exec_maglen <= MAGIC_BYTES); if (header && eswp->exec_maglen != 0 && bcmp(&header[eswp->exec_magoff], eswp->exec_magic, - eswp->exec_maglen) == 0) { + eswp->exec_maglen) == 0) { if (hold_execsw(eswp) != 0) return (NULL); return (eswp); @@ -1102,7 +1102,7 @@ execmap(struct vnode *vp, caddr_t addr, size_t len, size_t zfodlen, no_fault(); if (seg != NULL && (zprot & PROT_WRITE) == 0) (void) as_setprot(as, (caddr_t)end, - zfoddiff - 1, zprot); + zfoddiff - 1, zprot); error = EFAULT; goto bad; } @@ -1436,11 +1436,11 @@ stk_copyin(execa_t *uap, uarg_t *args, intpdata_t *intp, void **auxvpp) return (error); if (args->brandname != NULL && (error = stk_add(args, args->brandname, - UIO_SYSSPACE)) != 0) + UIO_SYSSPACE)) != 0) return (error); if (args->emulator != NULL && (error = stk_add(args, args->emulator, - UIO_SYSSPACE)) != 0) + UIO_SYSSPACE)) != 0) return (error); } @@ -1745,11 +1745,9 @@ exec_args(execa_t *uap, uarg_t *args, intpdata_t *intp, void **auxvpp) if (p->p_itimer != NULL) timer_exit(); -#ifdef C2_AUDIT if (audit_active) audit_exec(args->stk_base, args->stk_base + args->arglen, args->na - args->ne, args->ne); -#endif /* * Ensure that we don't change resource associations while we diff --git a/usr/src/uts/common/os/exit.c b/usr/src/uts/common/os/exit.c index 4d522d84ee..e39be3e9f2 100644 --- a/usr/src/uts/common/os/exit.c +++ b/usr/src/uts/common/os/exit.c @@ -549,14 +549,12 @@ proc_exit(int why, int what) /* * Release any resources associated with C2 auditing */ -#ifdef C2_AUDIT if (audit_active) { /* * audit exit system call */ audit_exit(why, what); } -#endif /* * Free address space. diff --git a/usr/src/uts/common/os/fio.c b/usr/src/uts/common/os/fio.c index c5dc56e150..13f592993a 100644 --- a/usr/src/uts/common/os/fio.c +++ b/usr/src/uts/common/os/fio.c @@ -585,13 +585,11 @@ getf(int fd) } ufp->uf_refcnt++; -#ifdef C2_AUDIT /* * archive per file audit data */ if (audit_active) (void) audit_getf(fd); -#endif UF_EXIT(ufp); set_active_fd(fd); /* record the active file descriptor */ @@ -664,13 +662,11 @@ closeandsetf(int fd, file_t *newfp) } } -#ifdef C2_AUDIT /* * archive per file audit data */ if (audit_active) (void) audit_getf(fd); -#endif ASSERT(ufp->uf_busy); ufp->uf_file = NULL; ufp->uf_flag = 0; @@ -899,13 +895,11 @@ closef(file_t *fp) int flag; offset_t offset; -#ifdef C2_AUDIT /* * audit close of file (may be exit) */ if (audit_active) audit_closef(fp); -#endif ASSERT(MUTEX_NOT_HELD(&P_FINFO(curproc)->fi_lock)); mutex_enter(&fp->f_tlock); @@ -928,13 +922,11 @@ closef(file_t *fp) mutex_exit(&fp->f_tlock); VN_RELE(vp); -#ifdef C2_AUDIT /* * deallocate resources to audit_data */ if (audit_active) audit_unfalloc(fp); -#endif crfree(fp->f_cred); kmem_cache_free(file_cache, fp); return (error); @@ -1067,13 +1059,11 @@ falloc(vnode_t *vp, int flag, file_t **fpp, int *fdp) fp->f_offset = 0; fp->f_audit_data = 0; crhold(fp->f_cred = CRED()); -#ifdef C2_AUDIT /* * allocate resources to audit_data */ if (audit_active) audit_falloc(fp); -#endif *fpp = fp; if (fdp) *fdp = fd; @@ -1111,13 +1101,11 @@ unfalloc(file_t *fp) { ASSERT(MUTEX_HELD(&fp->f_tlock)); if (--fp->f_count <= 0) { -#ifdef C2_AUDIT /* * deallocate resources to audit_data */ if (audit_active) audit_unfalloc(fp); -#endif crfree(fp->f_cred); mutex_exit(&fp->f_tlock); kmem_cache_free(file_cache, fp); @@ -1135,10 +1123,8 @@ setf(int fd, file_t *fp) uf_info_t *fip = P_FINFO(curproc); uf_entry_t *ufp; -#ifdef C2_AUDIT if (audit_active) audit_setf(fp, fd); -#endif /* C2_AUDIT */ if (fp == NULL) { mutex_enter(&fip->fi_lock); @@ -1508,10 +1494,10 @@ vpsetattr(vnode_t *vp, vattr_t *vap, int flags) vattr.va_mask = AT_SIZE; if (!(error = VOP_GETATTR(vp, &vattr, 0, CRED(), NULL))) { begin = vap->va_size > vattr.va_size ? - vattr.va_size : vap->va_size; + vattr.va_size : vap->va_size; length = vattr.va_size > vap->va_size ? - vattr.va_size - vap->va_size : - vap->va_size - vattr.va_size; + vattr.va_size - vap->va_size : + vap->va_size - vattr.va_size; if (nbl_conflict(vp, NBL_WRITE, begin, length, 0, NULL)) { diff --git a/usr/src/uts/common/os/fork.c b/usr/src/uts/common/os/fork.c index e533c00456..2ed10db14a 100644 --- a/usr/src/uts/common/os/fork.c +++ b/usr/src/uts/common/os/fork.c @@ -372,12 +372,12 @@ cfork(int isvfork, int isfork1, int flags) else cp->p_lwpdir_sz = p->p_lwpdir_sz; cp->p_lwpdir = cp->p_lwpfree = ldp = - kmem_zalloc(cp->p_lwpdir_sz * sizeof (lwpdir_t), KM_SLEEP); + kmem_zalloc(cp->p_lwpdir_sz * sizeof (lwpdir_t), KM_SLEEP); for (i = 1; i < cp->p_lwpdir_sz; i++, ldp++) ldp->ld_next = ldp + 1; cp->p_tidhash_sz = (cp->p_lwpdir_sz + 2) / 2; cp->p_tidhash = - kmem_zalloc(cp->p_tidhash_sz * sizeof (lwpdir_t *), KM_SLEEP); + kmem_zalloc(cp->p_tidhash_sz * sizeof (lwpdir_t *), KM_SLEEP); /* * Duplicate parent's lwps. @@ -394,7 +394,7 @@ cfork(int isvfork, int isfork1, int flags) * Daemon threads should not call fork1(), but oh well... */ lwptot(clone)->t_proc_flag |= - (curthread->t_proc_flag & TP_TWAIT); + (curthread->t_proc_flag & TP_TWAIT); } else { /* this is forkall(), no one can be in lwp_wait() */ ASSERT(p->p_lwpwait == 0 && p->p_lwpdwait == 0); @@ -603,7 +603,7 @@ forklwperr: /* restore watchpoints to parent */ as = p->p_as; AS_LOCK_ENTER(as, &as->a_lock, - RW_WRITER); + RW_WRITER); as->a_wpage = p->p_wpage; avl_create(&p->p_wpage, wp_compare, sizeof (struct watched_page), @@ -1085,10 +1085,8 @@ getproc(proc_t **cpp, int kernel) /* * Duplicate any audit information kept in the process table */ -#ifdef C2_AUDIT if (audit_active) /* copy audit data to cp */ audit_newproc(cp); -#endif crhold(cp->p_cred = cr); diff --git a/usr/src/uts/common/os/ipc.c b/usr/src/uts/common/os/ipc.c index 367089e686..3e3a5b79cb 100644 --- a/usr/src/uts/common/os/ipc.c +++ b/usr/src/uts/common/os/ipc.c @@ -536,10 +536,8 @@ ipcperm_set(ipc_service_t *service, struct cred *cr, kperm->ipc_gid = gid; kperm->ipc_mode = (mode & 0777) | (kperm->ipc_mode & ~0777); -#ifdef C2_AUDIT if (audit_active) audit_ipcget(service->ipcs_atype, kperm); -#endif return (0); } @@ -576,10 +574,8 @@ ipcperm_set64(ipc_service_t *service, struct cred *cr, kperm->ipc_mode = (perm64->ipcx_mode & 0777) | (kperm->ipc_mode & ~0777); -#ifdef C2_AUDIT if (audit_active) audit_ipcget(service->ipcs_atype, kperm); -#endif return (0); } @@ -804,10 +800,8 @@ ipc_lookup(ipc_service_t *service, int id, kipc_perm_t **perm) ASSERT(IPC_SEQ(id) == service->ipcs_table[index].ipct_seq); *perm = result; -#ifdef C2_AUDIT if (audit_active) audit_ipc(service->ipcs_atype, id, result); -#endif return (&service->ipcs_table[index].ipct_lock); } @@ -928,10 +922,8 @@ ipc_keylookup(ipc_service_t *service, key_t key, int flag, kipc_perm_t **permp) if ((flag & (IPC_CREAT | IPC_EXCL)) == (IPC_CREAT | IPC_EXCL)) return (EEXIST); if ((flag & 0777) & ~perm->ipc_mode) { -#ifdef C2_AUDIT if (audit_active) audit_ipcget(NULL, (void *)perm); -#endif return (EACCES); } *permp = perm; diff --git a/usr/src/uts/common/os/main.c b/usr/src/uts/common/os/main.c index ca15fb5a31..d008231021 100644 --- a/usr/src/uts/common/os/main.c +++ b/usr/src/uts/common/os/main.c @@ -451,11 +451,9 @@ main(void) swaploaded = 1; /* - * Initial C2 audit system + * Initialize Solaris Audit Subsystem */ -#ifdef C2_AUDIT - audit_init(); /* C2 hook */ -#endif + audit_init(); /* * Plumb the protocol modules and drivers only if we are not diff --git a/usr/src/uts/common/os/msg.c b/usr/src/uts/common/os/msg.c index dbb8cc2b06..678fd216ac 100644 --- a/usr/src/uts/common/os/msg.c +++ b/usr/src/uts/common/os/msg.c @@ -636,10 +636,8 @@ top: pp->p_rctls, pp); lock = ipc_commit_end(msq_svc, &qp->msg_perm); } -#ifdef C2_AUDIT if (audit_active) audit_ipcget(AT_IPC_MSG, (void *)qp); -#endif id = qp->msg_perm.ipc_id; mutex_exit(lock); return (id); @@ -1282,7 +1280,8 @@ msg_fnd_spc_snd(kmsqid_t *qp, int msg_hash, long type) walker = list_head(&qp->msg_wait_snd[msg_hash]); while (walker && walker->msgw_type != type && - (walker = list_next(&qp->msg_wait_snd[msg_hash], walker))); + (walker = list_next(&qp->msg_wait_snd[msg_hash], walker))) + continue; return (walker); } diff --git a/usr/src/uts/common/os/pid.c b/usr/src/uts/common/os/pid.c index fecc4a6c45..f90ac7ac18 100644 --- a/usr/src/uts/common/os/pid.c +++ b/usr/src/uts/common/os/pid.c @@ -20,7 +20,7 @@ */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -285,10 +285,8 @@ pid_exit(proc_t *prp) proc_entry_free(pidp); -#ifdef C2_AUDIT if (audit_active) audit_pfree(prp); -#endif if (practive == prp) { practive = prp->p_next; diff --git a/usr/src/uts/common/os/policy.c b/usr/src/uts/common/os/policy.c index 489c111b20..33602dc660 100644 --- a/usr/src/uts/common/os/policy.c +++ b/usr/src/uts/common/os/policy.c @@ -312,10 +312,8 @@ static void priv_policy_err(const cred_t *cr, int priv, boolean_t allzone, const char *msg) { -#ifdef C2_AUDIT if (audit_active) audit_priv(priv, allzone ? ZONEPRIVS(cr) : NULL, 0); -#endif DTRACE_PROBE2(priv__err, int, priv, boolean_t, allzone); if (priv_debug || (CR_FLAGS(cr) & PRIV_DEBUG) || @@ -343,11 +341,9 @@ priv_policy(const cred_t *cr, int priv, boolean_t allzone, int err, !PRIV_ISASSERT(priv_basic, priv)) && !servicing_interrupt()) { PTOU(curproc)->u_acflag |= ASU; /* Needed for SVVS */ -#ifdef C2_AUDIT if (audit_active) audit_priv(priv, allzone ? ZONEPRIVS(cr) : NULL, 1); -#endif } err = 0; DTRACE_PROBE2(priv__ok, int, priv, boolean_t, allzone); @@ -368,14 +364,12 @@ priv_policy_choice(const cred_t *cr, int priv, boolean_t allzone) boolean_t res = HAS_PRIVILEGE(cr, priv) && (!allzone || HAS_ALLZONEPRIVS(cr)); -#ifdef C2_AUDIT /* Audit success only */ if (res && audit_active && (allzone || priv == PRIV_ALL || !PRIV_ISASSERT(priv_basic, priv)) && !servicing_interrupt()) { audit_priv(priv, allzone ? ZONEPRIVS(cr) : NULL, 1); } -#endif if (res) { DTRACE_PROBE2(priv__ok, int, priv, boolean_t, allzone); } else { @@ -425,10 +419,8 @@ secpolicy_require_set(const cred_t *cr, const priv_set_t *req, const char *msg) priv_inverse(&pset); /* all non present privileges */ priv_intersect(req, &pset); /* the actual missing privs */ -#ifdef C2_AUDIT if (audit_active) audit_priv(PRIV_NONE, &pset, 0); -#endif /* * Privilege debugging; special case "one privilege in set". */ diff --git a/usr/src/uts/common/os/shm.c b/usr/src/uts/common/os/shm.c index cd99615eef..6407f022d9 100644 --- a/usr/src/uts/common/os/shm.c +++ b/usr/src/uts/common/os/shm.c @@ -716,13 +716,14 @@ shmctl(int shmid, int cmd, void *arg) } if (!isspt(sp) && (sp->shm_lkcnt++ == 0)) { if (error = shmem_lock(sp, sp->shm_amp)) { - ANON_LOCK_ENTER(&sp->shm_amp->a_rwlock, RW_WRITER); - cmn_err(CE_NOTE, - "shmctl - couldn't lock %ld pages into memory", - sp->shm_amp->size); - ANON_LOCK_EXIT(&sp->shm_amp->a_rwlock); - error = ENOMEM; - sp->shm_lkcnt--; + ANON_LOCK_ENTER(&sp->shm_amp->a_rwlock, + RW_WRITER); + cmn_err(CE_NOTE, + "shmctl - couldn't lock %ld pages into " + "memory", sp->shm_amp->size); + ANON_LOCK_EXIT(&sp->shm_amp->a_rwlock); + error = ENOMEM; + sp->shm_lkcnt--; } } break; @@ -923,10 +924,8 @@ top: lock = ipc_commit_end(shm_svc, &sp->shm_perm); } -#ifdef C2_AUDIT if (audit_active) audit_ipcget(AT_IPC_SHM, (void *)sp); -#endif *rvp = (uintptr_t)(sp->shm_perm.ipc_id); @@ -1175,7 +1174,7 @@ shmem_lock(kshmid_t *sp, struct anon_map *amp) error = as_map(as, 0x0, amp->size, segvn_create, &crargs); if (!error) { if ((error = as_ctl(as, 0x0, amp->size, MC_LOCK, 0, 0, - NULL, 0)) == 0) { + NULL, 0)) == 0) { lock_again(npages, sp, amp); } (void) as_unmap(as, 0x0, amp->size); diff --git a/usr/src/uts/common/os/sig.c b/usr/src/uts/common/os/sig.c index f46b620940..bd6309dda0 100644 --- a/usr/src/uts/common/os/sig.c +++ b/usr/src/uts/common/os/sig.c @@ -1439,16 +1439,12 @@ psig(void) sig = SIGKILL; ext = (p->p_flag & SEXTKILLED) != 0; } else { -#ifdef C2_AUDIT if (audit_active) /* audit core dump */ audit_core_start(sig); -#endif if (core(sig, ext) == 0) code = CLD_DUMPED; -#ifdef C2_AUDIT if (audit_active) /* audit core dump */ audit_core_finish(code); -#endif } } diff --git a/usr/src/uts/common/os/streamio.c b/usr/src/uts/common/os/streamio.c index 9075dbc45c..80c5ad6c8b 100644 --- a/usr/src/uts/common/os/streamio.c +++ b/usr/src/uts/common/os/streamio.c @@ -250,10 +250,8 @@ stropen(vnode_t *vp, dev_t *devp, int flag, cred_t *crp) zoneid_t zoneid; uint_t anchor; -#ifdef C2_AUDIT if (audit_active) audit_stropen(vp, devp, flag, crp); -#endif /* * If the stream already exists, wait for any open in progress @@ -269,98 +267,100 @@ retry: * Waiting for stream to be created to device * due to another open. */ - mutex_exit(&vp->v_lock); + mutex_exit(&vp->v_lock); - if (STRMATED(stp)) { - struct stdata *strmatep = stp->sd_mate; + if (STRMATED(stp)) { + struct stdata *strmatep = stp->sd_mate; - STRLOCKMATES(stp); - if (strmatep->sd_flag & (STWOPEN|STRCLOSE|STRPLUMB)) { - if (flag & (FNDELAY|FNONBLOCK)) { - error = EAGAIN; + STRLOCKMATES(stp); + if (strmatep->sd_flag & (STWOPEN|STRCLOSE|STRPLUMB)) { + if (flag & (FNDELAY|FNONBLOCK)) { + error = EAGAIN; + mutex_exit(&strmatep->sd_lock); + goto ckreturn; + } + mutex_exit(&stp->sd_lock); + if (!cv_wait_sig(&strmatep->sd_monitor, + &strmatep->sd_lock)) { + error = EINTR; + mutex_exit(&strmatep->sd_lock); + mutex_enter(&stp->sd_lock); + goto ckreturn; + } mutex_exit(&strmatep->sd_lock); - goto ckreturn; + goto retry; } - mutex_exit(&stp->sd_lock); - if (!cv_wait_sig(&strmatep->sd_monitor, - &strmatep->sd_lock)) { - error = EINTR; + if (stp->sd_flag & (STWOPEN|STRCLOSE|STRPLUMB)) { + if (flag & (FNDELAY|FNONBLOCK)) { + error = EAGAIN; + mutex_exit(&strmatep->sd_lock); + goto ckreturn; + } mutex_exit(&strmatep->sd_lock); - mutex_enter(&stp->sd_lock); - goto ckreturn; + if (!cv_wait_sig(&stp->sd_monitor, + &stp->sd_lock)) { + error = EINTR; + goto ckreturn; + } + mutex_exit(&stp->sd_lock); + goto retry; } - mutex_exit(&strmatep->sd_lock); - goto retry; - } - if (stp->sd_flag & (STWOPEN|STRCLOSE|STRPLUMB)) { - if (flag & (FNDELAY|FNONBLOCK)) { - error = EAGAIN; + + if (stp->sd_flag & (STRDERR|STWRERR)) { + error = EIO; mutex_exit(&strmatep->sd_lock); goto ckreturn; } - mutex_exit(&strmatep->sd_lock); - if (!cv_wait_sig(&stp->sd_monitor, &stp->sd_lock)) { - error = EINTR; - goto ckreturn; - } - mutex_exit(&stp->sd_lock); - goto retry; - } - if (stp->sd_flag & (STRDERR|STWRERR)) { - error = EIO; - mutex_exit(&strmatep->sd_lock); - goto ckreturn; - } - - stp->sd_flag |= STWOPEN; - STRUNLOCKMATES(stp); - } else { - mutex_enter(&stp->sd_lock); - if (stp->sd_flag & (STWOPEN|STRCLOSE|STRPLUMB)) { - if (flag & (FNDELAY|FNONBLOCK)) { - error = EAGAIN; - goto ckreturn; + stp->sd_flag |= STWOPEN; + STRUNLOCKMATES(stp); + } else { + mutex_enter(&stp->sd_lock); + if (stp->sd_flag & (STWOPEN|STRCLOSE|STRPLUMB)) { + if (flag & (FNDELAY|FNONBLOCK)) { + error = EAGAIN; + goto ckreturn; + } + if (!cv_wait_sig(&stp->sd_monitor, + &stp->sd_lock)) { + error = EINTR; + goto ckreturn; + } + mutex_exit(&stp->sd_lock); + goto retry; /* could be clone! */ } - if (!cv_wait_sig(&stp->sd_monitor, &stp->sd_lock)) { - error = EINTR; + + if (stp->sd_flag & (STRDERR|STWRERR)) { + error = EIO; goto ckreturn; } - mutex_exit(&stp->sd_lock); - goto retry; /* could be clone! */ - } - if (stp->sd_flag & (STRDERR|STWRERR)) { - error = EIO; - goto ckreturn; + stp->sd_flag |= STWOPEN; + mutex_exit(&stp->sd_lock); } - stp->sd_flag |= STWOPEN; - mutex_exit(&stp->sd_lock); - } - /* * Open all modules and devices down stream to notify * that another user is streaming. For modules, set the * last argument to MODOPEN and do not pass any open flags. * Ignore dummydev since this is not the first open. */ - claimstr(stp->sd_wrq); - qp = stp->sd_wrq; - while (_SAMESTR(qp)) { - qp = qp->q_next; - if ((error = qreopen(_RD(qp), devp, flag, crp)) != 0) - break; - } - releasestr(stp->sd_wrq); - mutex_enter(&stp->sd_lock); - stp->sd_flag &= ~(STRHUP|STWOPEN|STRDERR|STWRERR); - stp->sd_rerror = 0; - stp->sd_werror = 0; + claimstr(stp->sd_wrq); + qp = stp->sd_wrq; + while (_SAMESTR(qp)) { + qp = qp->q_next; + if ((error = qreopen(_RD(qp), devp, flag, crp)) != 0) + break; + } + releasestr(stp->sd_wrq); + mutex_enter(&stp->sd_lock); + stp->sd_flag &= ~(STRHUP|STWOPEN|STRDERR|STWRERR); + stp->sd_rerror = 0; + stp->sd_werror = 0; ckreturn: - cv_broadcast(&stp->sd_monitor); - mutex_exit(&stp->sd_lock); - return (error); + cv_broadcast(&stp->sd_monitor); + mutex_exit(&stp->sd_lock); + return (error); } /* @@ -579,13 +579,11 @@ strclose(struct vnode *vp, int flag, cred_t *crp) int freestp = 1; queue_t *rmq; -#ifdef C2_AUDIT if (audit_active) audit_strclose(vp, flag, crp); -#endif TRACE_1(TR_FAC_STREAMS_FR, - TR_STRCLOSE, "strclose:%p", vp); + TR_STRCLOSE, "strclose:%p", vp); ASSERT(vp->v_stream); stp = vp->v_stream; @@ -863,7 +861,7 @@ strclean(struct vnode *vp) int update = 0; TRACE_1(TR_FAC_STREAMS_FR, - TR_STRCLEAN, "strclean:%p", vp); + TR_STRCLEAN, "strclean:%p", vp); stp = vp->v_stream; pssp = NULL; mutex_enter(&stp->sd_lock); @@ -954,7 +952,7 @@ strget(struct stdata *stp, queue_t *q, struct uio *uiop, int first, stp->sd_wakeq &= ~RSLEEP; (void) uiodup(uiop, &uiod.d_uio, uiod.d_iov, - sizeof (uiod.d_iov) / sizeof (*uiod.d_iov)); + sizeof (uiod.d_iov) / sizeof (*uiod.d_iov)); uiod.d_mp = 0; /* * Mark that a thread is in rwnext on the read side @@ -1110,7 +1108,7 @@ strread(struct vnode *vp, struct uio *uiop, cred_t *crp) unsigned char type; TRACE_1(TR_FAC_STREAMS_FR, - TR_STRREAD_ENTER, "strread:%p", vp); + TR_STRREAD_ENTER, "strread:%p", vp); ASSERT(vp->v_stream); stp = vp->v_stream; @@ -1167,13 +1165,13 @@ strread(struct vnode *vp, struct uio *uiop, cred_t *crp) qbackenable(q, 0); TRACE_3(TR_FAC_STREAMS_FR, TR_STRREAD_WAIT, - "strread calls strwaitq:%p, %p, %p", - vp, uiop, crp); + "strread calls strwaitq:%p, %p, %p", + vp, uiop, crp); if ((error = strwaitq(stp, waitflag, uiop->uio_resid, uiop->uio_fmode, -1, &done)) != 0 || done) { TRACE_3(TR_FAC_STREAMS_FR, TR_STRREAD_DONE, - "strread error or done:%p, %p, %p", - vp, uiop, crp); + "strread error or done:%p, %p, %p", + vp, uiop, crp); if ((uiop->uio_fmode & FNDELAY) && (stp->sd_flag & OLDNDELAY) && (error == EAGAIN)) @@ -1181,7 +1179,7 @@ strread(struct vnode *vp, struct uio *uiop, cred_t *crp) goto oops; } TRACE_3(TR_FAC_STREAMS_FR, TR_STRREAD_AWAKE, - "strread awakes:%p, %p, %p", vp, uiop, crp); + "strread awakes:%p, %p, %p", vp, uiop, crp); if ((error = i_straccess(stp, JCREAD)) != 0) { goto oops; } @@ -1204,7 +1202,7 @@ strread(struct vnode *vp, struct uio *uiop, cred_t *crp) */ mark = bp->b_flag & (MSGMARK | MSGMARKNEXT | MSGNOTMARKNEXT); ASSERT((mark & (MSGMARKNEXT|MSGNOTMARKNEXT)) != - (MSGMARKNEXT|MSGNOTMARKNEXT)); + (MSGMARKNEXT|MSGNOTMARKNEXT)); if (mark != 0 && bp == stp->sd_mark) { if (rflg) { putback(stp, q, bp, pri); @@ -1314,16 +1312,16 @@ ismdata: * this point. */ while ((((bp = q->q_first)) != NULL) && - (bp->b_datap->db_type == M_SIG)) { + (bp->b_datap->db_type == M_SIG)) { bp = getq_noenab(q); /* * sd_lock is held so the content of the * read queue can not change. */ ASSERT(bp != NULL && - bp->b_datap->db_type == M_SIG); + bp->b_datap->db_type == M_SIG); strsignal_nolock(stp, *bp->b_rptr, - (int32_t)bp->b_band); + (int32_t)bp->b_band); mutex_exit(&stp->sd_lock); freemsg(bp); if (STREAM_NEEDSERVICE(stp)) @@ -1353,11 +1351,14 @@ ismdata: */ if (stp->sd_read_opt & RD_PROTDAT) { for (nbp = bp; nbp; nbp = nbp->b_next) { - if ((nbp->b_datap->db_type == M_PROTO) || - (nbp->b_datap->db_type == M_PCPROTO)) - nbp->b_datap->db_type = M_DATA; - else - break; + if ((nbp->b_datap->db_type == + M_PROTO) || + (nbp->b_datap->db_type == + M_PCPROTO)) { + nbp->b_datap->db_type = M_DATA; + } else { + break; + } } /* * clear stream head hi pri flag based on @@ -1415,7 +1416,7 @@ ismdata: * Garbage on stream head read queue. */ cmn_err(CE_WARN, "bad %x found at stream head\n", - bp->b_datap->db_type); + bp->b_datap->db_type); freemsg(bp); goto oops1; } @@ -1511,7 +1512,7 @@ strrput(queue_t *q, mblk_t *bp) ASSERT(qclaimed(q)); TRACE_2(TR_FAC_STREAMS_FR, TR_STRRPUT_ENTER, - "strrput called with message type:q %p bp %p", q, bp); + "strrput called with message type:q %p bp %p", q, bp); /* * Perform initial processing and pass to the parameterized functions. @@ -1665,7 +1666,7 @@ strrput(queue_t *q, mblk_t *bp) case M_PCPROTO: ASSERT(stp->sd_rprotofunc != NULL); bp = (stp->sd_rprotofunc)(stp->sd_vnode, bp, - &wakeups, &firstmsgsigs, &allmsgsigs, &pollwakeups); + &wakeups, &firstmsgsigs, &allmsgsigs, &pollwakeups); #define ALLSIG (S_INPUT|S_HIPRI|S_OUTPUT|S_MSG|S_ERROR|S_HANGUP|S_RDNORM|\ S_WRNORM|S_RDBAND|S_WRBAND|S_BANDURG) #define ALLPOLL (POLLIN|POLLPRI|POLLOUT|POLLRDNORM|POLLWRNORM|POLLRDBAND|\ @@ -1682,7 +1683,7 @@ strrput(queue_t *q, mblk_t *bp) default: ASSERT(stp->sd_rmiscfunc != NULL); bp = (stp->sd_rmiscfunc)(stp->sd_vnode, bp, - &wakeups, &firstmsgsigs, &allmsgsigs, &pollwakeups); + &wakeups, &firstmsgsigs, &allmsgsigs, &pollwakeups); ASSERT((wakeups & ~(RSLEEP|WSLEEP)) == 0); ASSERT((firstmsgsigs & ~ALLSIG) == 0); ASSERT((allmsgsigs & ~ALLSIG) == 0); @@ -1929,8 +1930,8 @@ strrput_nondata(queue_t *q, mblk_t *bp) } if (rw) { TRACE_2(TR_FAC_STREAMS_FR, TR_STRRPUT_WAKE, - "strrput cv_broadcast:q %p, bp %p", - q, bp); + "strrput cv_broadcast:q %p, bp %p", + q, bp); cv_broadcast(&q->q_wait); /* readers */ cv_broadcast(&_WR(q)->q_wait); /* writers */ cv_broadcast(&stp->sd_monitor); /* ioctllers */ @@ -1977,8 +1978,8 @@ strrput_nondata(queue_t *q, mblk_t *bp) stp->sd_rerror = *bp->b_rptr; stp->sd_werror = *bp->b_rptr; TRACE_2(TR_FAC_STREAMS_FR, - TR_STRRPUT_WAKE2, - "strrput wakeup #2:q %p, bp %p", q, bp); + TR_STRRPUT_WAKE2, + "strrput wakeup #2:q %p, bp %p", q, bp); cv_broadcast(&q->q_wait); /* the readers */ cv_broadcast(&_WR(q)->q_wait); /* the writers */ cv_broadcast(&stp->sd_monitor); /* ioctllers */ @@ -2295,26 +2296,30 @@ strrput_nondata(queue_t *q, mblk_t *bp) if (sop->so_flags & SO_MAXBLK) stp->sd_maxblk = sop->so_maxblk; if (sop->so_flags & SO_HIWAT) { - if (sop->so_flags & SO_BAND) { - if (strqset(q, QHIWAT, sop->so_band, sop->so_hiwat)) - cmn_err(CE_WARN, - "strrput: could not allocate qband\n"); - else - bpri = sop->so_band; - } else { - q->q_hiwat = sop->so_hiwat; - } + if (sop->so_flags & SO_BAND) { + if (strqset(q, QHIWAT, + sop->so_band, sop->so_hiwat)) { + cmn_err(CE_WARN, "strrput: could not " + "allocate qband\n"); + } else { + bpri = sop->so_band; + } + } else { + q->q_hiwat = sop->so_hiwat; + } } if (sop->so_flags & SO_LOWAT) { - if (sop->so_flags & SO_BAND) { - if (strqset(q, QLOWAT, sop->so_band, sop->so_lowat)) - cmn_err(CE_WARN, - "strrput: could not allocate qband\n"); - else - bpri = sop->so_band; - } else { - q->q_lowat = sop->so_lowat; - } + if (sop->so_flags & SO_BAND) { + if (strqset(q, QLOWAT, + sop->so_band, sop->so_lowat)) { + cmn_err(CE_WARN, "strrput: could not " + "allocate qband\n"); + } else { + bpri = sop->so_band; + } + } else { + q->q_lowat = sop->so_lowat; + } } if (sop->so_flags & SO_MREADON) stp->sd_flag |= SNDMREAD; @@ -2402,8 +2407,8 @@ strrput_nondata(queue_t *q, mblk_t *bp) default: #ifdef DEBUG cmn_err(CE_WARN, - "bad message type %x received at stream head\n", - bp->b_datap->db_type); + "bad message type %x received at stream head\n", + bp->b_datap->db_type); #endif freemsg(bp); return (0); @@ -2497,7 +2502,7 @@ strput(struct stdata *stp, mblk_t *mctl, struct uio *uiop, ssize_t *iosize, } if ((error = strmakedata(iosize, uiop, stp, flags, - &mp)) != 0) { + &mp)) != 0) { freemsg(mctl); /* * need to change return code to ENOMEM @@ -2578,7 +2583,7 @@ strput(struct stdata *stp, mblk_t *mctl, struct uio *uiop, ssize_t *iosize, mp->b_band = (uchar_t)pri; (void) uiodup(uiop, &uiod.d_uio, uiod.d_iov, - sizeof (uiod.d_iov) / sizeof (*uiod.d_iov)); + sizeof (uiod.d_iov) / sizeof (*uiod.d_iov)); uiod.d_uio.uio_offset = 0; uiod.d_mp = mp; error = rwnext(wqp, &uiod); @@ -2717,14 +2722,14 @@ strwrite_common(struct vnode *vp, struct uio *uiop, cred_t *crp, int wflag) if (rmin > 0) { if (uiop->uio_resid < rmin) { TRACE_3(TR_FAC_STREAMS_FR, TR_STRWRITE_OUT, - "strwrite out:q %p out %d error %d", - wqp, 0, ERANGE); + "strwrite out:q %p out %d error %d", + wqp, 0, ERANGE); return (ERANGE); } if ((rmax != INFPSZ) && (uiop->uio_resid > rmax)) { TRACE_3(TR_FAC_STREAMS_FR, TR_STRWRITE_OUT, - "strwrite out:q %p out %d error %d", - wqp, 1, ERANGE); + "strwrite out:q %p out %d error %d", + wqp, 1, ERANGE); return (ERANGE); } } @@ -2767,8 +2772,7 @@ strwrite_common(struct vnode *vp, struct uio *uiop, cred_t *crp, int wflag) for (;;) { int done = 0; - error = strput(stp, NULL, uiop, &iosize, b_flag, - 0, 0); + error = strput(stp, NULL, uiop, &iosize, b_flag, 0, 0); if (error == 0) break; if (error != EWOULDBLOCK) @@ -2786,7 +2790,7 @@ strwrite_common(struct vnode *vp, struct uio *uiop, cred_t *crp, int wflag) continue; } TRACE_1(TR_FAC_STREAMS_FR, TR_STRWRITE_WAIT, - "strwrite wait:q %p wait", wqp); + "strwrite wait:q %p wait", wqp); if ((error = strwaitq(stp, waitflag, (ssize_t)0, tempmode, -1, &done)) != 0 || done) { mutex_exit(&stp->sd_lock); @@ -2797,7 +2801,7 @@ strwrite_common(struct vnode *vp, struct uio *uiop, cred_t *crp, int wflag) goto out; } TRACE_1(TR_FAC_STREAMS_FR, TR_STRWRITE_WAKE, - "strwrite wake:q %p awakes", wqp); + "strwrite wake:q %p awakes", wqp); if ((error = i_straccess(stp, JCWRITE)) != 0) { mutex_exit(&stp->sd_lock); goto out; @@ -2806,7 +2810,7 @@ strwrite_common(struct vnode *vp, struct uio *uiop, cred_t *crp, int wflag) } waitflag |= NOINTR; TRACE_2(TR_FAC_STREAMS_FR, TR_STRWRITE_RESID, - "strwrite resid:q %p uiop %p", wqp, uiop); + "strwrite resid:q %p uiop %p", wqp, uiop); if (uiop->uio_resid) { /* Recheck for errors - needed for sockets */ if ((stp->sd_wput_opt & SW_RECHECK_ERR) && @@ -2829,7 +2833,7 @@ out: if (error == ENOMEM) error = EAGAIN; TRACE_3(TR_FAC_STREAMS_FR, TR_STRWRITE_OUT, - "strwrite out:q %p out %d error %d", wqp, 2, error); + "strwrite out:q %p out %d error %d", wqp, 2, error); return (error); } @@ -2853,7 +2857,7 @@ strwsrv(queue_t *q) unsigned char qbf[NBAND]; /* band flushing backenable flags */ TRACE_1(TR_FAC_STREAMS_FR, - TR_STRWSRV, "strwsrv:q %p", q); + TR_STRWSRV, "strwsrv:q %p", q); stp = (struct stdata *)q->q_ptr; ASSERT(qclaimed(q)); mutex_enter(&stp->sd_lock); @@ -2926,16 +2930,16 @@ strwsrv(queue_t *q) mutex_exit(QLOCK(tq)); if (isevent) { - for (i = tq->q_nband; i; i--) { - if (qbf[i]) { - pollwakeup(&stp->sd_pollist, POLLWRBAND); - mutex_enter(&stp->sd_lock); - if (stp->sd_sigflags & S_WRBAND) - strsendsig(stp->sd_siglist, S_WRBAND, - (uchar_t)i, 0); - mutex_exit(&stp->sd_lock); + for (i = tq->q_nband; i; i--) { + if (qbf[i]) { + pollwakeup(&stp->sd_pollist, POLLWRBAND); + mutex_enter(&stp->sd_lock); + if (stp->sd_sigflags & S_WRBAND) + strsendsig(stp->sd_siglist, S_WRBAND, + (uchar_t)i, 0); + mutex_exit(&stp->sd_lock); + } } - } } releasestr(q); @@ -3157,12 +3161,10 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, stp = vp->v_stream; TRACE_3(TR_FAC_STREAMS_FR, TR_IOCTL_ENTER, - "strioctl:stp %p cmd %X arg %lX", stp, cmd, arg); + "strioctl:stp %p cmd %X arg %lX", stp, cmd, arg); -#ifdef C2_AUDIT if (audit_active) audit_strioctl(vp, cmd, arg, flag, copyflag, crp, rvalp); -#endif /* * If the copy is kernel to kernel, make sure that the FNATIVE @@ -3303,7 +3305,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, strioc.ic_len = sizeof (struct termio); strioc.ic_dp = (char *)arg; return (strdoioctl(stp, &strioc, flag, - copyflag, crp, rvalp)); + copyflag, crp, rvalp)); case TCSETS: case TCSETSW: @@ -3311,19 +3313,19 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, strioc.ic_len = sizeof (struct termios); strioc.ic_dp = (char *)arg; return (strdoioctl(stp, &strioc, flag, - copyflag, crp, rvalp)); + copyflag, crp, rvalp)); case LDSETT: strioc.ic_len = sizeof (struct termcb); strioc.ic_dp = (char *)arg; return (strdoioctl(stp, &strioc, flag, - copyflag, crp, rvalp)); + copyflag, crp, rvalp)); case TIOCSETP: strioc.ic_len = sizeof (struct sgttyb); strioc.ic_dp = (char *)arg; return (strdoioctl(stp, &strioc, flag, - copyflag, crp, rvalp)); + copyflag, crp, rvalp)); case TIOCSTI: if ((flag & FREAD) == 0 && @@ -3344,19 +3346,19 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, strioc.ic_len = sizeof (char); strioc.ic_dp = (char *)arg; return (strdoioctl(stp, &strioc, flag, - copyflag, crp, rvalp)); + copyflag, crp, rvalp)); case TIOCSWINSZ: strioc.ic_len = sizeof (struct winsize); strioc.ic_dp = (char *)arg; return (strdoioctl(stp, &strioc, flag, - copyflag, crp, rvalp)); + copyflag, crp, rvalp)); case TIOCSSIZE: strioc.ic_len = sizeof (struct ttysize); strioc.ic_dp = (char *)arg; return (strdoioctl(stp, &strioc, flag, - copyflag, crp, rvalp)); + copyflag, crp, rvalp)); case TIOCSSOFTCAR: case KIOCTRANS: @@ -3372,41 +3374,41 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, strioc.ic_len = sizeof (int); strioc.ic_dp = (char *)arg; return (strdoioctl(stp, &strioc, flag, - copyflag, crp, rvalp)); + copyflag, crp, rvalp)); case KIOCSETKEY: case KIOCGETKEY: strioc.ic_len = sizeof (struct kiockey); strioc.ic_dp = (char *)arg; return (strdoioctl(stp, &strioc, flag, - copyflag, crp, rvalp)); + copyflag, crp, rvalp)); case KIOCSKEY: case KIOCGKEY: strioc.ic_len = sizeof (struct kiockeymap); strioc.ic_dp = (char *)arg; return (strdoioctl(stp, &strioc, flag, - copyflag, crp, rvalp)); + copyflag, crp, rvalp)); case KIOCSLED: /* arg is a pointer to char */ strioc.ic_len = sizeof (char); strioc.ic_dp = (char *)arg; return (strdoioctl(stp, &strioc, flag, - copyflag, crp, rvalp)); + copyflag, crp, rvalp)); case MSIOSETPARMS: strioc.ic_len = sizeof (Ms_parms); strioc.ic_dp = (char *)arg; return (strdoioctl(stp, &strioc, flag, - copyflag, crp, rvalp)); + copyflag, crp, rvalp)); case VUIDSADDR: case VUIDGADDR: strioc.ic_len = sizeof (struct vuid_addr_probe); strioc.ic_dp = (char *)arg; return (strdoioctl(stp, &strioc, flag, - copyflag, crp, rvalp)); + copyflag, crp, rvalp)); /* * These M_IOCTL's don't require any data to be sent @@ -3439,7 +3441,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, strioc.ic_len = 0; strioc.ic_dp = (char *)arg; return (strdoioctl(stp, &strioc, flag, - copyflag, crp, rvalp)); + copyflag, crp, rvalp)); } } @@ -3516,7 +3518,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, * in queue in "arg" and return the number of messages * in queue in return value. */ - { + { size_t size; int retval; int count = 0; @@ -3554,14 +3556,14 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, if (!error) *rvalp = count; return (error); - } + } case FIONREAD: /* * Return number of bytes of data in all data messages * in queue in "arg". */ - { + { size_t size = 0; int retval; @@ -3590,7 +3592,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, *rvalp = 0; return (error); - } + } case FIORDCHK: /* * FIORDCHK does not use arg value (like FIONREAD), @@ -3599,7 +3601,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, * to add the msgdsizes of all data messages until * a non-data message. */ - { + { size_t size = 0; mutex_enter(QLOCK(rdq)); @@ -3624,13 +3626,13 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, */ *rvalp = MIN(size, INT_MAX); return (0); - } + } case I_FIND: /* * Get module name. */ - { + { char mname[FMNAMESZ + 1]; queue_t *q; @@ -3644,7 +3646,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, */ if (fmodsw_find(mname, FMODSW_LOAD) == NULL) { TRACE_0(TR_FAC_STREAMS_FR, - TR_I_CANT_FIND, "couldn't I_FIND"); + TR_I_CANT_FIND, "couldn't I_FIND"); return (EINVAL); } @@ -3664,7 +3666,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, *rvalp = (q ? 1 : 0); return (error); - } + } case I_PUSH: case __I_PUSH_NOCTTY: @@ -3674,7 +3676,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, * do not allocate controlling tty. See bugid 4025044 */ - { + { char mname[FMNAMESZ + 1]; fmodsw_impl_t *fp; dev_t dummydev; @@ -3765,10 +3767,10 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, strendplumb(stp); mutex_exit(&stp->sd_lock); return (error); - } + } case I_POP: - { + { queue_t *q; if (stp->sd_flag & STRHUP) @@ -3808,7 +3810,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, q = wrq->q_next; TRACE_2(TR_FAC_STREAMS_FR, TR_I_POP, - "I_POP:%p from %p", q, stp); + "I_POP:%p from %p", q, stp); if (q->q_next == NULL || (q->q_flag & (QREADR|QISDRV))) { error = EINVAL; } else { @@ -3851,7 +3853,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, strendplumb(stp); mutex_exit(&stp->sd_lock); return (error); - } + } case _I_MUXID2FD: { @@ -4261,7 +4263,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, * Get name of first module downstream. * If no module, return an error. */ - { + { claimstr(wrq); if (_SAMESTR(wrq) && wrq->q_next->q_next) { char *name = wrq->q_next->q_qinfo->qi_minfo->mi_idname; @@ -4272,7 +4274,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, } releasestr(wrq); return (EINVAL); - } + } case I_LINK: case I_PLINK: @@ -4298,7 +4300,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, * controlling stream. Otherwise, arg is an index number * for a link to be removed. */ - { + { struct linkinfo *linkp; int native_arg = (int)arg; int type; @@ -4306,7 +4308,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, str_stack_t *ss; TRACE_1(TR_FAC_STREAMS_FR, - TR_I_UNLINK, "I_UNLINK/I_PUNLINK:%p", stp); + TR_I_UNLINK, "I_UNLINK/I_PUNLINK:%p", stp); if (vp->v_type == VFIFO) { return (EINVAL); } @@ -4337,7 +4339,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, } netstack_rele(ss->ss_netstack); return (error); - } + } case I_FLUSH: /* @@ -4376,7 +4378,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, return (0); case I_FLUSHBAND: - { + { struct bandinfo binfo; error = strcopyin((void *)arg, &binfo, sizeof (binfo), @@ -4408,7 +4410,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, (void) strdoioctl(stp, &strioc, flag, K_TO_K, crp, rvalp); *rvalp = 0; return (0); - } + } case I_SRDOPT: /* @@ -4465,7 +4467,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, * Get read option and return the value * to spot pointed to by arg */ - { + { int rdopt; rdopt = ((stp->sd_read_opt & RD_MSGDIS) ? RMSGD : @@ -4475,7 +4477,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, return (strcopyout(&rdopt, (void *)arg, sizeof (int), copyflag)); - } + } case I_SERROPT: /* @@ -4514,16 +4516,16 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, * Get error option and return the value * to spot pointed to by arg */ - { + { int erropt = 0; erropt |= (stp->sd_flag & STRDERRNONPERSIST) ? RERRNONPERSIST : - RERRNORM; + RERRNORM; erropt |= (stp->sd_flag & STWRERRNONPERSIST) ? WERRNONPERSIST : - WERRNORM; + WERRNORM; return (strcopyout(&erropt, (void *)arg, sizeof (int), copyflag)); - } + } case I_SETSIG: /* @@ -4531,7 +4533,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, * signal based on the events given in arg. If * arg is zero, remove the proc from register list. */ - { + { strsig_t *ssp, *pssp; struct pid *pidp; @@ -4543,7 +4545,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, */ mutex_enter(&stp->sd_lock); for (ssp = stp->sd_siglist; ssp && (ssp->ss_pidp != pidp); - pssp = ssp, ssp = ssp->ss_next) + pssp = ssp, ssp = ssp->ss_next) ; if (arg) { @@ -4606,14 +4608,14 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, stp->sd_sigflags |= ssp->ss_events; mutex_exit(&stp->sd_lock); return (0); - } + } case I_GETSIG: /* * Return (in arg) the current registration of events * for which the calling proc is to be signaled. */ - { + { struct strsig *ssp; struct pid *pidp; @@ -4628,7 +4630,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, } mutex_exit(&stp->sd_lock); return (EINVAL); - } + } case I_ESETSIG: /* @@ -4691,7 +4693,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, */ mutex_enter(&stp->sd_lock); for (ssp = stp->sd_siglist; ssp && (ssp->ss_pid != pid); - pssp = ssp, ssp = ssp->ss_next) + pssp = ssp, ssp = ssp->ss_next) ; if (ss.ss_events) { @@ -4768,14 +4770,14 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, PID_RELE(pidp); mutex_exit(&pidlock); return (0); - } + } case I_EGETSIG: /* * Return (in arg) the current registration of events * for which the calling proc is to be signaled. */ - { + { struct strsig *ssp; struct proc *proc; pid_t pid; @@ -4825,10 +4827,10 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, PID_RELE(pidp); mutex_exit(&pidlock); return (EINVAL); - } + } case I_PEEK: - { + { STRUCT_DECL(strpeek, strpeek); size_t n; mblk_t *fmp, *tmp_mp = NULL; @@ -4974,7 +4976,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, if ((n = MIN(uio.uio_resid, mp->b_wptr - mp->b_rptr)) != 0 && (error = uiomove((char *)mp->b_rptr, - n, UIO_READ, &uio)) != 0) { + n, UIO_READ, &uio)) != 0) { freemsg(tmp_mp); return (error); } @@ -5035,10 +5037,10 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, else *rvalp = 1; return (0); - } + } case I_FDINSERT: - { + { STRUCT_DECL(strfdinsert, strfdinsert); struct file *resftp; struct stdata *resstp; @@ -5072,7 +5074,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, mutex_enter(&resstp->sd_lock); if (resstp->sd_flag & (STRDERR|STWRERR|STRHUP|STPLEX)) { error = strgeterr(resstp, - STRDERR|STWRERR|STRHUP|STPLEX, 0); + STRDERR|STWRERR|STRHUP|STPLEX, 0); if (error != 0) { mutex_exit(&resstp->sd_lock); releasef(STRUCT_FGET(strfdinsert, fildes)); @@ -5208,27 +5210,25 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, stream_runservice(stp); releasef(STRUCT_FGET(strfdinsert, fildes)); return (error); - } + } case I_SENDFD: - { + { struct file *fp; if ((fp = getf((int)arg)) == NULL) return (EBADF); error = do_sendfp(stp, fp, crp); -#ifdef C2_AUDIT if (audit_active) { audit_fdsend((int)arg, fp, error); } -#endif releasef((int)arg); return (error); - } + } case I_RECVFD: case I_E_RECVFD: - { + { struct k_strrecvfd *srf; int i, fd; @@ -5308,11 +5308,9 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, mutex_exit(&stp->sd_lock); return (error); } -#ifdef C2_AUDIT if (audit_active) { audit_fdrecv(fd, srf->fp); } -#endif /* * Always increment f_count since the freemsg() below will @@ -5324,7 +5322,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, setf(fd, srf->fp); freemsg(mp); return (0); - } + } case I_SWROPT: /* @@ -5350,7 +5348,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, return (0); case I_GWROPT: - { + { int wropt = 0; if (stp->sd_wput_opt & SW_SNDZERO) @@ -5359,7 +5357,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, wropt |= SNDPIPE; return (strcopyout(&wropt, (void *)arg, sizeof (wropt), copyflag)); - } + } case I_LIST: /* @@ -5370,7 +5368,7 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, * provided. */ - { + { queue_t *q; int num_modules, space_allocated; STRUCT_DECL(str_list, strlist); @@ -5423,10 +5421,10 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, sizeof (int), copyflag); } return (error); - } + } case I_CKBAND: - { + { queue_t *q; qband_t *qbp; @@ -5454,10 +5452,10 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, } mutex_exit(QLOCK(q)); return (0); - } + } case I_GETBAND: - { + { int intpri; queue_t *q; @@ -5473,10 +5471,10 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, copyflag); mutex_exit(QLOCK(q)); return (error); - } + } case I_ATMARK: - { + { queue_t *q; if (arg & ~(ANYMARK|LASTMARK)) @@ -5501,10 +5499,10 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, } mutex_exit(&stp->sd_lock); return (0); - } + } case I_CANPUT: - { + { char band; if ((arg < 0) || (arg >= NBAND)) @@ -5512,10 +5510,10 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, band = (char)arg; *rvalp = bcanputnext(stp->sd_wrq, band); return (0); - } + } case I_SETCLTIME: - { + { int closetime; error = strcopyin((void *)arg, &closetime, sizeof (int), @@ -5527,16 +5525,16 @@ strioctl(struct vnode *vp, int cmd, intptr_t arg, int flag, int copyflag, stp->sd_closetime = closetime; return (0); - } + } case I_GETCLTIME: - { + { int closetime; closetime = stp->sd_closetime; return (strcopyout(&closetime, (void *)arg, sizeof (int), copyflag)); - } + } case TIOCGSID: { @@ -5833,8 +5831,8 @@ strdoioctl( ASSERT((fflags & FMODELS) != 0); TRACE_2(TR_FAC_STREAMS_FR, - TR_STRDOIOCTL, - "strdoioctl:stp %p strioc %p", stp, strioc); + TR_STRDOIOCTL, + "strdoioctl:stp %p strioc %p", stp, strioc); if (strioc->ic_len == TRANSPARENT) { /* send arg in M_DATA block */ transparent = 1; strioc->ic_len = sizeof (intptr_t); @@ -5918,8 +5916,8 @@ strdoioctl( clock_t cv_rval; TRACE_0(TR_FAC_STREAMS_FR, - TR_STRDOIOCTL_WAIT, - "strdoioctl sleeps - IOCWAIT"); + TR_STRDOIOCTL_WAIT, + "strdoioctl sleeps - IOCWAIT"); cv_rval = str_cv_wait(&stp->sd_iocmonitor, &stp->sd_lock, STRTIMOUT, sigflag); if (cv_rval <= 0) { @@ -5990,7 +5988,7 @@ strdoioctl( mutex_exit(&stp->sd_lock); TRACE_1(TR_FAC_STREAMS_FR, - TR_STRDOIOCTL_PUT, "strdoioctl put: stp %p", stp); + TR_STRDOIOCTL_PUT, "strdoioctl put: stp %p", stp); stream_willservice(stp); putnext(stp->sd_wrq, bp); stream_runservice(stp); @@ -6028,8 +6026,8 @@ waitioc: } TRACE_0(TR_FAC_STREAMS_FR, - TR_STRDOIOCTL_WAIT2, - "strdoioctl sleeps awaiting reply"); + TR_STRDOIOCTL_WAIT2, + "strdoioctl sleeps awaiting reply"); ASSERT(error == 0); cv_rval = str_cv_wait(&stp->sd_monitor, &stp->sd_lock, @@ -6080,7 +6078,7 @@ waitioc: } bp->b_datap->db_type = M_IOCDATA; bp->b_wptr = bp->b_rptr + - sizeof (struct copyresp); + sizeof (struct copyresp); resp = (struct copyresp *)bp->b_rptr; resp->cp_rval = (caddr_t)1; /* failure */ @@ -6107,7 +6105,7 @@ waitioc: */ ASSERT(bp != NULL && bp != (mblk_t *)-1); TRACE_1(TR_FAC_STREAMS_FR, - TR_STRDOIOCTL_ACK, "strdoioctl got reply: bp %p", bp); + TR_STRDOIOCTL_ACK, "strdoioctl got reply: bp %p", bp); if ((bp->b_datap->db_type == M_IOCACK) || (bp->b_datap->db_type == M_IOCNAK)) { /* for detection of duplicate ioctl replies */ @@ -6337,7 +6335,7 @@ strgetmsg( unsigned char type; TRACE_1(TR_FAC_STREAMS_FR, TR_STRGETMSG_ENTER, - "strgetmsg:%p", vp); + "strgetmsg:%p", vp); ASSERT(vp->v_stream); stp = vp->v_stream; @@ -6441,21 +6439,21 @@ strgetmsg( * determine if a high priority messages is waiting */ } else if ((*flagsp & MSG_HIPRI) && q_first != NULL && - q_first->b_datap->db_type >= QPCTL && - (bp = getq_noenab(q)) != NULL) { + q_first->b_datap->db_type >= QPCTL && + (bp = getq_noenab(q)) != NULL) { /* Asked for HIPRI and got one */ ASSERT(bp->b_datap->db_type >= QPCTL); break; } else if ((*flagsp & MSG_BAND) && q_first != NULL && - ((q_first->b_band >= *prip) || - q_first->b_datap->db_type >= QPCTL) && - (bp = getq_noenab(q)) != NULL) { + ((q_first->b_band >= *prip) || + q_first->b_datap->db_type >= QPCTL) && + (bp = getq_noenab(q)) != NULL) { /* * Asked for at least band "prip" and got either at * least that band or a hipri message. */ ASSERT(bp->b_band >= *prip || - bp->b_datap->db_type >= QPCTL); + bp->b_datap->db_type >= QPCTL); if (bp->b_datap->db_type == M_SIG) { strsignal_nolock(stp, *bp->b_rptr, (int32_t)bp->b_band); @@ -6482,18 +6480,18 @@ strgetmsg( return (0); } TRACE_2(TR_FAC_STREAMS_FR, TR_STRGETMSG_WAIT, - "strgetmsg calls strwaitq:%p, %p", - vp, uiop); + "strgetmsg calls strwaitq:%p, %p", + vp, uiop); if (((error = strwaitq(stp, GETWAIT, (ssize_t)0, fmode, -1, &done)) != 0) || done) { TRACE_2(TR_FAC_STREAMS_FR, TR_STRGETMSG_DONE, - "strgetmsg error or done:%p, %p", - vp, uiop); + "strgetmsg error or done:%p, %p", + vp, uiop); mutex_exit(&stp->sd_lock); return (error); } TRACE_2(TR_FAC_STREAMS_FR, TR_STRGETMSG_AWAKE, - "strgetmsg awakes:%p, %p", vp, uiop); + "strgetmsg awakes:%p, %p", vp, uiop); if ((error = i_straccess(stp, JCREAD)) != 0) { mutex_exit(&stp->sd_lock); return (error); @@ -6512,7 +6510,7 @@ strgetmsg( */ mark = bp->b_flag & (MSGMARK | MSGMARKNEXT | MSGNOTMARKNEXT); ASSERT((mark & (MSGMARKNEXT|MSGNOTMARKNEXT)) != - (MSGMARKNEXT|MSGNOTMARKNEXT)); + (MSGMARKNEXT|MSGNOTMARKNEXT)); if (mark != 0 && bp == stp->sd_mark) { mark |= _LASTMARK; stp->sd_mark = NULL; @@ -6902,7 +6900,7 @@ kstrgetmsg( unsigned char type; TRACE_1(TR_FAC_STREAMS_FR, TR_KSTRGETMSG_ENTER, - "kstrgetmsg:%p", vp); + "kstrgetmsg:%p", vp); ASSERT(vp->v_stream); stp = vp->v_stream; @@ -6920,7 +6918,7 @@ kstrgetmsg( if ((stp->sd_flag & STPLEX) || (flags & (MSG_IGNERROR|MSG_DELAYERROR)) == 0) { error = strgeterr(stp, STRDERR|STPLEX, - (flags & MSG_IPEEK)); + (flags & MSG_IPEEK)); if (error != 0) { mutex_exit(&stp->sd_lock); return (error); @@ -6982,20 +6980,20 @@ retry: * determine if a high priority messages is waiting */ } else if ((flags & MSG_HIPRI) && q_first != NULL && - q_first->b_datap->db_type >= QPCTL && - (bp = getq_noenab(q)) != NULL) { + q_first->b_datap->db_type >= QPCTL && + (bp = getq_noenab(q)) != NULL) { ASSERT(bp->b_datap->db_type >= QPCTL); break; } else if ((flags & MSG_BAND) && q_first != NULL && - ((q_first->b_band >= *prip) || - q_first->b_datap->db_type >= QPCTL) && - (bp = getq_noenab(q)) != NULL) { + ((q_first->b_band >= *prip) || + q_first->b_datap->db_type >= QPCTL) && + (bp = getq_noenab(q)) != NULL) { /* * Asked for at least band "prip" and got either at * least that band or a hipri message. */ ASSERT(bp->b_band >= *prip || - bp->b_datap->db_type >= QPCTL); + bp->b_datap->db_type >= QPCTL); if (bp->b_datap->db_type == M_SIG) { strsignal_nolock(stp, *bp->b_rptr, (int32_t)bp->b_band); @@ -7014,7 +7012,7 @@ retry: if ((stp->sd_flag & (STRDERR|STPLEX)) && (flags & (MSG_IGNERROR|MSG_DELAYERROR)) == MSG_DELAYERROR) { error = strgeterr(stp, STRDERR|STPLEX, - (flags & MSG_IPEEK)); + (flags & MSG_IPEEK)); if (error != 0) { mutex_exit(&stp->sd_lock); return (error); @@ -7057,18 +7055,18 @@ retry: fmode = 0; TRACE_2(TR_FAC_STREAMS_FR, TR_KSTRGETMSG_WAIT, - "kstrgetmsg calls strwaitq:%p, %p", - vp, uiop); + "kstrgetmsg calls strwaitq:%p, %p", + vp, uiop); if (((error = strwaitq(stp, waitflag, (ssize_t)0, fmode, timout, &done)) != 0) || done) { TRACE_2(TR_FAC_STREAMS_FR, TR_KSTRGETMSG_DONE, - "kstrgetmsg error or done:%p, %p", - vp, uiop); + "kstrgetmsg error or done:%p, %p", + vp, uiop); mutex_exit(&stp->sd_lock); return (error); } TRACE_2(TR_FAC_STREAMS_FR, TR_KSTRGETMSG_AWAKE, - "kstrgetmsg awakes:%p, %p", vp, uiop); + "kstrgetmsg awakes:%p, %p", vp, uiop); if ((error = i_straccess(stp, JCREAD)) != 0) { mutex_exit(&stp->sd_lock); return (error); @@ -7087,7 +7085,7 @@ retry: */ mark = bp->b_flag & (MSGMARK | MSGMARKNEXT | MSGNOTMARKNEXT); ASSERT((mark & (MSGMARKNEXT|MSGNOTMARKNEXT)) != - (MSGMARKNEXT|MSGNOTMARKNEXT)); + (MSGMARKNEXT|MSGNOTMARKNEXT)); pri = bp->b_band; if (mark != 0) { /* @@ -7301,7 +7299,7 @@ retry: stp->sd_flag &= ~STRPRI; } } else if (pr && (savemp->b_datap->db_type == M_DATA) && - msgnodata(savemp)) { + msgnodata(savemp)) { /* * Avoid queuing a zero-length tail part of * a message. pr=1 indicates that we read some of @@ -7537,10 +7535,8 @@ strputmsg( xpg4 = (flag & MSG_XPG4) ? 1 : 0; flag &= ~MSG_XPG4; -#ifdef C2_AUDIT if (audit_active) audit_strputmsg(vp, mctl, mdata, pri, flag, fmode); -#endif mutex_enter(&stp->sd_lock); @@ -7575,7 +7571,7 @@ strputmsg( } TRACE_1(TR_FAC_STREAMS_FR, TR_STRPUTMSG_IN, - "strputmsg in:stp %p", stp); + "strputmsg in:stp %p", stp); /* get these values from those cached in the stream head */ rmin = stp->sd_qn_minpsz; @@ -7634,8 +7630,8 @@ strputmsg( */ if ((error = strmakectl(mctl, flag, fmode, &mp)) != 0) { TRACE_3(TR_FAC_STREAMS_FR, TR_STRPUTMSG_OUT, - "strputmsg out:stp %p out %d error %d", - stp, 1, error); + "strputmsg out:stp %p out %d error %d", + stp, 1, error); return (error); } /* @@ -7643,7 +7639,7 @@ strputmsg( * strput. */ ASSERT(stp->sd_maxblk == INFPSZ || - stp->sd_maxblk >= mdata->len); + stp->sd_maxblk >= mdata->len); msgsize = mdata->len; error = strput(stp, mp, uiop, &msgsize, 0, pri, flag); @@ -7667,17 +7663,17 @@ strputmsg( continue; } TRACE_2(TR_FAC_STREAMS_FR, TR_STRPUTMSG_WAIT, - "strputmsg wait:stp %p waits pri %d", stp, pri); + "strputmsg wait:stp %p waits pri %d", stp, pri); if (((error = strwaitq(stp, WRITEWAIT, (ssize_t)0, fmode, -1, &done)) != 0) || done) { mutex_exit(&stp->sd_lock); TRACE_3(TR_FAC_STREAMS_FR, TR_STRPUTMSG_OUT, - "strputmsg out:q %p out %d error %d", - stp, 0, error); + "strputmsg out:q %p out %d error %d", + stp, 0, error); return (error); } TRACE_1(TR_FAC_STREAMS_FR, TR_STRPUTMSG_WAKE, - "strputmsg wake:stp %p wakes", stp); + "strputmsg wake:stp %p wakes", stp); if ((error = i_straccess(stp, JCWRITE)) != 0) { mutex_exit(&stp->sd_lock); return (error); @@ -7693,7 +7689,7 @@ out: if (error == ENOMEM) error = EAGAIN; TRACE_3(TR_FAC_STREAMS_FR, TR_STRPUTMSG_OUT, - "strputmsg out:stp %p out %d error %d", stp, 2, error); + "strputmsg out:stp %p out %d error %d", stp, 2, error); return (error); } @@ -7728,10 +7724,8 @@ kstrputmsg( ASSERT(vp->v_stream); stp = vp->v_stream; wqp = stp->sd_wrq; -#ifdef C2_AUDIT if (audit_active) audit_strputmsg(vp, NULL, NULL, pri, flag, fmode); -#endif if (mctl == NULL) return (EINVAL); @@ -7774,7 +7768,7 @@ kstrputmsg( } TRACE_1(TR_FAC_STREAMS_FR, TR_KSTRPUTMSG_IN, - "kstrputmsg in:stp %p", stp); + "kstrputmsg in:stp %p", stp); /* get these values from those cached in the stream head */ rmin = stp->sd_qn_minpsz; @@ -7904,7 +7898,7 @@ kstrputmsg( continue; } TRACE_2(TR_FAC_STREAMS_FR, TR_KSTRPUTMSG_WAIT, - "kstrputmsg wait:stp %p waits pri %d", stp, pri); + "kstrputmsg wait:stp %p waits pri %d", stp, pri); waitflag = WRITEWAIT; if (flag & (MSG_HOLDSIG|MSG_IGNERROR)) { @@ -7917,13 +7911,13 @@ kstrputmsg( (ssize_t)0, fmode, -1, &done)) != 0) || done) { mutex_exit(&stp->sd_lock); TRACE_3(TR_FAC_STREAMS_FR, TR_KSTRPUTMSG_OUT, - "kstrputmsg out:stp %p out %d error %d", - stp, 0, error); + "kstrputmsg out:stp %p out %d error %d", + stp, 0, error); freemsg(mctl); return (error); } TRACE_1(TR_FAC_STREAMS_FR, TR_KSTRPUTMSG_WAKE, - "kstrputmsg wake:stp %p wakes", stp); + "kstrputmsg wake:stp %p wakes", stp); if ((error = i_straccess(stp, JCWRITE)) != 0) { mutex_exit(&stp->sd_lock); freemsg(mctl); @@ -7941,7 +7935,7 @@ out: if (error == ENOMEM) error = EAGAIN; TRACE_3(TR_FAC_STREAMS_FR, TR_KSTRPUTMSG_OUT, - "kstrputmsg out:stp %p out %d error %d", stp, 2, error); + "kstrputmsg out:stp %p out %d error %d", stp, 2, error); return (error); } diff --git a/usr/src/uts/common/os/strsubr.c b/usr/src/uts/common/os/strsubr.c index 335190d895..4f5b5f596a 100644 --- a/usr/src/uts/common/os/strsubr.c +++ b/usr/src/uts/common/os/strsubr.c @@ -862,21 +862,21 @@ strinit(void) int ncpus = ((boot_max_ncpus == -1) ? max_ncpus : boot_max_ncpus); stream_head_cache = kmem_cache_create("stream_head_cache", - sizeof (stdata_t), 0, - stream_head_constructor, stream_head_destructor, NULL, - NULL, NULL, 0); + sizeof (stdata_t), 0, + stream_head_constructor, stream_head_destructor, NULL, + NULL, NULL, 0); queue_cache = kmem_cache_create("queue_cache", sizeof (queinfo_t), 0, - queue_constructor, queue_destructor, NULL, NULL, NULL, 0); + queue_constructor, queue_destructor, NULL, NULL, NULL, 0); syncq_cache = kmem_cache_create("syncq_cache", sizeof (syncq_t), 0, - syncq_constructor, syncq_destructor, NULL, NULL, NULL, 0); + syncq_constructor, syncq_destructor, NULL, NULL, NULL, 0); qband_cache = kmem_cache_create("qband_cache", - sizeof (qband_t), 0, NULL, NULL, NULL, NULL, NULL, 0); + sizeof (qband_t), 0, NULL, NULL, NULL, NULL, NULL, 0); linkinfo_cache = kmem_cache_create("linkinfo_cache", - sizeof (linkinfo_t), 0, NULL, NULL, NULL, NULL, NULL, 0); + sizeof (linkinfo_t), 0, NULL, NULL, NULL, NULL, NULL, 0); n_ciputctrl = ncpus; n_ciputctrl = 1 << highbit(n_ciputctrl - 1); @@ -884,9 +884,9 @@ strinit(void) n_ciputctrl = MIN(n_ciputctrl, max_n_ciputctrl); if (n_ciputctrl >= min_n_ciputctrl) { ciputctrl_cache = kmem_cache_create("ciputctrl_cache", - sizeof (ciputctrl_t) * n_ciputctrl, - sizeof (ciputctrl_t), ciputctrl_constructor, - ciputctrl_destructor, NULL, NULL, NULL, 0); + sizeof (ciputctrl_t) * n_ciputctrl, + sizeof (ciputctrl_t), ciputctrl_constructor, + ciputctrl_destructor, NULL, NULL, NULL, 0); } streams_taskq = system_taskq; @@ -966,7 +966,7 @@ dosendsig(proc_t *proc, int events, int sevent, k_siginfo_t *info, info->si_code = POLL_ERR; info->si_errno = error; TRACE_2(TR_FAC_STREAMS_FR, TR_STRSENDSIG, - "strsendsig:proc %p info %p", proc, info); + "strsendsig:proc %p info %p", proc, info); sigaddq(proc, NULL, info, KM_NOSLEEP); info->si_errno = 0; } @@ -974,14 +974,14 @@ dosendsig(proc_t *proc, int events, int sevent, k_siginfo_t *info, sevent &= ~S_HANGUP; info->si_code = POLL_HUP; TRACE_2(TR_FAC_STREAMS_FR, TR_STRSENDSIG, - "strsendsig:proc %p info %p", proc, info); + "strsendsig:proc %p info %p", proc, info); sigaddq(proc, NULL, info, KM_NOSLEEP); } if (sevent & S_HIPRI) { sevent &= ~S_HIPRI; info->si_code = POLL_PRI; TRACE_2(TR_FAC_STREAMS_FR, TR_STRSENDSIG, - "strsendsig:proc %p info %p", proc, info); + "strsendsig:proc %p info %p", proc, info); sigaddq(proc, NULL, info, KM_NOSLEEP); } if (sevent & S_RDBAND) { @@ -1000,7 +1000,7 @@ dosendsig(proc_t *proc, int events, int sevent, k_siginfo_t *info, info->si_code = POLL_IN; info->si_band = band; TRACE_2(TR_FAC_STREAMS_FR, TR_STRSENDSIG, - "strsendsig:proc %p info %p", proc, info); + "strsendsig:proc %p info %p", proc, info); sigaddq(proc, NULL, info, KM_NOSLEEP); info->si_band = 0; } @@ -1009,7 +1009,7 @@ dosendsig(proc_t *proc, int events, int sevent, k_siginfo_t *info, info->si_code = POLL_OUT; info->si_band = band; TRACE_2(TR_FAC_STREAMS_FR, TR_STRSENDSIG, - "strsendsig:proc %p info %p", proc, info); + "strsendsig:proc %p info %p", proc, info); sigaddq(proc, NULL, info, KM_NOSLEEP); info->si_band = 0; } @@ -1018,7 +1018,7 @@ dosendsig(proc_t *proc, int events, int sevent, k_siginfo_t *info, info->si_code = POLL_MSG; info->si_band = band; TRACE_2(TR_FAC_STREAMS_FR, TR_STRSENDSIG, - "strsendsig:proc %p info %p", proc, info); + "strsendsig:proc %p info %p", proc, info); sigaddq(proc, NULL, info, KM_NOSLEEP); info->si_band = 0; } @@ -1088,7 +1088,7 @@ strsendsig(strsig_t *siglist, int event, uchar_t band, int error) mutex_enter(&proc->p_lock); mutex_exit(&pidlock); dosendsig(proc, ssp->ss_events, sevent, &info, - band, error); + band, error); mutex_exit(&proc->p_lock); } else { /* @@ -1102,7 +1102,7 @@ strsendsig(strsig_t *siglist, int event, uchar_t band, int error) while (proc != NULL) { mutex_enter(&proc->p_lock); dosendsig(proc, ssp->ss_events, sevent, - &info, band, error); + &info, band, error); mutex_exit(&proc->p_lock); proc = proc->p_pglink; } @@ -1307,8 +1307,8 @@ qdetach(queue_t *qp, int clmode, int flag, cred_t *crp, boolean_t is_remove) ASSERT(flush_syncq(qp->q_syncq, qp) == 0); ASSERT(flush_syncq(wqp->q_syncq, wqp) == 0); ASSERT((qp->q_flag & QPERMOD) || - ((qp->q_syncq->sq_head == NULL) && - (wqp->q_syncq->sq_head == NULL))); + ((qp->q_syncq->sq_head == NULL) && + (wqp->q_syncq->sq_head == NULL))); /* release any fmodsw_impl_t structure held on behalf of the queue */ ASSERT(qp->q_fp != NULL || qp->q_flag & QISDRV); @@ -1452,7 +1452,7 @@ putiocd(mblk_t *bp, char *arg, int flag, cred_t *cr) int error = 0; ASSERT((flag & (U_TO_K | K_TO_K)) == U_TO_K || - (flag & (U_TO_K | K_TO_K)) == K_TO_K); + (flag & (U_TO_K | K_TO_K)) == K_TO_K); if (bp->b_datap->db_type == M_IOCTL) { count = ((struct iocblk *)bp->b_rptr)->ioc_count; @@ -1755,7 +1755,7 @@ mlink_file(vnode_t *vp, int cmd, struct file *fpdown, cred_t *crp, int *rvalp, stp = vp->v_stream; TRACE_1(TR_FAC_STREAMS_FR, - TR_I_LINK, "I_LINK/I_PLINK:stp %p", stp); + TR_I_LINK, "I_LINK/I_PLINK:stp %p", stp); /* * Test for invalid upper stream */ @@ -1809,7 +1809,7 @@ mlink_file(vnode_t *vp, int cmd, struct file *fpdown, cred_t *crp, int *rvalp, return (EINVAL); } TRACE_1(TR_FAC_STREAMS_FR, - TR_STPDOWN, "stpdown:%p", stpdown); + TR_STPDOWN, "stpdown:%p", stpdown); rq = getendq(stp->sd_wrq); if (cmd == I_PLINK) rq = NULL; @@ -2177,8 +2177,8 @@ munlink(stdata_t *stp, linkinfo_t *linkp, int flag, cred_t *crp, int *rvalp, wait_syncq(sq); ASSERT((rq->q_flag & QPERMOD) || - ((rq->q_syncq->sq_head == NULL) && - (_WR(rq)->q_syncq->sq_head == NULL))); + ((rq->q_syncq->sq_head == NULL) && + (_WR(rq)->q_syncq->sq_head == NULL))); } /* @@ -2541,9 +2541,9 @@ setq(queue_t *rq, struct qinit *rinit, struct qinit *winit, wq->q_syncq = NULL; } ASSERT(rq->q_syncq == NULL || (rq->q_syncq->sq_head == NULL && - rq->q_syncq->sq_tail == NULL)); + rq->q_syncq->sq_tail == NULL)); ASSERT(wq->q_syncq == NULL || (wq->q_syncq->sq_head == NULL && - wq->q_syncq->sq_tail == NULL)); + wq->q_syncq->sq_tail == NULL)); if (!(rq->q_flag & QPERMOD) && rq->q_syncq != NULL && rq->q_syncq->sq_ciputctrl != NULL) { @@ -2636,9 +2636,9 @@ setq(queue_t *rq, struct qinit *rinit, struct qinit *winit, outer_insert(outer, wq->q_syncq); } ASSERT((rq->q_syncq->sq_flags & SQ_TYPES_IN_FLAGS) == - (rq->q_syncq->sq_type & SQ_TYPES_IN_FLAGS)); + (rq->q_syncq->sq_type & SQ_TYPES_IN_FLAGS)); ASSERT((wq->q_syncq->sq_flags & SQ_TYPES_IN_FLAGS) == - (wq->q_syncq->sq_type & SQ_TYPES_IN_FLAGS)); + (wq->q_syncq->sq_type & SQ_TYPES_IN_FLAGS)); ASSERT((rq->q_flag & QMT_TYPEMASK) == (qflag & QMT_TYPEMASK)); /* @@ -3089,19 +3089,19 @@ strwaitq(stdata_t *stp, int flag, ssize_t count, int fmode, clock_t timout, stp->sd_flag |= slpflg; TRACE_5(TR_FAC_STREAMS_FR, TR_STRWAITQ_WAIT2, - "strwaitq sleeps (2):%p, %X, %lX, %X, %p", - stp, flag, count, fmode, done); + "strwaitq sleeps (2):%p, %X, %lX, %X, %p", + stp, flag, count, fmode, done); rval = str_cv_wait(sleepon, &stp->sd_lock, timout, flag & STR_NOSIG); if (rval > 0) { /* EMPTY */ TRACE_5(TR_FAC_STREAMS_FR, TR_STRWAITQ_WAKE2, - "strwaitq awakes(2):%X, %X, %X, %X, %X", - stp, flag, count, fmode, done); + "strwaitq awakes(2):%X, %X, %X, %X, %X", + stp, flag, count, fmode, done); } else if (rval == 0) { TRACE_5(TR_FAC_STREAMS_FR, TR_STRWAITQ_INTR2, - "strwaitq interrupt #2:%p, %X, %lX, %X, %p", - stp, flag, count, fmode, done); + "strwaitq interrupt #2:%p, %X, %lX, %X, %p", + stp, flag, count, fmode, done); stp->sd_flag &= ~slpflg; cv_broadcast(sleepon); if (!(flag & NOINTR)) @@ -3113,8 +3113,8 @@ strwaitq(stdata_t *stp, int flag, ssize_t count, int fmode, clock_t timout, } else { /* timeout */ TRACE_5(TR_FAC_STREAMS_FR, TR_STRWAITQ_TIME, - "strwaitq timeout:%p, %X, %lX, %X, %p", - stp, flag, count, fmode, done); + "strwaitq timeout:%p, %X, %lX, %X, %p", + stp, flag, count, fmode, done); *done = 1; if (!(flag & NOINTR)) return (ETIME); @@ -3291,9 +3291,7 @@ shalloc(queue_t *qp) stp->sd_struiordq = NULL; stp->sd_struiodnak = 0; stp->sd_struionak = NULL; -#ifdef C2_AUDIT stp->sd_t_audit_data = NULL; -#endif stp->sd_rput_opt = 0; stp->sd_wput_opt = 0; stp->sd_read_opt = 0; @@ -3639,13 +3637,13 @@ runservice(queue_t *q) again: entersq(q->q_syncq, SQ_SVC); TRACE_1(TR_FAC_STREAMS_FR, TR_QRUNSERVICE_START, - "runservice starts:%p", q); + "runservice starts:%p", q); if (!(q->q_flag & QWCLOSE)) (*q->q_qinfo->qi_srvp)(q); TRACE_1(TR_FAC_STREAMS_FR, TR_QRUNSERVICE_END, - "runservice ends:(%p)", q); + "runservice ends:(%p)", q); leavesq(q->q_syncq, SQ_SVC); @@ -4155,7 +4153,7 @@ void strsignal(stdata_t *stp, int sig, int32_t band) { TRACE_3(TR_FAC_STREAMS_FR, TR_SENDSIG, - "strsignal:%p, %X, %X", stp, sig, band); + "strsignal:%p, %X, %X", stp, sig, band); mutex_enter(&stp->sd_lock); switch (sig) { @@ -4274,7 +4272,7 @@ strgeterr(stdata_t *stp, int32_t flags_to_check, int ispeek) int clearerr = 0; error = (*stp->sd_rderrfunc)(stp->sd_vnode, ispeek, - &clearerr); + &clearerr); if (clearerr) { stp->sd_flag &= ~STRDERR; stp->sd_rderrfunc = NULL; @@ -4294,7 +4292,7 @@ strgeterr(stdata_t *stp, int32_t flags_to_check, int ispeek) int clearerr = 0; error = (*stp->sd_wrerrfunc)(stp->sd_vnode, ispeek, - &clearerr); + &clearerr); if (clearerr) { stp->sd_flag &= ~STWRERR; stp->sd_wrerrfunc = NULL; @@ -4342,7 +4340,7 @@ strstartplumb(stdata_t *stp, int flag, int cmd) } while (stp->sd_flag & (STWOPEN|STRCLOSE|STRPLUMB)) { if ((cmd == I_POP) && - (flag & (FNDELAY|FNONBLOCK))) { + (flag & (FNDELAY|FNONBLOCK))) { STRUNLOCKMATES(stp); return (EAGAIN); } @@ -4358,7 +4356,7 @@ strstartplumb(stdata_t *stp, int flag, int cmd) } if (stp->sd_flag & (STRDERR|STWRERR|STRHUP|STPLEX)) { error = strgeterr(stp, - STRDERR|STWRERR|STRHUP|STPLEX, 0); + STRDERR|STWRERR|STRHUP|STPLEX, 0); if (error != 0) { STRUNLOCKMATES(stp); return (error); @@ -4381,7 +4379,7 @@ strstartplumb(stdata_t *stp, int flag, int cmd) } if (stp->sd_flag & (STRDERR|STWRERR|STRHUP|STPLEX)) { error = strgeterr(stp, - STRDERR|STWRERR|STRHUP|STPLEX, 0); + STRDERR|STWRERR|STRHUP|STPLEX, 0); if (error != 0) { mutex_exit(&stp->sd_lock); return (error); @@ -4740,7 +4738,7 @@ insertq(struct stdata *stp, queue_t *new) } TRACE_2(TR_FAC_STREAMS_FR, TR_INSERTQ, - "insertq:%p, %p", after, new); + "insertq:%p, %p", after, new); ASSERT(after->q_flag & QREADR); ASSERT(new->q_flag & QREADR); @@ -4842,7 +4840,7 @@ removeq(queue_t *qp) ASSERT(stp); TRACE_2(TR_FAC_STREAMS_FR, TR_REMOVEQ, - "removeq:%p %p", qp, wqp); + "removeq:%p %p", qp, wqp); ASSERT(qp->q_flag&QREADR); /* @@ -5212,7 +5210,7 @@ sqlist_alloc(struct stdata *stp, int kmflag) * 2 for the stream head, and 2 for the driver/other stream head. */ sqlist_size = 2 * sizeof (syncql_t) * stp->sd_pushcnt + - sizeof (sqlist_t); + sizeof (sqlist_t); if (STRMATED(stp)) sqlist_size += 2 * sizeof (syncql_t) * stp->sd_mate->sd_pushcnt; sqlist = kmem_alloc(sqlist_size, kmflag); @@ -6159,9 +6157,9 @@ sq_run_events(syncq_t *sq) ASSERT(MUTEX_HELD(SQLOCK(sq))); ASSERT((sq->sq_outer == NULL && sq->sq_onext == NULL && - sq->sq_oprev == NULL) || - (sq->sq_outer != NULL && sq->sq_onext != NULL && - sq->sq_oprev != NULL)); + sq->sq_oprev == NULL) || + (sq->sq_outer != NULL && sq->sq_onext != NULL && + sq->sq_oprev != NULL)); ASSERT(flags & SQ_EXCL); ASSERT(sq->sq_count == 1); @@ -6357,12 +6355,12 @@ drain_syncq(syncq_t *sq) boolean_t bg_service = sq->sq_svcflags & SQ_SERVICE; TRACE_1(TR_FAC_STREAMS_FR, TR_DRAIN_SYNCQ_START, - "drain_syncq start:%p", sq); + "drain_syncq start:%p", sq); ASSERT(MUTEX_HELD(SQLOCK(sq))); ASSERT((sq->sq_outer == NULL && sq->sq_onext == NULL && - sq->sq_oprev == NULL) || - (sq->sq_outer != NULL && sq->sq_onext != NULL && - sq->sq_oprev != NULL)); + sq->sq_oprev == NULL) || + (sq->sq_outer != NULL && sq->sq_onext != NULL && + sq->sq_oprev != NULL)); /* * Drop SQ_SERVICE flag. @@ -6509,7 +6507,7 @@ drain_syncq(syncq_t *sq) for (qp = sq->sq_head; qp != NULL && (qp->q_draining || - (qp->q_sqflags & Q_SQDRAINING)); + (qp->q_sqflags & Q_SQDRAINING)); qp = qp->q_sqnext) ; @@ -6558,7 +6556,7 @@ drain_syncq(syncq_t *sq) */ ASSERT((sq->sq_head == NULL) || (flags & SQ_GOAWAY) || - (type & SQ_CI) || sq->sq_head->q_draining); + (type & SQ_CI) || sq->sq_head->q_draining); /* Drop SQ_EXCL for non-CIPUT perimiters */ if (!(type & SQ_CIPUT)) @@ -6588,7 +6586,7 @@ drain_syncq(syncq_t *sq) mutex_exit(SQLOCK(sq)); TRACE_1(TR_FAC_STREAMS_FR, TR_DRAIN_SYNCQ_END, - "drain_syncq end:%p", sq); + "drain_syncq end:%p", sq); } @@ -6633,7 +6631,7 @@ qdrain_syncq(syncq_t *sq, queue_t *q) #endif TRACE_1(TR_FAC_STREAMS_FR, TR_DRAIN_SYNCQ_START, - "drain_syncq start:%p", sq); + "drain_syncq start:%p", sq); ASSERT(q->q_syncq == sq); ASSERT(MUTEX_HELD(QLOCK(q))); ASSERT(MUTEX_NOT_HELD(SQLOCK(sq))); @@ -6649,9 +6647,9 @@ qdrain_syncq(syncq_t *sq, queue_t *q) * All outer pointers are set, or none of them are */ ASSERT((sq->sq_outer == NULL && sq->sq_onext == NULL && - sq->sq_oprev == NULL) || - (sq->sq_outer != NULL && sq->sq_onext != NULL && - sq->sq_oprev != NULL)); + sq->sq_oprev == NULL) || + (sq->sq_outer != NULL && sq->sq_onext != NULL && + sq->sq_oprev != NULL)); #ifdef DEBUG count = sq->sq_count; /* @@ -6823,7 +6821,7 @@ qdrain_syncq(syncq_t *sq, queue_t *q) mutex_exit(QLOCK(q)); TRACE_1(TR_FAC_STREAMS_FR, TR_DRAIN_SYNCQ_END, - "drain_syncq end:%p", sq); + "drain_syncq end:%p", sq); } /* END OF QDRAIN_SYNCQ */ @@ -6852,9 +6850,9 @@ qfill_syncq(syncq_t *sq, queue_t *q, mblk_t *mp) ASSERT(sq->sq_count > 0); ASSERT(q->q_syncq == sq); ASSERT((sq->sq_outer == NULL && sq->sq_onext == NULL && - sq->sq_oprev == NULL) || - (sq->sq_outer != NULL && sq->sq_onext != NULL && - sq->sq_oprev != NULL)); + sq->sq_oprev == NULL) || + (sq->sq_outer != NULL && sq->sq_onext != NULL && + sq->sq_oprev != NULL)); mutex_enter(QLOCK(q)); @@ -7527,7 +7525,7 @@ putnext_tail(syncq_t *sq, queue_t *qp, uint32_t passflags) /* Drop the SQLOCK on exit */ mutex_exit(SQLOCK(sq)); TRACE_3(TR_FAC_STREAMS_FR, TR_PUTNEXT_END, - "putnext_end:(%p, %p, %p) done", NULL, qp, sq); + "putnext_end:(%p, %p, %p) done", NULL, qp, sq); } void @@ -8649,7 +8647,7 @@ str_stack_init(netstackid_t stackid, netstack_t *ns) */ ss->ss_devcnt = devcnt; /* In case it should change before free */ ss->ss_mux_nodes = kmem_zalloc((sizeof (struct mux_node) * - ss->ss_devcnt), KM_SLEEP); + ss->ss_devcnt), KM_SLEEP); for (i = 0; i < ss->ss_devcnt; i++) ss->ss_mux_nodes[i].mn_imaj = i; return (ss); diff --git a/usr/src/uts/common/os/zone.c b/usr/src/uts/common/os/zone.c index ff2812b781..033bc96ea3 100644 --- a/usr/src/uts/common/os/zone.c +++ b/usr/src/uts/common/os/zone.c @@ -2626,10 +2626,8 @@ zone_chdir(vnode_t *vp, vnode_t **vpp, proc_t *pp) /* we're going to hold a reference here to the directory */ VN_HOLD(vp); -#ifdef C2_AUDIT if (audit_active) /* update abs cwd/root path see c2audit.c */ audit_chdirec(vp, vpp); -#endif mutex_enter(&pp->p_lock); oldvp = *vpp; diff --git a/usr/src/uts/common/sys/fcntl.h b/usr/src/uts/common/sys/fcntl.h index cb55161060..3c18770414 100644 --- a/usr/src/uts/common/sys/fcntl.h +++ b/usr/src/uts/common/sys/fcntl.h @@ -132,10 +132,7 @@ extern "C" { */ #define F_GETOWN 23 /* Get owner (socket emulation) */ #define F_SETOWN 24 /* Set owner (socket emulation) */ - -#ifdef C2_AUDIT -#define F_REVOKE 25 /* C2 Security. Revoke access to file desc. */ -#endif +#define F_REVOKE 25 /* Object reuse revoke access to file desc. */ #define F_HASREMOTELOCKS 26 /* Does vp have NFS locks; private to lock */ /* manager */ diff --git a/usr/src/uts/common/sys/file.h b/usr/src/uts/common/sys/file.h index 01af00ddb2..494840aff8 100644 --- a/usr/src/uts/common/sys/file.h +++ b/usr/src/uts/common/sys/file.h @@ -85,9 +85,7 @@ typedef struct fpollinfo { #define FNDELAY 0x04 #define FAPPEND 0x08 #define FSYNC 0x10 /* file (data+inode) integrity while writing */ -#ifdef C2_AUDIT -#define FREVOKED 0x20 /* C2 Security - Revoke Subsystem */ -#endif +#define FREVOKED 0x20 /* Object reuse Revoked file */ #define FDSYNC 0x40 /* file data only integrity while writing */ #define FNONBLOCK 0x80 diff --git a/usr/src/uts/common/sys/proc.h b/usr/src/uts/common/sys/proc.h index e99995fecf..5a9b1caf50 100644 --- a/usr/src/uts/common/sys/proc.h +++ b/usr/src/uts/common/sys/proc.h @@ -279,7 +279,7 @@ typedef struct proc { uchar_t p_tnf_flags; /* - * C2 Security (C2_AUDIT) + * Solaris Audit */ struct p_audit_data *p_audit_data; /* per process audit structure */ diff --git a/usr/src/uts/common/sys/sad.h b/usr/src/uts/common/sys/sad.h index d7f10f40cc..fd9f2bffed 100644 --- a/usr/src/uts/common/sys/sad.h +++ b/usr/src/uts/common/sys/sad.h @@ -208,7 +208,6 @@ struct autopush { /* * function prototypes */ -#ifdef C2_AUDIT void audit_stropen(struct vnode *, dev_t *, int, cred_t *); void audit_strclose(struct vnode *, int, cred_t *); void audit_strioctl(struct vnode *, int, intptr_t, int, int, cred_t *, int *); @@ -217,7 +216,6 @@ void audit_strputmsg(struct vnode *, struct strbuf *, struct strbuf *, unsigned char, int, int); void audit_fdsend(int, struct file *, int); void audit_fdrecv(int, struct file *); -#endif extern void sad_initspace(str_stack_t *); extern void sad_freespace(str_stack_t *); diff --git a/usr/src/uts/common/sys/systm.h b/usr/src/uts/common/sys/systm.h index df834a88ec..bf2719a7e0 100644 --- a/usr/src/uts/common/sys/systm.h +++ b/usr/src/uts/common/sys/systm.h @@ -101,9 +101,7 @@ extern int klustsize; extern int abort_enable; /* Platform input-device abort policy */ -#ifdef C2_AUDIT -extern int audit_active; /* C2 auditing activate 1, absent 0. */ -#endif +extern int audit_active; /* Solaris Auditing active 1, absent 0. */ extern int avenrun[]; /* array of load averages */ diff --git a/usr/src/uts/common/syscall/access.c b/usr/src/uts/common/syscall/access.c index 467cb4ecb1..072cfb606d 100644 --- a/usr/src/uts/common/syscall/access.c +++ b/usr/src/uts/common/syscall/access.c @@ -78,7 +78,7 @@ caccess(char *fname, int fmode, vnode_t *startvp) /* OK to use effective uid/gid, i.e., no need to crdup(CRED())? */ eok = (fmode & E_OK) || - (cr->cr_uid == cr->cr_ruid && cr->cr_gid == cr->cr_rgid); + (cr->cr_uid == cr->cr_ruid && cr->cr_gid == cr->cr_rgid); if (eok) tmpcr = cr; @@ -156,10 +156,8 @@ accessat(int fd, char *fname, int fmode) } } -#ifdef C2_AUDIT if (audit_active) audit_setfsat_path(1); -#endif /* C2_AUDIT */ error = caccess(fname, fmode, dirvp); if (dirvp != NULL) diff --git a/usr/src/uts/common/syscall/acl.c b/usr/src/uts/common/syscall/acl.c index 5c2fe3a9bc..4895e7ade9 100644 --- a/usr/src/uts/common/syscall/acl.c +++ b/usr/src/uts/common/syscall/acl.c @@ -104,12 +104,10 @@ facl(int fdes, int cmd, int nentries, void *aclbufp) if ((fp = getf(fdes)) == NULL) return (set_errno(EBADF)); -#ifdef C2_AUDIT if (fp->f_flag & FREVOKED) { releasef(fdes); return (set_errno(EBADF)); } -#endif /* C2_AUDIT */ error = cacl(cmd, nentries, aclbufp, fp->f_vnode, &rv); releasef(fdes); @@ -189,10 +187,10 @@ cacl(int cmd, int nentries, void *aclbufp, vnode_t *vp, int *rv) /* Sort the acl & default acl lists */ if (vsecattr.vsa_aclcnt > 1) ksort((caddr_t)vsecattr.vsa_aclentp, - vsecattr.vsa_aclcnt, sizeof (aclent_t), cmp2acls); + vsecattr.vsa_aclcnt, sizeof (aclent_t), cmp2acls); if (vsecattr.vsa_dfaclcnt > 1) ksort((caddr_t)vsecattr.vsa_dfaclentp, - vsecattr.vsa_dfaclcnt, sizeof (aclent_t), cmp2acls); + vsecattr.vsa_dfaclcnt, sizeof (aclent_t), cmp2acls); /* Copy out acl's */ uaddrp = (caddr_t)aclbufp; if (aclbsize > 0) { /* bug #1262490 */ diff --git a/usr/src/uts/common/syscall/chdir.c b/usr/src/uts/common/syscall/chdir.c index 02bc93da74..66459ef689 100644 --- a/usr/src/uts/common/syscall/chdir.c +++ b/usr/src/uts/common/syscall/chdir.c @@ -216,10 +216,8 @@ chdirec(vnode_t *vp, int ischroot, int do_traverse) vpp = &PTOU(pp)->u_cdir; } -#ifdef C2_AUDIT if (audit_active) /* update abs cwd/root path see c2audit.c */ audit_chdirec(vp, vpp); -#endif mutex_enter(&pp->p_lock); /* diff --git a/usr/src/uts/common/syscall/chown.c b/usr/src/uts/common/syscall/chown.c index d32e16b5c5..f21a2a1e1f 100644 --- a/usr/src/uts/common/syscall/chown.c +++ b/usr/src/uts/common/syscall/chown.c @@ -111,10 +111,8 @@ cfchownat(int fd, char *name, int nmflag, uid_t uid, gid_t gid, int flags) } } -#if C2_AUDIT if ((nmflag == 2) && audit_active) audit_setfsat_path(1); -#endif /* C2_AUDIT */ /* * Do lookups for chown, lchown and fchownat when name not NULL diff --git a/usr/src/uts/common/syscall/open.c b/usr/src/uts/common/syscall/open.c index b45f7bf35b..aee9362326 100644 --- a/usr/src/uts/common/syscall/open.c +++ b/usr/src/uts/common/syscall/open.c @@ -102,10 +102,8 @@ copen(int startfd, char *fname, int filemode, int createmode) * Handle openattrdirat request */ if (filemode & FXATTRDIROPEN) { -#ifdef C2_AUDIT if (audit_active) audit_setfsat_path(1); -#endif /* C2_AUDIT */ if (error = lookupnameat(fname, seg, FOLLOW, NULLVPP, &vp, startvp)) @@ -187,10 +185,8 @@ copen(int startfd, char *fname, int filemode, int createmode) filemode &= ~FNDELAY; error = falloc((vnode_t *)NULL, filemode, &fp, &fd); if (error == 0) { -#ifdef C2_AUDIT if (audit_active) audit_setfsat_path(1); -#endif /* C2_AUDIT */ /* * Last arg is a don't-care term if * !(filemode & FCREAT). @@ -204,10 +200,8 @@ copen(int startfd, char *fname, int filemode, int createmode) if (startvp != NULL) VN_RELE(startvp); if (error == 0) { -#ifdef C2_AUDIT if (audit_active) audit_copen(fd, fp, vp); -#endif /* C2_AUDIT */ if ((vp->v_flag & VDUP) == 0) { fp->f_vnode = vp; mutex_exit(&fp->f_tlock); diff --git a/usr/src/uts/common/syscall/ppriv.c b/usr/src/uts/common/syscall/ppriv.c index e4e04b32a4..11804ffbdd 100644 --- a/usr/src/uts/common/syscall/ppriv.c +++ b/usr/src/uts/common/syscall/ppriv.c @@ -72,10 +72,8 @@ setppriv(priv_op_t op, priv_ptype_t type, priv_set_t *in_pset) pcr = p->p_cred; -#ifdef C2_AUDIT if (audit_active) audit_setppriv(op, type, &pset, pcr); -#endif /* * Filter out unallowed request (bad op and bad type) @@ -89,7 +87,7 @@ setppriv(priv_op_t op, priv_ptype_t type, priv_set_t *in_pset) * of P. Only immediately after exec holds that P <= L. */ if (((type == PRIV_LIMIT && - !priv_issubset(&pset, &CR_LPRIV(pcr))) || + !priv_issubset(&pset, &CR_LPRIV(pcr))) || !priv_issubset(&pset, &CR_OPPRIV(pcr))) && !priv_issubset(&pset, priv_getset(pcr, type))) { mutex_exit(&p->p_crlock); diff --git a/usr/src/uts/common/syscall/sem.c b/usr/src/uts/common/syscall/sem.c index d1bde2ff2d..6c469e2a26 100644 --- a/usr/src/uts/common/syscall/sem.c +++ b/usr/src/uts/common/syscall/sem.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -728,10 +728,8 @@ top: } lock = ipc_commit_end(sem_svc, &sp->sem_perm); } -#ifdef C2_AUDIT if (audit_active) audit_ipcget(AT_IPC_SEM, (void *)sp); -#endif id = sp->sem_perm.ipc_id; mutex_exit(lock); return (id); @@ -1090,7 +1088,7 @@ check: } semp->semncnt++; cvres = cv_waituntil_sig(&semp->semncnt_cv, lock, - tsp, timecheck); + tsp, timecheck); lock = ipc_relock(sem_svc, sp->sem_perm.ipc_id, lock); if (!IPC_FREE(&sp->sem_perm)) { @@ -1127,7 +1125,7 @@ check: } semp->semzcnt++; cvres = cv_waituntil_sig(&semp->semzcnt_cv, lock, - tsp, timecheck); + tsp, timecheck); lock = ipc_relock(sem_svc, sp->sem_perm.ipc_id, lock); /* diff --git a/usr/src/uts/common/syscall/stat.c b/usr/src/uts/common/syscall/stat.c index c559747e2f..8bd03c2454 100644 --- a/usr/src/uts/common/syscall/stat.c +++ b/usr/src/uts/common/syscall/stat.c @@ -120,10 +120,8 @@ cstatat_getvp(int fd, char *name, int nmflag, } *cred = cr; -#ifdef C2_AUDIT if (audit_active) audit_setfsat_path(1); -#endif /* C2_AUDIT */ if (nmflag == 1 || (nmflag == 2 && name != NULL)) { diff --git a/usr/src/uts/common/syscall/symlink.c b/usr/src/uts/common/syscall/symlink.c index 1db42e474e..700029cf73 100644 --- a/usr/src/uts/common/syscall/symlink.c +++ b/usr/src/uts/common/syscall/symlink.c @@ -83,12 +83,10 @@ top: vattr.va_mode = 0777; vattr.va_mask = AT_TYPE|AT_MODE; error = VOP_SYMLINK(dvp, lpn.pn_path, &vattr, - tbuf, CRED(), NULL, 0); -#ifdef C2_AUDIT + tbuf, CRED(), NULL, 0); if (audit_active) audit_symlink_create(dvp, lpn.pn_path, - tbuf, error); -#endif /* C2_AUDIT */ + tbuf, error); } kmem_free(tbuf, MAXPATHLEN); } diff --git a/usr/src/uts/common/syscall/unlink.c b/usr/src/uts/common/syscall/unlink.c index d4b84c0272..cd97f970ca 100644 --- a/usr/src/uts/common/syscall/unlink.c +++ b/usr/src/uts/common/syscall/unlink.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2001 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -95,13 +94,11 @@ unlinkat(int fd, char *name, int flags) } } -#ifdef C2_AUDIT if (audit_active) audit_setfsat_path(1); -#endif /* C2_AUDIT */ error = vn_removeat(dirvp, name, - UIO_USERSPACE, (flags == AT_REMOVEDIR) ? RMDIRECTORY : RMFILE); + UIO_USERSPACE, (flags == AT_REMOVEDIR) ? RMDIRECTORY : RMFILE); if (dirvp != NULL) VN_RELE(dirvp); diff --git a/usr/src/uts/common/syscall/utime.c b/usr/src/uts/common/syscall/utime.c index b37681fe4c..2331407c7c 100644 --- a/usr/src/uts/common/syscall/utime.c +++ b/usr/src/uts/common/syscall/utime.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -90,10 +89,8 @@ cfutimesat(int fd, char *fname, int nmflag, vattr_t *vap, int flags) } } -#ifdef C2_AUDIT if (audit_active) audit_setfsat_path(1); -#endif /* C2_AUDIT */ if ((nmflag == 1) || ((nmflag == 2) && (fname != NULL))) { if (error = lookupnameat(fname, UIO_USERSPACE, FOLLOW, diff --git a/usr/src/uts/i86pc/Makefile.i86pc.shared b/usr/src/uts/i86pc/Makefile.i86pc.shared index 59b73f2aca..5c41559753 100644 --- a/usr/src/uts/i86pc/Makefile.i86pc.shared +++ b/usr/src/uts/i86pc/Makefile.i86pc.shared @@ -194,12 +194,6 @@ $(IF_DEBUG_OBJ)mp_call.o := DEBUG_DEFS += -DTRAPTRACE $(IF_DEBUG_OBJ)cbe.o := DEBUG_DEFS += -DTRAPTRACE # -# Build `options'. These are historical and the need for these -# was removed by the module technology. -# -OPTION_DEFS = -DC2_AUDIT - -# # Collect the preprocessor definitions to be associated with *all* # files. # diff --git a/usr/src/uts/i86pc/os/machdep.c b/usr/src/uts/i86pc/os/machdep.c index dfb3f8efd2..30861022a6 100644 --- a/usr/src/uts/i86pc/os/machdep.c +++ b/usr/src/uts/i86pc/os/machdep.c @@ -126,10 +126,8 @@ #include <sys/traptrace.h> #endif /* TRAPTRACE */ -#ifdef C2_AUDIT extern void audit_enterprom(int); extern void audit_exitprom(int); -#endif /* * The panicbuf array is used to record messages and state: @@ -305,21 +303,15 @@ void abort_sequence_enter(char *msg) { if (abort_enable == 0) { -#ifdef C2_AUDIT if (audit_active) audit_enterprom(0); -#endif /* C2_AUDIT */ return; } -#ifdef C2_AUDIT if (audit_active) audit_enterprom(1); -#endif /* C2_AUDIT */ debug_enter(msg); -#ifdef C2_AUDIT if (audit_active) audit_exitprom(1); -#endif /* C2_AUDIT */ } /* diff --git a/usr/src/uts/i86pc/os/trap.c b/usr/src/uts/i86pc/os/trap.c index d85dac1dd6..89bef7ec14 100644 --- a/usr/src/uts/i86pc/os/trap.c +++ b/usr/src/uts/i86pc/os/trap.c @@ -1906,15 +1906,11 @@ kern_gpfault(struct regs *rp) lwp_exit(); } -#ifdef C2_AUDIT if (audit_active) /* audit core dump */ audit_core_start(SIGSEGV); -#endif v = core(SIGSEGV, B_FALSE); -#ifdef C2_AUDIT if (audit_active) /* audit core dump */ audit_core_finish(v ? CLD_KILLED : CLD_DUMPED); -#endif exit(v ? CLD_KILLED : CLD_DUMPED, SIGSEGV); return (0); } diff --git a/usr/src/uts/i86xpv/Makefile.i86xpv.shared b/usr/src/uts/i86xpv/Makefile.i86xpv.shared index 1233a29df0..ca9e71821c 100644 --- a/usr/src/uts/i86xpv/Makefile.i86xpv.shared +++ b/usr/src/uts/i86xpv/Makefile.i86xpv.shared @@ -197,12 +197,6 @@ $(IF_DEBUG_OBJ)hyperevent.o := DEBUG_DEFS += -DTRAPTRACE $(IF_DEBUG_OBJ)evtchn.o := DEBUG_DEFS += -DTRAPTRACE # -# Build `options'. These are historical and the need for these -# was removed by the module technology. -# -OPTION_DEFS = -DC2_AUDIT - -# # Collect the preprocessor definitions to be associated with *all* # files. # diff --git a/usr/src/uts/intel/Makefile.intel.shared b/usr/src/uts/intel/Makefile.intel.shared index 1a8edda121..a07b6411e1 100644 --- a/usr/src/uts/intel/Makefile.intel.shared +++ b/usr/src/uts/intel/Makefile.intel.shared @@ -180,12 +180,6 @@ $(LINTS_DIR)/msacct.ln := LINTFLAGS += $(LINTMACHFLAGS) $(LINTS_DIR)/thread.ln := LINTFLAGS += $(LINTMACHFLAGS) # -# Build `options'. These are entirely historical and the need for these -# is completely removed by the module technology. -# -OPTION_DEFS = -DC2_AUDIT - -# # Collect the preprocessor definitions to be associated with *all* # files. # diff --git a/usr/src/uts/intel/ia32/os/syscall.c b/usr/src/uts/intel/ia32/os/syscall.c index e3a8787928..ea01b28e7e 100644 --- a/usr/src/uts/intel/ia32/os/syscall.c +++ b/usr/src/uts/intel/ia32/os/syscall.c @@ -107,7 +107,7 @@ realsigprof(int sysnum, int error) hrt2ts(gethrtime(), &lwp->lwp_siginfo.si_tstamp); lwp->lwp_siginfo.si_syscall = sysnum; lwp->lwp_siginfo.si_nsysarg = (sysnum > 0 && sysnum < NSYSCALL) ? - LWP_GETSYSENT(lwp)[sysnum].sy_narg : 0; + LWP_GETSYSENT(lwp)[sysnum].sy_narg : 0; lwp->lwp_siginfo.si_fault = lwp->lwp_lastfault; lwp->lwp_siginfo.si_faddr = lwp->lwp_lastfaddr; lwp->lwp_lastfault = 0; @@ -305,7 +305,7 @@ pre_syscall() } else { #endif ASSERT((caddr_t)lwp->lwp_ap > t->t_stkbase && - (caddr_t)lwp->lwp_ap < t->t_stk); + (caddr_t)lwp->lwp_ap < t->t_stk); } #endif /* DEBUG */ @@ -391,7 +391,6 @@ pre_syscall() return (1); /* don't do system call, return EINTR */ } -#ifdef C2_AUDIT if (audit_active) { /* begin auditing for this syscall */ int error; if (error = audit_start(T_SYSCALL, code, 0, lwp)) { @@ -401,7 +400,6 @@ pre_syscall() } repost = 1; } -#endif /* C2_AUDIT */ #ifndef NPROBE /* Kernel probe */ @@ -502,7 +500,6 @@ post_syscall(long rval1, long rval2) rp->r_ps &= ~PS_T; aston(curthread); } -#ifdef C2_AUDIT if (audit_active) { /* put out audit record for this syscall */ rval_t rval; @@ -512,7 +509,6 @@ post_syscall(long rval1, long rval2) audit_finish(T_SYSCALL, code, error, &rval); repost = 1; } -#endif /* C2_AUDIT */ if (curthread->t_pdmsg != NULL) { char *m = curthread->t_pdmsg; @@ -736,9 +732,9 @@ sig_check: /* Kernel probe */ if (tnf_tracing_active) { TNF_PROBE_3(syscall_end, "syscall thread", /* CSTYLED */, - tnf_long, rval1, rval1, - tnf_long, rval2, rval2, - tnf_long, errno, (long)error); + tnf_long, rval1, rval1, + tnf_long, rval2, rval2, + tnf_long, errno, (long)error); repost = 1; } #endif /* NPROBE */ @@ -824,7 +820,7 @@ sig_check: if (copyin((stack_t *)lwp->lwp_ustack, &stk, sizeof (stack_t)) == 0 && (stk.ss_size == lwp->lwp_old_stk_ctl || - stk.ss_size == 0) && + stk.ss_size == 0) && stk.ss_sp == top - stk.ss_size) { stk.ss_sp = (void *)((uintptr_t)stk.ss_sp + stk.ss_size - (uintptr_t)new_size); diff --git a/usr/src/uts/sparc/Makefile.sparc.shared b/usr/src/uts/sparc/Makefile.sparc.shared index eb622795dd..0a1a49ad92 100644 --- a/usr/src/uts/sparc/Makefile.sparc.shared +++ b/usr/src/uts/sparc/Makefile.sparc.shared @@ -202,13 +202,6 @@ $(LINTS_DIR)/msacct.ln := LINTFLAGS += $(LINTMACHFLAGS) $(LINTS_DIR)/thread.ln := LINTFLAGS += $(LINTMACHFLAGS) # -# Build `options'. These are mostly historical and the need for these -# is largely removed by the module technology. However, the static -# build will continue to require these. -# -OPTION_DEFS = -DC2_AUDIT - -# # Collect the preprocessor definitions to be associated with *all* # files. # diff --git a/usr/src/uts/sparc/os/syscall.c b/usr/src/uts/sparc/os/syscall.c index 218a0b75ac..bc5b2824f9 100644 --- a/usr/src/uts/sparc/os/syscall.c +++ b/usr/src/uts/sparc/os/syscall.c @@ -108,7 +108,7 @@ realsigprof(int sysnum, int error) hrt2ts(gethrtime(), &lwp->lwp_siginfo.si_tstamp); lwp->lwp_siginfo.si_syscall = sysnum; lwp->lwp_siginfo.si_nsysarg = (sysnum > 0 && sysnum < NSYSCALL) ? - LWP_GETSYSENT(lwp)[sysnum].sy_narg : 0; + LWP_GETSYSENT(lwp)[sysnum].sy_narg : 0; lwp->lwp_siginfo.si_fault = lwp->lwp_lastfault; lwp->lwp_siginfo.si_faddr = lwp->lwp_lastfaddr; lwp->lwp_lastfault = 0; @@ -159,7 +159,7 @@ xregrestore(klwp_t *lwp, int shared) if (is64) (void) copyout_nowatch(&lwp->lwp_pcb.pcb_xregs, - rwp, rwinsize); + rwp, rwinsize); else { struct rwindow32 rwindow32; int watched; @@ -175,7 +175,7 @@ xregrestore(klwp_t *lwp, int shared) mpcb->mpcb_rsp[0] = sp; mpcb->mpcb_rsp[1] = NULL; bcopy(&lwp->lwp_pcb.pcb_xregs, &mpcb->mpcb_rwin[0], - sizeof (lwp->lwp_pcb.pcb_xregs)); + sizeof (lwp->lwp_pcb.pcb_xregs)); } lwp->lwp_pcb.pcb_xregstat = XREGNONE; } @@ -496,7 +496,6 @@ pre_syscall(int arg0) return (1); /* don't do system call, return EINTR */ } -#ifdef C2_AUDIT if (audit_active) { /* begin auditing for this syscall */ int error; if (error = audit_start(T_SYSCALL, code, 0, lwp)) { @@ -506,7 +505,6 @@ pre_syscall(int arg0) } repost = 1; } -#endif /* C2_AUDIT */ #ifndef NPROBE /* Kernel probe */ @@ -596,7 +594,6 @@ post_syscall(long rval1, long rval2) if (code == 0) goto sig_check; -#ifdef C2_AUDIT if (audit_active) { /* put out audit record for this syscall */ rval_t rval; /* fix audit_finish() someday */ @@ -606,7 +603,6 @@ post_syscall(long rval1, long rval2) audit_finish(T_SYSCALL, code, error, &rval); repost = 1; } -#endif /* C2_AUDIT */ if (curthread->t_pdmsg != NULL) { char *m = curthread->t_pdmsg; @@ -832,9 +828,9 @@ sig_check: /* Kernel probe */ if (tnf_tracing_active) { TNF_PROBE_3(syscall_end, "syscall thread", /* CSTYLED */, - tnf_long, rval1, rval1, - tnf_long, rval2, rval2, - tnf_long, errno, (long)error); + tnf_long, rval1, rval1, + tnf_long, rval2, rval2, + tnf_long, errno, (long)error); repost = 1; } #endif /* NPROBE */ @@ -914,7 +910,7 @@ sig_check: if (copyin((stack_t *)lwp->lwp_ustack, &stk, sizeof (stack_t)) == 0 && (stk.ss_size == lwp->lwp_old_stk_ctl || - stk.ss_size == 0) && + stk.ss_size == 0) && stk.ss_sp == top - stk.ss_size) { stk.ss_sp = (void *)((uintptr_t)stk.ss_sp + stk.ss_size - new_size); diff --git a/usr/src/uts/sun4/os/cpu_states.c b/usr/src/uts/sun4/os/cpu_states.c index d7d5e659dd..34298bbb06 100644 --- a/usr/src/uts/sun4/os/cpu_states.c +++ b/usr/src/uts/sun4/os/cpu_states.c @@ -43,10 +43,8 @@ #include <sys/traptrace.h> #endif /* TRAPTRACE */ -#ifdef C2_AUDIT extern void audit_enterprom(); extern void audit_exitprom(); -#endif /* C2_AUDIT */ /* * Platforms that use CPU signatures need to set cpu_sgn_func @@ -111,21 +109,15 @@ abort_seq_softintr(caddr_t arg) msg = NULL; abort_seq_tstamp = 0LL; mutex_exit(&abort_seq_lock); -#ifdef C2_AUDIT if (audit_active) audit_enterprom(1); -#endif /* C2_AUDIT */ (*abort_seq_handler)(msg); -#ifdef C2_AUDIT if (audit_active) audit_exitprom(1); -#endif /* C2_AUDIT */ } else { mutex_exit(&abort_seq_lock); -#ifdef C2_AUDIT if (audit_active) audit_enterprom(0); -#endif /* C2_AUDIT */ } return (1); } @@ -191,21 +183,15 @@ abort_sequence_enter(char *msg) */ abort_seq_tstamp = 0LL; mutex_exit(&abort_seq_lock); -#ifdef C2_AUDIT if (!on_intr && audit_active) audit_enterprom(1); -#endif /* C2_AUDIT */ (*abort_seq_handler)(msg); -#ifdef C2_AUDIT if (!on_intr && audit_active) audit_exitprom(1); -#endif /* C2_AUDIT */ } } else { -#ifdef C2_AUDIT if (audit_active) audit_enterprom(0); -#endif /* C2_AUDIT */ } } diff --git a/usr/src/uts/sun4u/Makefile.sun4u.shared b/usr/src/uts/sun4u/Makefile.sun4u.shared index e11ac0c2b3..e5885e6c26 100644 --- a/usr/src/uts/sun4u/Makefile.sun4u.shared +++ b/usr/src/uts/sun4u/Makefile.sun4u.shared @@ -322,13 +322,6 @@ $(IF_TRAPTRACE_OBJ)opl_olympus_asm.o := DEBUG_DEFS += -DTRAPTRACE #$(IF_DEBUG_OBJ)lock_prim.o := DEBUG_DEFS += -DDISP_DEBUG # -# Build `options'. These are mostly historical and the need for these -# is largely removed by the module technology. However, the static -# build will continue to require these. -# -OPTION_DEFS = -DC2_AUDIT - -# # Collect the preprocessor definitions to be associated with *all* # files. # diff --git a/usr/src/uts/sun4v/Makefile.sun4v.shared b/usr/src/uts/sun4v/Makefile.sun4v.shared index 5b0db28417..3e1e48d725 100644 --- a/usr/src/uts/sun4v/Makefile.sun4v.shared +++ b/usr/src/uts/sun4v/Makefile.sun4v.shared @@ -291,13 +291,6 @@ $(IF_TRAPTRACE_OBJ)x_call.o := DEBUG_DEFS += -DTRAPTRACE #$(IF_DEBUG_OBJ)lock_prim.o := DEBUG_DEFS += -DDISP_DEBUG # -# Build `options'. These are mostly historical and the need for these -# is largely removed by the module technology. However, the static -# build will continue to require these. -# -OPTION_DEFS = -DC2_AUDIT - -# # Collect the preprocessor definitions to be associated with *all* # files. # |