v2.12r-20

diff --git a/debian/changelog b/debian/changelog
index 0f2d75a63b51eaab7d5c5c996534066203be96e5..126dfd2f16e63e20efbe382cb2357b9181ca3cb9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+util-linux (2.12r-20) unstable-UNRELEASED; urgency=low
+
+  * USB unmounting dereferenced a null pointer.  Closes: #410031
+    - Files: 70fstab.dpatch
+
+ -- LaMont Jones <lamont@debian.org>  Sun, 17 Jun 2007 06:01:46 -0600
+
 util-linux (2.12r-19) unstable; urgency=low
 
   * mips/mipsel buildds use sudo.  Fix install target so that mount.deb

diff --git a/debian/patches/.10mount.dpatch.swp b/debian/patches/.10mount.dpatch.swp
new file mode 100644 (file)
index 0000000..2a15d56
Binary files /dev/null and b/debian/patches/.10mount.dpatch.swp differ

diff --git a/debian/patches/00list b/debian/patches/00list
index ebf9130adaaa88385661c4c047e0907e2449dbb5..27e30e66f5300529c9ab5fbb3dfc2dd95462da72 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -21,3 +21,4 @@
 60_opt_O1
 65_llseek-syscall
 65page_size
+70fstab

diff --git a/debian/patches/70fstab.dpatch b/debian/patches/70fstab.dpatch
new file mode 100755 (executable)
index 0000000..2fbc1f0
--- /dev/null
+++ b/debian/patches/70fstab.dpatch
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fstab.c.dpatch by  <s@hosenscheisser>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad util-linux-2.12r~/mount/fstab.c util-linux-2.12r/mount/fstab.c
+--- util-linux-2.12r~/mount/fstab.c    2004-12-21 20:09:24.000000000 +0100
++++ util-linux-2.12r/mount/fstab.c     2007-06-05 08:33:15.000000000 +0200
+@@ -293,12 +293,16 @@
+ 
+ static int
+ has_uuid(const char *device, const char *uuid){
+-      const char *devuuid;
++      const char *devname;
+       int ret;
+ 
+-      devuuid = mount_get_devname_by_uuid(device);
+-      ret = !strcmp(uuid, devuuid);
+-      /* free(devuuid); */
++      devname = mount_get_devname_by_uuid(uuid);
++      /* mount_get_devname_by_uuid return 0 when not found */
++      if (devname)
++              ret = !strcmp(device, devname);
++      else
++              ret = 0;
++      /* free(devname); */
+       return ret;
+ }
+