4 files changed, 13 insertions, 36 deletions
diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c
index dfe83208002..27f71b21d9b 100644
--- a/sys/kern/kern_lkm.c
+++ b/sys/kern/kern_lkm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_lkm.c,v 1.29 2001/05/05 20:57:00 art Exp $	*/
+/*	$OpenBSD: kern_lkm.c,v 1.30 2001/05/16 12:52:58 ho Exp $	*/
 /*	$NetBSD: kern_lkm.c,v 1.31 1996/03/31 21:40:27 christos Exp $	*/
 
 /*
@@ -155,13 +155,10 @@ lkmalloc()
 	struct lkm_table *ret = NULL;
 
 	MALLOC(ret, struct lkm_table *, sizeof(*ret), M_DEVBUF, M_WAITOK);
-	if (ret != NULL) {
-		ret->refcnt =
-		ret->depcnt = 0;
-		ret->id = nlkms++;
-		ret->sym_id = -1;
-		TAILQ_INSERT_TAIL(&lkmods, ret, list);
-	}
+	ret->refcnt = ret->depcnt = 0;
+	ret->id = nlkms++;
+	ret->sym_id = -1;
+	TAILQ_INSERT_TAIL(&lkmods, ret, list);
 
 	return ret;
 }
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 595071f1258..5c2b5a3e2c5 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_generic.c,v 1.28 2000/11/10 18:15:47 art Exp $	*/
+/*	$OpenBSD: sys_generic.c,v 1.29 2001/05/16 12:52:58 ho Exp $	*/
 /*	$NetBSD: sys_generic.c,v 1.24 1996/03/29 00:25:32 cgd Exp $	*/
 
 /*
@@ -691,10 +691,7 @@ sys_select(p, v, retval)
 	if (SCARG(uap, nd) > FD_SETSIZE) {
 		caddr_t mbits;
 
-		if ((mbits = malloc(ni * 6, M_TEMP, M_WAITOK)) == NULL) {
-			error = EINVAL;
-			goto cleanup;
-		}
+		mbits = malloc(ni * 6, M_TEMP, M_WAITOK);
 		bzero(mbits, ni * 6);
 		pibits[0] = (fd_set *)&mbits[ni * 0];
 		pibits[1] = (fd_set *)&mbits[ni * 1];
@@ -779,7 +776,6 @@ done:
 #undef putbits
 	}
 	
-cleanup:
 	if (pibits[0] != &bits[0])
 		free(pibits[0], M_TEMP);
 	return (error);
diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c
index b3d0ceae796..dbd1a48e201 100644
--- a/sys/kern/tty_subr.c
+++ b/sys/kern/tty_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tty_subr.c,v 1.10 2001/01/25 03:50:53 todd Exp $	*/
+/*	$OpenBSD: tty_subr.c,v 1.11 2001/05/16 12:52:58 ho Exp $	*/
 /*	$NetBSD: tty_subr.c,v 1.13 1996/02/09 19:00:43 christos Exp $	*/
 
 /*
@@ -94,17 +94,10 @@ clalloc(clp, size, quot)
 {
 
 	clp->c_cs = malloc(size, M_TTYS, M_WAITOK);
-	if (!clp->c_cs)
-		return (-1);
 	bzero(clp->c_cs, size);
 
 	if (quot) {
 		clp->c_cq = malloc(QMEM(size), M_TTYS, M_WAITOK);
-		if (!clp->c_cq) {
-			free(clp->c_cs, M_TTYS);
-			clp->c_cs = NULL;
-			return (-1);
-		}
 		bzero(clp->c_cq, QMEM(size));
 	} else
 		clp->c_cq = (u_char *)0;
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index fddbf376b58..9cba7d90786 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_syscalls.c,v 1.37 2001/05/14 13:43:54 art Exp $	*/
+/*	$OpenBSD: uipc_syscalls.c,v 1.38 2001/05/16 12:52:58 ho Exp $	*/
 /*	$NetBSD: uipc_syscalls.c,v 1.19 1996/02/09 19:00:48 christos Exp $	*/
 
 /*
@@ -479,15 +479,10 @@ sendit(p, s, mp, flags, retsize)
 			register struct cmsghdr *cm;
 
 			M_PREPEND(control, sizeof(*cm), M_WAIT);
-			if (control == 0) {
-				error = ENOBUFS;
-				goto bad;
-			} else {
-				cm = mtod(control, struct cmsghdr *);
-				cm->cmsg_len = control->m_len;
-				cm->cmsg_level = SOL_SOCKET;
-				cm->cmsg_type = SCM_RIGHTS;
-			}
+			cm = mtod(control, struct cmsghdr *);
+			cm->cmsg_len = control->m_len;
+			cm->cmsg_level = SOL_SOCKET;
+			cm->cmsg_type = SCM_RIGHTS;
 		}
 #endif
 	} else
@@ -919,8 +914,6 @@ sys_getsockname(p, v, retval)
 		return (error);
 	so = (struct socket *)fp->f_data;
 	m = m_getclr(M_WAIT, MT_SONAME);
-	if (m == NULL)
-		return (ENOBUFS);
 	error = (*so->so_proto->pr_usrreq)(so, PRU_SOCKADDR, 0, m, 0);
 	if (error)
 		goto bad;
@@ -965,8 +958,6 @@ sys_getpeername(p, v, retval)
 	if (error)
 		return (error);
 	m = m_getclr(M_WAIT, MT_SONAME);
-	if (m == NULL)
-		return (ENOBUFS);
 	error = (*so->so_proto->pr_usrreq)(so, PRU_PEERADDR, 0, m, 0);
 	if (error)
 		goto bad;