Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.107.4.1
retrieving revision 1.108.2.3
diff -u -p -r1.107.4.1 -r1.108.2.3
--- src/sys/kern/uipc_socket.c	2005/04/29 11:29:24	1.107.4.1
+++ src/sys/kern/uipc_socket.c	2006/10/25 12:58:56	1.108.2.3
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.107.4.1 2005/04/29 11:29:24 kent Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.108.2.3 2006/10/25 12:58:56 ghen 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.107.4.1 2005/04/29 11:29:24 kent Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.108.2.3 2006/10/25 12:58:56 ghen Exp $");
 
 #include "opt_sock_counters.h"
 #include "opt_sosend_loan.h"
@@ -234,7 +234,7 @@ sokvaalloc(vsize_t len, struct socket *s
 	 * allocate kva.
 	 */
 
-	lva = uvm_km_alloc(kernel_map, len, 0, UVM_KMF_VAONLY | UVM_KMF_WAITVA);
+	lva = uvm_km_valloc_wait(kernel_map, len);
 	if (lva == 0) {
 		sokvaunreserve(len);
 		return (0);
@@ -255,7 +255,7 @@ sokvafree(vaddr_t sva, vsize_t len)
 	 * free kva.
 	 */
 
-	uvm_km_free(kernel_map, sva, len, UVM_KMF_VAONLY);
+	uvm_km_free(kernel_map, sva, len);
 
 	/*
 	 * unreserve kva.
@@ -1405,6 +1405,11 @@ sosetopt(struct socket *so, int level, i
 				error = EINVAL;
 				goto bad;
 			}
+			if (mtod(m, struct linger *)->l_linger < 0 ||
+			    mtod(m, struct linger *)->l_linger > (INT_MAX / hz)) {
+				error = EDOM;
+				goto bad;
+			}
 			so->so_linger = mtod(m, struct linger *)->l_linger;
 			/* fall thru... */