[Glibc-bsd-commits] r3932 - in trunk/kfreebsd-9/debian: . patches

[Petr Salinger]

Author: ps-guest
Date: 2011-12-06 08:07:48 +0000 (Tue, 06 Dec 2011)
New Revision: 3932

Added:
   trunk/kfreebsd-9/debian/patches/201_pseudofs.diff
Modified:
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/patches/series
Log:
201_pseudofs.diff, fixes midori crash


Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2011-12-04 14:39:29 UTC (rev 3931)
+++ trunk/kfreebsd-9/debian/changelog	2011-12-06 08:07:48 UTC (rev 3932)
@@ -1,8 +1,12 @@
 kfreebsd-9 (9.0~svn227451-7) UNRELEASED; urgency=low
 
+  [ Robert Millan ]
   * 108_teken_utf8_table.diff: Fix sockets over nullfs.
   * Fix dh_clean call in udeb target.
 
+  [ Petr Salinger ]
+  * Add workaround 201_pseudofs.diff for sbuf changes, Closes: #650667.
+
  -- Robert Millan <rmh at debian.org>  Sat, 03 Dec 2011 20:54:14 +0100
 
 kfreebsd-9 (9.0~svn227451-6) unstable; urgency=high

Added: trunk/kfreebsd-9/debian/patches/201_pseudofs.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/201_pseudofs.diff	                        (rev 0)
+++ trunk/kfreebsd-9/debian/patches/201_pseudofs.diff	2011-12-06 08:07:48 UTC (rev 3932)
@@ -0,0 +1,29 @@
+
+dirty workaround for #650667
+http://www.freebsd.org/cgi/query-pr.cgi?pr=163076
+
+--- a/sys/fs/pseudofs/pseudofs_vnops.c
++++ b/sys/fs/pseudofs/pseudofs_vnops.c
+@@ -640,7 +640,7 @@
+ 	if (buflen > MAXPHYS + 1)
+ 		buflen = MAXPHYS + 1;
+ 
+-	sb = sbuf_new(sb, NULL, buflen, 0);
++	sb = sbuf_new(sb, NULL, MAXPHYS + 1, 0);
+ 	if (sb == NULL) {
+ 		error = EIO;
+ 		goto ret;
+@@ -654,7 +654,12 @@
+ 	}
+ 
+ 	sbuf_finish(sb);
+-	error = uiomove_frombuf(sbuf_data(sb), sbuf_len(sb), uio);
++	
++	if (buflen > sbuf_len(sb))
++	    buflen = sbuf_len(sb);
++	else
++	    buflen--;    
++	error = uiomove_frombuf(sbuf_data(sb), buflen, uio);
+ 	sbuf_delete(sb);
+ ret:
+ 	vn_lock(vn, locked | LK_RETRY);

Modified: trunk/kfreebsd-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-9/debian/patches/series	2011-12-04 14:39:29 UTC (rev 3931)
+++ trunk/kfreebsd-9/debian/patches/series	2011-12-06 08:07:48 UTC (rev 3932)
@@ -11,6 +11,7 @@
 108_teken_utf8_table.diff
 109_linprocfs_non_x86.diff
 110_disable_trampoline_flavour.diff
+201_pseudofs.diff
 901_disable_optimization_2.diff
 902_version.diff
 903_disable_non-free_drivers.diff