Index: user/cperciva/freebsd-update-build/patches/10.1-RELEASE/34-SA-16:18.atkbd
===================================================================
--- user/cperciva/freebsd-update-build/patches/10.1-RELEASE/34-SA-16:18.atkbd	(nonexistent)
+++ user/cperciva/freebsd-update-build/patches/10.1-RELEASE/34-SA-16:18.atkbd	(revision 300094)
@@ -0,0 +1,11 @@
+--- sys/dev/kbd/kbd.c.orig
++++ sys/dev/kbd/kbd.c
+@@ -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;
Index: user/cperciva/freebsd-update-build/patches/10.1-RELEASE/34-SA-16:19.sendmsg
===================================================================
--- user/cperciva/freebsd-update-build/patches/10.1-RELEASE/34-SA-16:19.sendmsg	(nonexistent)
+++ user/cperciva/freebsd-update-build/patches/10.1-RELEASE/34-SA-16:19.sendmsg	(revision 300094)
@@ -0,0 +1,12 @@
+--- sys/kern/uipc_syscalls.c.orig
++++ sys/kern/uipc_syscalls.c
+@@ -1699,6 +1699,9 @@
+ 	struct mbuf *m;
+ 	int error;
+ 
++	if (buflen < 0)
++		return (EINVAL);
++
+ 	if (buflen > MLEN) {
+ #ifdef COMPAT_OLDSOCK
+ 		if (type == MT_SONAME && buflen <= 112)
Index: user/cperciva/freebsd-update-build/patches/10.2-RELEASE/17-SA-16:18.atkbd
===================================================================
--- user/cperciva/freebsd-update-build/patches/10.2-RELEASE/17-SA-16:18.atkbd	(nonexistent)
+++ user/cperciva/freebsd-update-build/patches/10.2-RELEASE/17-SA-16:18.atkbd	(revision 300094)
@@ -0,0 +1,11 @@
+--- sys/dev/kbd/kbd.c.orig
++++ sys/dev/kbd/kbd.c
+@@ -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;
Index: user/cperciva/freebsd-update-build/patches/10.2-RELEASE/17-SA-16:19.sendmsg
===================================================================
--- user/cperciva/freebsd-update-build/patches/10.2-RELEASE/17-SA-16:19.sendmsg	(nonexistent)
+++ user/cperciva/freebsd-update-build/patches/10.2-RELEASE/17-SA-16:19.sendmsg	(revision 300094)
@@ -0,0 +1,12 @@
+--- sys/kern/uipc_syscalls.c.orig
++++ sys/kern/uipc_syscalls.c
+@@ -1699,6 +1699,9 @@
+ 	struct mbuf *m;
+ 	int error;
+ 
++	if (buflen < 0)
++		return (EINVAL);
++
+ 	if (buflen > MLEN) {
+ #ifdef COMPAT_OLDSOCK
+ 		if (type == MT_SONAME && buflen <= 112)
Index: user/cperciva/freebsd-update-build/patches/10.3-RELEASE/3-SA-16:18.atkbd
===================================================================
--- user/cperciva/freebsd-update-build/patches/10.3-RELEASE/3-SA-16:18.atkbd	(nonexistent)
+++ user/cperciva/freebsd-update-build/patches/10.3-RELEASE/3-SA-16:18.atkbd	(revision 300094)
@@ -0,0 +1,11 @@
+--- sys/dev/kbd/kbd.c.orig
++++ sys/dev/kbd/kbd.c
+@@ -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;
Index: user/cperciva/freebsd-update-build/patches/10.3-RELEASE/3-SA-16:19.sendmsg
===================================================================
--- user/cperciva/freebsd-update-build/patches/10.3-RELEASE/3-SA-16:19.sendmsg	(nonexistent)
+++ user/cperciva/freebsd-update-build/patches/10.3-RELEASE/3-SA-16:19.sendmsg	(revision 300094)
@@ -0,0 +1,12 @@
+--- sys/kern/uipc_syscalls.c.orig
++++ sys/kern/uipc_syscalls.c
+@@ -1699,6 +1699,9 @@
+ 	struct mbuf *m;
+ 	int error;
+ 
++	if (buflen < 0)
++		return (EINVAL);
++
+ 	if (buflen > MLEN) {
+ #ifdef COMPAT_OLDSOCK
+ 		if (type == MT_SONAME && buflen <= 112)
Index: user/cperciva/freebsd-update-build/patches/9.3-RELEASE/42-SA-16:18.atkbd
===================================================================
--- user/cperciva/freebsd-update-build/patches/9.3-RELEASE/42-SA-16:18.atkbd	(nonexistent)
+++ user/cperciva/freebsd-update-build/patches/9.3-RELEASE/42-SA-16:18.atkbd	(revision 300094)
@@ -0,0 +1,11 @@
+--- sys/dev/kbd/kbd.c.orig
++++ sys/dev/kbd/kbd.c
+@@ -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;