[Glibc-bsd-commits] r5436 - in trunk/freebsd-buildutils/debian: . patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-02-21 19:35:59 +0000 (Fri, 21 Feb 2014)
New Revision: 5436

Added:
   trunk/freebsd-buildutils/debian/patches/kldxref_abort_on_error.diff
Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/patches/series
Log:
kldxref_abort_on_error.diff: Treat EFAULT condition as fatal (see comment in patch header).

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2014-02-21 16:51:56 UTC (rev 5435)
+++ trunk/freebsd-buildutils/debian/changelog	2014-02-21 19:35:59 UTC (rev 5436)
@@ -1,3 +1,10 @@
+freebsd-buildutils (10.0-3) unstable; urgency=low
+
+  * kldxref_abort_on_error.diff: Treat EFAULT condition as fatal (see
+    comment in patch header).
+
+ -- Robert Millan <rmh at debian.org>  Fri, 21 Feb 2014 20:31:13 +0100
+
 freebsd-buildutils (10.0-2) unstable; urgency=low
 
   * Adjust LIBDATADIR, LIBEXECDIR and LINTLIBDIR for FHS conformance.

Added: trunk/freebsd-buildutils/debian/patches/kldxref_abort_on_error.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/kldxref_abort_on_error.diff	                        (rev 0)
+++ trunk/freebsd-buildutils/debian/patches/kldxref_abort_on_error.diff	2014-02-21 19:35:59 UTC (rev 5436)
@@ -0,0 +1,25 @@
+
+With kldxref from 10.0-2, this warnc() reports EFAULT, rendering the
+output useless. However this is no longer reproducible after rebuilding
+10.0-2 with recent unstable. Let's treat this warnc() as fatal so that
+at least we know if/when trouble comes back.
+
+It's probably related to offset types (Elf_Off / off_t). Unfortunately
+I haven't been able to diagnose it:
+
+$ kldxref -dv /tmp/t/
+/tmp/t/drm2.ko
+kldxref: ef_seg_read_rel(/tmp/t/drm2.ko): bad offset/len (4800000130808b48:33)
+kldxref: error while reading /tmp/t/drm2.ko: Bad address
+
+--- a/src/usr.sbin/kldxref/kldxref.c
++++ b/src/usr.sbin/kldxref/kldxref.c
+@@ -230,7 +230,7 @@
+ 			parse_entry(&md, cval, &ef, kldname);
+ 		}
+ 		if (error)
+-			warnc(error, "error while reading %s", filename);
++			errc(error, "error while reading %s", filename);
+ 		free(orgp);
+ 	} while(0);
+ 	EF_CLOSE(&ef);

Modified: trunk/freebsd-buildutils/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series	2014-02-21 16:51:56 UTC (rev 5435)
+++ trunk/freebsd-buildutils/debian/patches/series	2014-02-21 19:35:59 UTC (rev 5436)
@@ -3,6 +3,7 @@
 # Patches that are in good shape for merging upstream
 mk_ncp.diff
 yacc_is_byacc.diff
+kldxref_abort_on_error.diff
 
 # Other patches that might or might not be mergeable
 00_upstream.diff
@@ -25,3 +26,4 @@
 avoid_defsyspath_collision.diff
 aicasm.diff
 makefiles.diff
+#test