[Glibc-bsd-commits] r3745 - trunk/kfreebsd-8/debian/patches

[Aurelien Jarno]

Author: aurel32
Date: 2011-10-19 07:26:17 +0000 (Wed, 19 Oct 2011)
New Revision: 3745

Modified:
   trunk/kfreebsd-8/debian/patches/000_unix_socket_overflow.diff
Log:
Refresh 000_unix_socket_overflow.diff



Modified: trunk/kfreebsd-8/debian/patches/000_unix_socket_overflow.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/000_unix_socket_overflow.diff	2011-10-19 07:17:10 UTC (rev 3744)
+++ trunk/kfreebsd-8/debian/patches/000_unix_socket_overflow.diff	2011-10-19 07:26:17 UTC (rev 3745)
@@ -17,9 +17,10 @@
 +		return (EINVAL);
  	len = nam->sa_len - offsetof(struct sockaddr_un, sun_path);
  	if (len <= 0)
+ 		return (EINVAL);
 --- a/sys/compat/linux/linux_socket.c
 +++ b/sys/compat/linux/linux_socket.c
-@@ -104,6 +104,7 @@
+@@ -103,6 +103,7 @@
  	int oldv6size;
  	struct sockaddr_in6 *sin6;
  #endif
@@ -27,7 +28,7 @@
  
  	if (*osalen < 2 || *osalen > UCHAR_MAX || !osa)
  		return (EINVAL);
-@@ -166,6 +167,20 @@
+@@ -165,6 +166,20 @@
  		}
  	}
  
@@ -47,4 +48,4 @@
 +
  	sa = (struct sockaddr *) kosa;
  	sa->sa_family = bdom;
- 	sa->sa_len = alloclen;		return (EINVAL);
+ 	sa->sa_len = alloclen;