[Midnightbsd-cvs] src [7557] stable/0.8/sys: Security patches

[laffer1 at midnightbsd.org]

Revision: 7557
          http://svnweb.midnightbsd.org/src/?rev=7557
Author:   laffer1
Date:     2016-05-19 08:41:24 -0400 (Thu, 19 May 2016)
Log Message:
-----------
Security patches

Modified Paths:
--------------
    stable/0.8/sys/dev/kbd/kbd.c
    stable/0.8/sys/kern/uipc_syscalls.c

Modified: stable/0.8/sys/dev/kbd/kbd.c
===================================================================
--- stable/0.8/sys/dev/kbd/kbd.c	2016-05-19 12:39:40 UTC (rev 7556)
+++ stable/0.8/sys/dev/kbd/kbd.c	2016-05-19 12:41:24 UTC (rev 7557)
@@ -996,7 +996,7 @@
 			splx(s);
 			return (error);
 		}
-		kbd->kb_fkeytab[fkeyp->keynum].len = imin(fkeyp->flen, MAXFK);
+		kbd->kb_fkeytab[fkeyp->keynum].len = min(fkeyp->flen, MAXFK);
 		bcopy(fkeyp->keydef, kbd->kb_fkeytab[fkeyp->keynum].str,
 		    kbd->kb_fkeytab[fkeyp->keynum].len);
 		break;

Modified: stable/0.8/sys/kern/uipc_syscalls.c
===================================================================
--- stable/0.8/sys/kern/uipc_syscalls.c	2016-05-19 12:39:40 UTC (rev 7556)
+++ stable/0.8/sys/kern/uipc_syscalls.c	2016-05-19 12:41:24 UTC (rev 7557)
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$MidnightBSD: src/sys/kern/uipc_syscalls.c,v 1.7 2012/10/09 04:08:16 laffer1 Exp $");
+__FBSDID("$MidnightBSD$");
 
 #include "opt_capsicum.h"
 #include "opt_inet.h"
@@ -1654,6 +1654,9 @@
 	struct mbuf *m;
 	int error;
 
+	if (buflen < 0)
+		return (EINVAL);
+
 	if ((u_int)buflen > MLEN) {
 #ifdef COMPAT_OLDSOCK
 		if (type == MT_SONAME && (u_int)buflen <= 112)