[Glibc-bsd-commits] r3735 - in trunk/kfreebsd-8/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-10-16 09:34:45 +0000 (Sun, 16 Oct 2011)
New Revision: 3735

Added:
   trunk/kfreebsd-8/debian/patches/000_unix_socket_overflow.diff
Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/patches/series
Log:
  * 000_unix_socket_overflow.diff: Fix for FreeBSD-SA-11:05.unix.
    (Closes: #645377)

Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2011-10-16 08:43:02 UTC (rev 3734)
+++ trunk/kfreebsd-8/debian/changelog	2011-10-16 09:34:45 UTC (rev 3735)
@@ -1,3 +1,10 @@
+kfreebsd-8 (8.2-9) unstable; urgency=high
+
+  * 000_unix_socket_overflow.diff: Fix for FreeBSD-SA-11:05.unix.
+    (Closes: #645377)
+
+ -- Robert Millan <rmh at debian.org>  Sun, 16 Oct 2011 10:44:30 +0200
+
 kfreebsd-8 (8.2-8) unstable; urgency=high
 
   [ Petr Salinger ]

Added: trunk/kfreebsd-8/debian/patches/000_unix_socket_overflow.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/000_unix_socket_overflow.diff	                        (rev 0)
+++ trunk/kfreebsd-8/debian/patches/000_unix_socket_overflow.diff	2011-10-16 09:34:45 UTC (rev 3735)
@@ -0,0 +1,20 @@
+--- a/sys/kern/uipc_usrreq.c
++++ b/sys/kern/uipc_usrreq.c
+@@ -419,6 +419,8 @@
+ 	unp = sotounpcb(so);
+ 	KASSERT(unp != NULL, ("uipc_bind: unp == NULL"));
+ 
++	if (soun->sun_len > sizeof(struct sockaddr_un))
++		return (EINVAL);
+ 	namelen = soun->sun_len - offsetof(struct sockaddr_un, sun_path);
+ 	if (namelen <= 0)
+ 		return (EINVAL);
+@@ -1165,6 +1167,8 @@
+ 	unp = sotounpcb(so);
+ 	KASSERT(unp != NULL, ("unp_connect: unp == NULL"));
+ 
++	if (nam->sa_len > sizeof(struct sockaddr_un))
++		return (EINVAL);
+ 	len = nam->sa_len - offsetof(struct sockaddr_un, sun_path);
+ 	if (len <= 0)
+ 		return (EINVAL);

Modified: trunk/kfreebsd-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series	2011-10-16 08:43:02 UTC (rev 3734)
+++ trunk/kfreebsd-8/debian/patches/series	2011-10-16 09:34:45 UTC (rev 3735)
@@ -4,6 +4,7 @@
 000_net80211_disclosure.diff
 000_uhid_nomatch.diff
 000_proc_swaps.diff
+000_unix_socket_overflow.diff
 001_misc.diff
 002_maxpathlen.diff
 003_glibc_dev_aicasm.diff