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.97.2.1 retrieving revision 1.97.2.1.2.3 diff -u -p -r1.97.2.1 -r1.97.2.1.2.3 --- src/sys/kern/uipc_socket.c 2004/05/26 20:14:40 1.97.2.1 +++ src/sys/kern/uipc_socket.c 2005/10/28 19:26:22 1.97.2.1.2.3 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.97.2.1 2004/05/26 20:14:40 he Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.97.2.1.2.3 2005/10/28 19:26:22 jmc Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -68,7 +68,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.97.2.1 2004/05/26 20:14:40 he Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.97.2.1.2.3 2005/10/28 19:26:22 jmc Exp $"); #include "opt_sock_counters.h" #include "opt_sosend_loan.h" @@ -1391,6 +1391,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... */