Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Panic strings should not end with \n.

This commit is contained in:
christos 2005-05-08 18:44:39 +00:00
parent b18483500c
commit 8dc75b1c08
10 changed files with 112 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/kern_exit.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_exit.c,v 1.146 2005/03/30 17:07:50 christos Exp $ */
/* $NetBSD: kern_exit.c,v 1.147 2005/05/08 18:44:39 christos Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.146 2005/03/30 17:07:50 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.147 2005/05/08 18:44:39 christos Exp $");
#include "opt_ktrace.h"
#include "opt_perfctrs.h"
@ -614,7 +614,7 @@ exit_lwps(struct lwp *l)
p->p_nlwps, p->p_nrlwps, p->p_nzlwps));
error = lwp_wait1(l, 0, &waited, LWPWAIT_EXITCONTROL);
if (error)
panic("exit_lwps: lwp_wait1 failed with error %d\n",
panic("exit_lwps: lwp_wait1 failed with error %d",
error);
DPRINTF(("exit_lwps: Got LWP %d from lwp_wait1()\n", waited));
}

38
sys/kern/kern_verifiedexec.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_verifiedexec.c,v 1.13 2005/04/26 10:45:41 blymn Exp $ */
/* $NetBSD: kern_verifiedexec.c,v 1.14 2005/05/08 18:44:39 christos Exp $ */
/*-
* Copyright 2005 Elad Efrat <elad@bsd.org.il>
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_verifiedexec.c,v 1.13 2005/04/26 10:45:41 blymn Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_verifiedexec.c,v 1.14 2005/05/08 18:44:39 christos Exp $");
#include <sys/param.h>
#include <sys/mount.h>
@ -197,7 +197,7 @@ veriexec_fp_calc(struct proc *p, struct vnode *vp,
/* XXX: This should not happen. Print more details? */
if (vhe->ops == NULL) {
panic("Veriexec: Operations vector NULL\n");
panic("veriexec: Operations vector is NULL");
}
bzero(fp, vhe->ops->hash_len);
@ -320,7 +320,7 @@ veriexec_hashadd(struct veriexec_hashtbl *tbl, struct veriexec_hash_entry *e)
vhh = &(tbl->hash_tbl[indx]);
if (vhh == NULL)
panic("Veriexec: veriexec_hashadd: vhh is NULL.");
panic("veriexec: veriexec_hashadd: vhh is NULL.");
LIST_INSERT_HEAD(vhh, e, entries);
@ -349,7 +349,7 @@ veriexec_verify(struct proc *p, struct vnode *vp, struct vattr *va,
goto out;
}
veriexec_dprintf(("Veriexec: veriexec_verify: Got entry for "
veriexec_dprintf(("veriexec: veriexec_verify: Got entry for "
"%s. (dev=%d, inode=%u)\n", name,
va->va_fsid, va->va_fileid));
@ -359,7 +359,7 @@ veriexec_verify(struct proc *p, struct vnode *vp, struct vattr *va,
error = veriexec_fp_calc(p, vp, vhe, va->va_size, digest);
if (error) {
veriexec_dprintf(("Veriexec: veriexec_verify: "
veriexec_dprintf(("veriexec: veriexec_verify: "
"Calculation error.\n"));
free(digest, M_TEMP);
return (error);
@ -381,13 +381,13 @@ out:
switch (vp->fp_status) {
case FINGERPRINT_NOTEVAL:
/* Should not happen. */
panic("Veriexec: Not-evaluated status post-evaluation. "
panic("veriexec: Not-evaluated status post-evaluation. "
"Inconsistency detected. Report a bug.");
case FINGERPRINT_VALID:
/* Valid fingerprint. */
if ((securelevel >= 1) && security_veriexec_verbose)
printf("Veriexec: veriexec_verify: Fingerprint "
printf("veriexec: veriexec_verify: Fingerprint "
"matches. (file=%s, dev=%ld, inode=%lu)\n",
name, va->va_fsid, va->va_fileid);
break;
@ -395,7 +395,7 @@ out:
case FINGERPRINT_INDIRECT:
/* Fingerprint is okay; Make sure it's indirect execution. */
if (flag == VERIEXEC_DIRECT) {
printf("Veriexec: Attempt to execute %s "
printf("veriexec: Attempt to execute %s "
"(dev=%ld, inode=%lu) directly by uid=%u "
"(pid=%u, ppid=%u, gppid=%u)\n", name,
va->va_fsid, va->va_fileid,
@ -406,7 +406,7 @@ out:
}
if ((securelevel >= 1) && security_veriexec_verbose)
printf("Veriexec: veriexec_verify: Fingerprint "
printf("veriexec: veriexec_verify: Fingerprint "
"matches on indirect. (file=%s, dev=%ld, "
"inode=%lu)\n",
name, va->va_fsid, va->va_fileid);
@ -414,7 +414,7 @@ out:
case FINGERPRINT_NOMATCH:
/* Fingerprint mismatch. Deny execution. */
printf("Veriexec: Fingerprint mismatch for %s "
printf("veriexec: Fingerprint mismatch for %s "
"(dev=%ld, inode=%lu). Execution "
"attempt by uid=%u, pid=%u.\n", name,
va->va_fsid, va->va_fileid,
@ -428,7 +428,7 @@ out:
/* No entry in the list. */
if (securelevel >= 1) {
if (security_veriexec_verbose)
printf("Veriexec: veriexec_verify: No "
printf("veriexec: veriexec_verify: No "
"fingerprint for %s (dev=%ld, "
"inode=%lu)\n", name, va->va_fsid,
va->va_fileid);
@ -450,7 +450,7 @@ out:
* Should never happen.
* XXX: Print vnode/process?
*/
panic("Veriexec: Invalid status post-evaluation in "
panic("veriexec: Invalid status post-evaluation in "
"veriexec_verify(). Report a bug. (vnode=%p, pid=%u)",
vp, p->p_pid);
}
@ -482,7 +482,7 @@ veriexec_removechk(struct proc *p, struct vnode *vp, const char *pathbuf)
case FINGERPRINT_INDIRECT:
case FINGERPRINT_NOMATCH:
if ((securelevel >= 2) || security_veriexec_strict) {
printf("Veriexec: Denying unlink request for %s "
printf("veriexec: Denying unlink request for %s "
"from uid=%u: File in fingerprint tables. "
"(pid=%u, dev=%ld, inode=%lu)\n", pathbuf,
p->p_ucred->cr_uid, p->p_pid,
@ -491,14 +491,14 @@ veriexec_removechk(struct proc *p, struct vnode *vp, const char *pathbuf)
error = EPERM;
} else {
if (security_veriexec_verbose) {
printf("Veriexec: veriexec_removechk: Removing"
printf("veriexec: veriexec_removechk: Removing"
" entry from Veriexec table. (file=%s, "
"dev=%ld, inode=%lu)\n", pathbuf,
va.va_fsid, va.va_fileid);
}
if (vhe == NULL) {
panic("Veriexec: tables inconsistent, vnode "
panic("veriexec: tables inconsistent, vnode "
"has status but no fp entry found");
}
@ -521,7 +521,7 @@ veriexec_removechk(struct proc *p, struct vnode *vp, const char *pathbuf)
}
if (securelevel >= 2) {
printf("Veriexec: Denying unlink request for %s from"
printf("veriexec: Denying unlink request for %s from"
" uid=%u: File in fingerprint tables. (pid=%u, "
"dev=%ld, inode=%lu)\n", pathbuf,
p->p_ucred->cr_uid, p->p_pid,
@ -535,7 +535,7 @@ veriexec_removechk(struct proc *p, struct vnode *vp, const char *pathbuf)
break;
default:
panic("Veriexec: inconsistency in verified exec state"
panic("veriexec: inconsistency in verified exec state"
"data");
break;
@ -546,7 +546,7 @@ veriexec_removechk(struct proc *p, struct vnode *vp, const char *pathbuf)
veriexec_rm:
tbl = veriexec_tblfind(va.va_fsid);
if (tbl == NULL) {
panic("Veriexec: Inconsistency: Could not get table for file"
panic("veriexec: Inconsistency: Could not get table for file"
" in lists. Report a bug.");
}

11
sys/kern/tty.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tty.c,v 1.171 2005/02/26 21:34:55 perry Exp $ */
/* $NetBSD: tty.c,v 1.172 2005/05/08 18:44:39 christos Exp $ */
/*-
* Copyright (c) 1982, 1986, 1990, 1991, 1993
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.171 2005/02/26 21:34:55 perry Exp $");
__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.172 2005/05/08 18:44:39 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -2173,11 +2173,8 @@ ttyrub(int c, struct tty *tp)
(void)ttyoutput('\b', tp);
break;
default: /* XXX */
#define PANICSTR "ttyrub: would panic c = %d, val = %d\n"
(void)printf(PANICSTR, c, CCLASS(c));
#ifdef notdef
panic(PANICSTR, c, CCLASS(c));
#endif
(void)printf("ttyrub: would panic c = %d, "
"val = %d\n", c, CCLASS(c));
}
}
} else if (ISSET(tp->t_lflag, ECHOPRT)) {

6
sys/kern/uipc_socket.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uipc_socket.c,v 1.110 2005/05/07 17:42:09 christos Exp $ */
/* $NetBSD: uipc_socket.c,v 1.111 2005/05/08 18:44:39 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.110 2005/05/07 17:42:09 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.111 2005/05/08 18:44:39 christos Exp $");
#include "opt_sock_counters.h"
#include "opt_sosend_loan.h"
@ -132,7 +132,7 @@ soinit(void)
/* Set the initial adjusted socket buffer size. */
if (sb_max_set(sb_max))
panic("bad initial sb_max value: %lu\n", sb_max);
panic("bad initial sb_max value: %lu", sb_max);
}

16
sys/kern/vfs_lookup.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vfs_lookup.c,v 1.57 2005/03/08 17:29:29 wrstuden Exp $ */
/* $NetBSD: vfs_lookup.c,v 1.58 2005/05/08 18:44:40 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.57 2005/03/08 17:29:29 wrstuden Exp $");
__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.58 2005/05/08 18:44:40 christos Exp $");
#include "opt_ktrace.h"
#include "opt_systrace.h"
@ -102,11 +102,11 @@ namei(ndp)
#ifdef DIAGNOSTIC
if (!cnp->cn_cred || !cnp->cn_proc)
panic ("namei: bad cred/proc");
panic("namei: bad cred/proc");
if (cnp->cn_nameiop & (~OPMASK))
panic ("namei: nameiop contaminated with flags");
panic("namei: nameiop contaminated with flags");
if (cnp->cn_flags & OPMASK)
panic ("namei: flags contaminated with nameiops");
panic("namei: flags contaminated with nameiops");
#endif
cwdi = cnp->cn_proc->p_cwdi;
@ -710,7 +710,7 @@ relookup(dvp, vpp, cnp)
if (newhash != cnp->cn_hash)
panic("relookup: bad hash");
if (cnp->cn_namelen != cp - cnp->cn_nameptr)
panic ("relookup: bad len");
panic("relookup: bad len");
while (*cp == '/')
cp++;
if (*cp != 0)
@ -729,7 +729,7 @@ relookup(dvp, vpp, cnp)
panic("relookup: null name");
if (cnp->cn_flags & ISDOTDOT)
panic ("relookup: lookup on dot-dot");
panic("relookup: lookup on dot-dot");
/*
* We now have a segment name to search for, and a directory to search.
@ -766,7 +766,7 @@ relookup(dvp, vpp, cnp)
* Check for symbolic link
*/
if (dp->v_type == VLNK && (cnp->cn_flags & FOLLOW))
panic ("relookup: symlink found.\n");
panic("relookup: symlink found");
#endif
/*

17
sys/netipsec/ipsec.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ipsec.c,v 1.15 2005/02/26 22:45:13 perry Exp $ */
/* $NetBSD: ipsec.c,v 1.16 2005/05/08 18:44:40 christos Exp $ */
/* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $ */
/* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.15 2005/02/26 22:45:13 perry Exp $");
__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.16 2005/05/08 18:44:40 christos Exp $");
/*
* IPsec controller part.
@ -985,7 +985,7 @@ ipsec6_get_ulp(m, spidx, needport)
/* sanity check */
if (m == NULL)
panic("ipsec6_get_ulp: NULL pointer was passed.\n");
panic("ipsec6_get_ulp: NULL pointer was passed");
KEYDEBUG(KEYDEBUG_IPSEC_DUMP,
printf("ipsec6_get_ulp:\n"); kdebug_mbuf(m));
@ -1089,7 +1089,7 @@ ipsec_init_policy(so, pcb_sp)
/* sanity check. */
if (so == NULL || pcb_sp == NULL)
panic("ipsec_init_policy: NULL pointer was passed.\n");
panic("ipsec_init_policy: NULL pointer was passed");
new = (struct inpcbpolicy *) malloc(sizeof(struct inpcbpolicy),
M_SECA, M_NOWAIT|M_ZERO);
@ -1522,7 +1522,7 @@ ipsec_get_reqlevel(isr)
#endif /* INET6 */
default:
panic("key_get_reqlevel: unknown af %u",
isr->sp->spidx.src.sa.sa_family);
isr->sp->spidx.src.sa.sa_family);
}
#undef IPSEC_CHECK_DEFAULT
@ -1551,9 +1551,8 @@ ipsec_get_reqlevel(isr)
level = IPSEC_LEVEL_USE;
break;
default:
panic("ipsec_get_reqlevel: "
"Illegal protocol defined %u\n",
isr->saidx.proto);
panic("ipsec_get_reqlevel: Illegal protocol defined %u",
isr->saidx.proto);
}
break;
@ -1566,7 +1565,7 @@ ipsec_get_reqlevel(isr)
break;
default:
panic("ipsec_get_reqlevel: Illegal IPsec level %u\n",
panic("ipsec_get_reqlevel: Illegal IPsec level %u",
isr->level);
}

80
sys/netipsec/key.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: key.c,v 1.23 2005/02/28 17:47:50 jonathan Exp $ */
/* $NetBSD: key.c,v 1.24 2005/05/08 18:44:40 christos Exp $ */
/* $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.23 2005/02/28 17:47:50 jonathan Exp $");
__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.24 2005/05/08 18:44:40 christos Exp $");
/*
* This code is referd to RFC 2367
@ -795,7 +795,7 @@ key_checkrequest(struct ipsecrequest *isr, const struct secasindex *saidx)
*/
if (isr->sav != NULL) {
if (isr->sav->sah == NULL)
panic("key_checkrequest: sah is null.\n");
panic("key_checkrequest: sah is null");
if (isr->sav == (struct secasvar *)LIST_FIRST(
&isr->sav->sah->savtree[SADB_SASTATE_DEAD])) {
KEY_FREESAV(&isr->sav);
@ -928,7 +928,7 @@ key_do_allocsa_policy(struct secashead *sah, u_int state)
/* sanity check 2 */
if (candidate->lft_c == NULL || sav->lft_c == NULL)
panic("key_do_allocsa_policy: "
"lifetime_current is NULL.\n");
"lifetime_current is NULL");
/* What the best method is to compare ? */
if (key_prefered_oldsa) {
@ -1343,9 +1343,9 @@ key_msg2sp(xpl0, len, error)
/* sanity check */
if (xpl0 == NULL)
panic("key_msg2sp: NULL pointer was passed.\n");
panic("key_msg2sp: NULL pointer was passed");
if (len < sizeof(*xpl0))
panic("key_msg2sp: invalid length.\n");
panic("key_msg2sp: invalid length");
if (len != PFKEY_EXTLEN(xpl0)) {
ipseclog((LOG_DEBUG, "key_msg2sp: Invalid msg length.\n"));
*error = EINVAL;
@ -1579,7 +1579,7 @@ key_sp2msg(sp)
/* sanity check. */
if (sp == NULL)
panic("key_sp2msg: NULL pointer was passed.\n");
panic("key_sp2msg: NULL pointer was passed");
tlen = key_getspreqmsglen(sp);
@ -1740,7 +1740,7 @@ key_spdadd(so, m, mhp)
/* sanity check */
if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL)
panic("key_spdadd: NULL pointer is passed.\n");
panic("key_spdadd: NULL pointer is passed");
if (mhp->ext[SADB_EXT_ADDRESS_SRC] == NULL ||
mhp->ext[SADB_EXT_ADDRESS_DST] == NULL ||
@ -2032,7 +2032,7 @@ key_spddelete(so, m, mhp)
/* sanity check */
if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL)
panic("key_spddelete: NULL pointer is passed.\n");
panic("key_spddelete: NULL pointer is passed");
if (mhp->ext[SADB_EXT_ADDRESS_SRC] == NULL ||
mhp->ext[SADB_EXT_ADDRESS_DST] == NULL ||
@ -2133,7 +2133,7 @@ key_spddelete2(so, m, mhp)
/* sanity check */
if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL)
panic("key_spddelete2: NULL pointer is passed.\n");
panic("key_spddelete2: NULL pointer is passed");
if (mhp->ext[SADB_X_EXT_POLICY] == NULL ||
mhp->extlen[SADB_X_EXT_POLICY] < sizeof(struct sadb_x_policy)) {
@ -2239,7 +2239,7 @@ key_spdget(so, m, mhp)
/* sanity check */
if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL)
panic("key_spdget: NULL pointer is passed.\n");
panic("key_spdget: NULL pointer is passed");
if (mhp->ext[SADB_X_EXT_POLICY] == NULL ||
mhp->extlen[SADB_X_EXT_POLICY] < sizeof(struct sadb_x_policy)) {
@ -2288,11 +2288,11 @@ key_spdacquire(sp)
/* sanity check */
if (sp == NULL)
panic("key_spdacquire: NULL pointer is passed.\n");
panic("key_spdacquire: NULL pointer is passed");
if (sp->req != NULL)
panic("key_spdacquire: called but there is request.\n");
panic("key_spdacquire: called but there is request");
if (sp->policy != IPSEC_POLICY_IPSEC)
panic("key_spdacquire: policy mismathed. IPsec is expected.\n");
panic("key_spdacquire: policy mismathed. IPsec is expected");
/* Get an entry to check whether sent message or not. */
if ((newspacq = key_getspacq(&sp->spidx)) != NULL) {
@ -2360,7 +2360,7 @@ key_spdflush(so, m, mhp)
/* sanity check */
if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL)
panic("key_spdflush: NULL pointer is passed.\n");
panic("key_spdflush: NULL pointer is passed");
if (m->m_len != PFKEY_ALIGN8(sizeof(struct sadb_msg)))
return key_senderror(so, m, EINVAL);
@ -2483,7 +2483,7 @@ key_spddump(so, m0, mhp)
/* sanity check */
if (so == NULL || m0 == NULL || mhp == NULL || mhp->msg == NULL)
panic("key_spddump: NULL pointer is passed.\n");
panic("key_spddump: NULL pointer is passed");
pid = mhp->msg->sadb_msg_pid;
@ -2646,7 +2646,7 @@ key_spdexpire(sp)
/* sanity check */
if (sp == NULL)
panic("key_spdexpire: NULL pointer is passed.\n");
panic("key_spdexpire: NULL pointer is passed");
/* set msg header */
m = key_setsadbmsg(SADB_X_SPDEXPIRE, 0, 0, 0, 0, 0);
@ -2782,7 +2782,7 @@ key_delsah(sah)
/* sanity check */
if (sah == NULL)
panic("key_delsah: NULL pointer is passed.\n");
panic("key_delsah: NULL pointer is passed");
s = splsoftnet(); /*called from softclock()*/
@ -2856,7 +2856,7 @@ key_newsav(m, mhp, sah, errp, where, tag)
/* sanity check */
if (m == NULL || mhp == NULL || mhp->msg == NULL || sah == NULL)
panic("key_newsa: NULL pointer is passed.\n");
panic("key_newsa: NULL pointer is passed");
KMALLOC(newsav, struct secasvar *, sizeof(struct secasvar));
if (newsav == NULL) {
@ -3103,7 +3103,7 @@ key_setsaval(sav, m, mhp)
/* sanity check */
if (m == NULL || mhp == NULL || mhp->msg == NULL)
panic("key_setsaval: NULL pointer is passed.\n");
panic("key_setsaval: NULL pointer is passed");
/* initialization */
sav->replay = NULL;
@ -3857,7 +3857,7 @@ key_ismyaddr(sa)
/* sanity check */
if (sa == NULL)
panic("key_ismyaddr: NULL pointer is passed.\n");
panic("key_ismyaddr: NULL pointer is passed");
switch (sa->sa_family) {
#ifdef INET
@ -4617,7 +4617,7 @@ key_getspi(so, m, mhp)
/* sanity check */
if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL)
panic("key_getspi: NULL pointer is passed.\n");
panic("key_getspi: NULL pointer is passed");
if (mhp->ext[SADB_EXT_ADDRESS_SRC] == NULL ||
mhp->ext[SADB_EXT_ADDRESS_DST] == NULL) {
@ -4892,7 +4892,7 @@ key_update(so, m, mhp)
/* sanity check */
if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL)
panic("key_update: NULL pointer is passed.\n");
panic("key_update: NULL pointer is passed");
/* map satype to proto */
if ((proto = key_satype2proto(mhp->msg->sadb_msg_satype)) == 0) {
@ -5087,7 +5087,7 @@ key_add(so, m, mhp)
/* sanity check */
if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL)
panic("key_add: NULL pointer is passed.\n");
panic("key_add: NULL pointer is passed");
/* map satype to proto */
if ((proto = key_satype2proto(mhp->msg->sadb_msg_satype)) == 0) {
@ -5196,7 +5196,7 @@ key_setident(sah, m, mhp)
/* sanity check */
if (sah == NULL || m == NULL || mhp == NULL || mhp->msg == NULL)
panic("key_setident: NULL pointer is passed.\n");
panic("key_setident: NULL pointer is passed");
/* don't make buffer if not there */
if (mhp->ext[SADB_EXT_IDENTITY_SRC] == NULL &&
@ -5266,7 +5266,7 @@ key_getmsgbuf_x1(m, mhp)
/* sanity check */
if (m == NULL || mhp == NULL || mhp->msg == NULL)
panic("key_getmsgbuf_x1: NULL pointer is passed.\n");
panic("key_getmsgbuf_x1: NULL pointer is passed");
/* create new sadb_msg to reply. */
n = key_gather_mbuf(m, mhp, 1, 9, SADB_EXT_RESERVED,
@ -5318,7 +5318,7 @@ key_delete(so, m, mhp)
/* sanity check */
if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL)
panic("key_delete: NULL pointer is passed.\n");
panic("key_delete: NULL pointer is passed");
/* map satype to proto */
if ((proto = key_satype2proto(mhp->msg->sadb_msg_satype)) == 0) {
@ -5505,7 +5505,7 @@ key_get(so, m, mhp)
/* sanity check */
if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL)
panic("key_get: NULL pointer is passed.\n");
panic("key_get: NULL pointer is passed");
/* map satype to proto */
if ((proto = key_satype2proto(mhp->msg->sadb_msg_satype)) == 0) {
@ -6150,7 +6150,7 @@ key_acquire2(so, m, mhp)
/* sanity check */
if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL)
panic("key_acquire2: NULL pointer is passed.\n");
panic("key_acquire2: NULL pointer is passed");
/*
* Error message from KMd.
@ -6262,7 +6262,7 @@ key_register(so, m, mhp)
/* sanity check */
if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL)
panic("key_register: NULL pointer is passed.\n");
panic("key_register: NULL pointer is passed");
/* check for invalid register message */
if (mhp->msg->sadb_msg_satype >= sizeof(regtree)/sizeof(regtree[0]))
@ -6392,7 +6392,7 @@ key_register(so, m, mhp)
}
}
#ifdef DIGAGNOSTIC
#ifdef DIAGNOSTIC
if (off != len)
panic("length assumption failed in key_register");
#endif
@ -6415,7 +6415,7 @@ key_freereg(so)
/* sanity check */
if (so == NULL)
panic("key_freereg: NULL pointer is passed.\n");
panic("key_freereg: NULL pointer is passed");
/*
* check whether existing or not.
@ -6462,11 +6462,11 @@ key_expire(sav)
/* sanity check */
if (sav == NULL)
panic("key_expire: NULL pointer is passed.\n");
panic("key_expire: NULL pointer is passed");
if (sav->sah == NULL)
panic("key_expire: Why was SA index in SA NULL.\n");
panic("key_expire: Why was SA index in SA NULL");
if ((satype = key_proto2satype(sav->sah->saidx.proto)) == 0)
panic("key_expire: invalid proto is passed.\n");
panic("key_expire: invalid proto is passed");
/* set msg header */
m = key_setsadbmsg(SADB_EXPIRE, 0, satype, sav->seq, 0, sav->refcnt);
@ -6592,7 +6592,7 @@ key_flush(so, m, mhp)
/* sanity check */
if (so == NULL || mhp == NULL || mhp->msg == NULL)
panic("key_flush: NULL pointer is passed.\n");
panic("key_flush: NULL pointer is passed");
/* map satype to proto */
if ((proto = key_satype2proto(mhp->msg->sadb_msg_satype)) == 0) {
@ -6768,7 +6768,7 @@ key_dump(so, m0, mhp)
/* sanity check */
if (so == NULL || m0 == NULL || mhp == NULL || mhp->msg == NULL)
panic("key_dump: NULL pointer is passed.\n");
panic("key_dump: NULL pointer is passed");
/* map satype to proto */
satype = mhp->msg->sadb_msg_satype;
@ -6837,7 +6837,7 @@ key_promisc(so, m, mhp)
/* sanity check */
if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL)
panic("key_promisc: NULL pointer is passed.\n");
panic("key_promisc: NULL pointer is passed");
olen = PFKEY_UNUNIT64(mhp->msg->sadb_msg_len);
@ -6929,7 +6929,7 @@ key_parse(m, so)
/* sanity check */
if (m == NULL || so == NULL)
panic("key_parse: NULL pointer is passed.\n");
panic("key_parse: NULL pointer is passed");
#if 0 /*kdebug_sadb assumes msg in linear buffer*/
KEYDEBUG(KEYDEBUG_KEY_DUMP,
@ -7204,7 +7204,7 @@ key_align(m, mhp)
/* sanity check */
if (m == NULL || mhp == NULL)
panic("key_align: NULL pointer is passed.\n");
panic("key_align: NULL pointer is passed");
if (m->m_len < sizeof(struct sadb_msg))
panic("invalid mbuf passed to key_align");

36
sys/netipsec/key_debug.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: key_debug.c,v 1.3 2003/10/06 22:05:15 tls Exp $ */
/* $NetBSD: key_debug.c,v 1.4 2005/05/08 18:44:40 christos Exp $ */
/* $FreeBSD: src/sys/netipsec/key_debug.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $KAME: key_debug.c,v 1.26 2001/06/27 10:46:50 sakane Exp $ */
@ -33,7 +33,7 @@
#ifdef _KERNEL
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: key_debug.c,v 1.3 2003/10/06 22:05:15 tls Exp $");
__KERNEL_RCSID(0, "$NetBSD: key_debug.c,v 1.4 2005/05/08 18:44:40 christos Exp $");
#endif
#include "opt_inet.h"
@ -94,7 +94,7 @@ kdebug_sadb(base)
/* sanity check */
if (base == NULL)
panic("kdebug_sadb: NULL pointer was passed.\n");
panic("kdebug_sadb: NULL pointer was passed");
printf("sadb_msg{ version=%u type=%u errno=%u satype=%u\n",
base->sadb_msg_version, base->sadb_msg_type,
@ -183,7 +183,7 @@ kdebug_sadb_prop(ext)
/* sanity check */
if (ext == NULL)
panic("kdebug_sadb_prop: NULL pointer was passed.\n");
panic("kdebug_sadb_prop: NULL pointer was passed");
len = (PFKEY_UNUNIT64(prop->sadb_prop_len) - sizeof(*prop))
/ sizeof(*comb);
@ -232,7 +232,7 @@ kdebug_sadb_identity(ext)
/* sanity check */
if (ext == NULL)
panic("kdebug_sadb_identity: NULL pointer was passed.\n");
panic("kdebug_sadb_identity: NULL pointer was passed");
len = PFKEY_UNUNIT64(id->sadb_ident_len) - sizeof(*id);
printf("sadb_ident_%s{",
@ -276,7 +276,7 @@ kdebug_sadb_supported(ext)
/* sanity check */
if (ext == NULL)
panic("kdebug_sadb_supported: NULL pointer was passed.\n");
panic("kdebug_sadb_supported: NULL pointer was passed");
len = (PFKEY_UNUNIT64(sup->sadb_supported_len) - sizeof(*sup))
/ sizeof(*alg);
@ -321,7 +321,7 @@ kdebug_sadb_sa(ext)
/* sanity check */
if (ext == NULL)
panic("kdebug_sadb_sa: NULL pointer was passed.\n");
panic("kdebug_sadb_sa: NULL pointer was passed");
printf("sadb_sa{ spi=%u replay=%u state=%u\n",
(u_int32_t)ntohl(sa->sadb_sa_spi), sa->sadb_sa_replay,
@ -340,7 +340,7 @@ kdebug_sadb_address(ext)
/* sanity check */
if (ext == NULL)
panic("kdebug_sadb_address: NULL pointer was passed.\n");
panic("kdebug_sadb_address: NULL pointer was passed");
printf("sadb_address{ proto=%u prefixlen=%u reserved=0x%02x%02x }\n",
addr->sadb_address_proto, addr->sadb_address_prefixlen,
@ -360,7 +360,7 @@ kdebug_sadb_key(ext)
/* sanity check */
if (ext == NULL)
panic("kdebug_sadb_key: NULL pointer was passed.\n");
panic("kdebug_sadb_key: NULL pointer was passed");
printf("sadb_key{ bits=%u reserved=%u\n",
key->sadb_key_bits, key->sadb_key_reserved);
@ -388,7 +388,7 @@ kdebug_sadb_x_sa2(ext)
/* sanity check */
if (ext == NULL)
panic("kdebug_sadb_x_sa2: NULL pointer was passed.\n");
panic("kdebug_sadb_x_sa2: NULL pointer was passed");
printf("sadb_x_sa2{ mode=%u reqid=%u\n",
sa2->sadb_x_sa2_mode, sa2->sadb_x_sa2_reqid);
@ -408,7 +408,7 @@ kdebug_sadb_x_policy(ext)
/* sanity check */
if (ext == NULL)
panic("kdebug_sadb_x_policy: NULL pointer was passed.\n");
panic("kdebug_sadb_x_policy: NULL pointer was passed");
printf("sadb_x_policy{ type=%u dir=%u id=%x }\n",
xpl->sadb_x_policy_type, xpl->sadb_x_policy_dir,
@ -457,7 +457,7 @@ kdebug_sadb_x_policy(ext)
}
if (tlen != 0)
panic("kdebug_sadb_x_policy: wrong policy struct.\n");
panic("kdebug_sadb_x_policy: wrong policy struct");
}
return;
@ -471,7 +471,7 @@ kdebug_secpolicy(sp)
{
/* sanity check */
if (sp == NULL)
panic("kdebug_secpolicy: NULL pointer was passed.\n");
panic("kdebug_secpolicy: NULL pointer was passed");
printf("secpolicy{ refcnt=%u state=%u policy=%u\n",
sp->refcnt, sp->state, sp->policy);
@ -520,7 +520,7 @@ kdebug_secpolicyindex(spidx)
{
/* sanity check */
if (spidx == NULL)
panic("kdebug_secpolicyindex: NULL pointer was passed.\n");
panic("kdebug_secpolicyindex: NULL pointer was passed");
printf("secpolicyindex{ dir=%u prefs=%u prefd=%u ul_proto=%u\n",
spidx->dir, spidx->prefs, spidx->prefd, spidx->ul_proto);
@ -541,7 +541,7 @@ kdebug_secasindex(saidx)
{
/* sanity check */
if (saidx == NULL)
panic("kdebug_secpolicyindex: NULL pointer was passed.\n");
panic("kdebug_secpolicyindex: NULL pointer was passed");
printf("secasindex{ mode=%u proto=%u\n",
saidx->mode, saidx->proto);
@ -562,7 +562,7 @@ kdebug_secasv(sav)
{
/* sanity check */
if (sav == NULL)
panic("kdebug_secasv: NULL pointer was passed.\n");
panic("kdebug_secasv: NULL pointer was passed");
printf("secas{");
kdebug_secasindex(&sav->sah->saidx);
@ -606,7 +606,7 @@ kdebug_secreplay(rpl)
/* sanity check */
if (rpl == NULL)
panic("kdebug_secreplay: NULL pointer was passed.\n");
panic("kdebug_secreplay: NULL pointer was passed");
printf(" secreplay{ count=%u wsize=%u seq=%u lastseq=%u",
rpl->count, rpl->wsize, rpl->seq, rpl->lastseq);
@ -693,7 +693,7 @@ kdebug_sockaddr(addr)
/* sanity check */
if (addr == NULL)
panic("kdebug_sockaddr: NULL pointer was passed.\n");
panic("kdebug_sockaddr: NULL pointer was passed");
/* NOTE: We deal with port number as host byte order. */
printf("sockaddr{ len=%u family=%u", addr->sa_len, addr->sa_family);

12
sys/netipsec/keysock.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: keysock.c,v 1.7 2005/02/26 22:45:13 perry Exp $ */
/* $NetBSD: keysock.c,v 1.8 2005/05/08 18:44:40 christos Exp $ */
/* $FreeBSD: src/sys/netipsec/keysock.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $ */
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.7 2005/02/26 22:45:13 perry Exp $");
__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.8 2005/05/08 18:44:40 christos Exp $");
#include "opt_ipsec.h"
@ -105,7 +105,7 @@ key_output(struct mbuf *m, ...)
va_end(ap);
if (m == 0)
panic("key_output: NULL pointer was passed.\n");
panic("key_output: NULL pointer was passed");
pfkeystat.out_total++;
pfkeystat.out_bytes += m->m_pkthdr.len;
@ -214,7 +214,7 @@ key_sendup(so, msg, len, target)
/* sanity check */
if (so == 0 || msg == 0)
panic("key_sendup: NULL pointer was passed.\n");
panic("key_sendup: NULL pointer was passed");
KEYDEBUG(KEYDEBUG_KEY_DUMP,
printf("key_sendup: \n");
@ -301,9 +301,9 @@ key_sendup_mbuf(so, m, target /*, sbprio */)
int sbprio = 0; /* XXX should be a parameter */
if (m == NULL)
panic("key_sendup_mbuf: NULL pointer was passed.\n");
panic("key_sendup_mbuf: NULL pointer was passed");
if (so == NULL && target == KEY_SENDUP_ONE)
panic("key_sendup_mbuf: NULL pointer was passed.\n");
panic("key_sendup_mbuf: NULL pointer was passed");
/*
* RFC 2367 says ACQUIRE and other kernel-generated messages

6
sys/netsmb/smb_conn.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: smb_conn.c,v 1.17 2004/06/24 16:45:47 drochner Exp $ */
/* $NetBSD: smb_conn.c,v 1.18 2005/05/08 18:44:40 christos Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: smb_conn.c,v 1.17 2004/06/24 16:45:47 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: smb_conn.c,v 1.18 2005/05/08 18:44:40 christos Exp $");
/*
* Connection engine.
@ -102,7 +102,7 @@ smb_sm_done(void)
/* XXX: hold the mutex */
#ifdef DIAGNOSTIC
if (smb_vclist.co_usecount > 1)
panic("%d connections still active\n", smb_vclist.co_usecount - 1);
panic("%d connections still active", smb_vclist.co_usecount - 1);
#endif
smb_co_done(&smb_vclist);
return 0;