Merge lp:~niedbalski/ubuntu/wily/multipath-tools/fix-lp-1469143 into lp:ubuntu/wily/multipath-tools

[Jorge Niedbalski]

Fixes LP: #1469143

[lp:~niedbalski/ubuntu/wily/multipath-tools/fix-lp-1469143]

56. By Jorge Niedbalski on 2015-06-26

Adjusted unreleased to wily

[Chris J Arges (arges)]

review: Approve

[Chris J Arges (arges)]

FYI, this should wait until 0.5.0 is released then add this on top.

[Chris J Arges (arges)]

review: Needs Resubmitting

[Mathieu Trudel-Lapierre (cyphermox)]

We have 0.5.0 in wily now, are you still interested in doing this fix? If so, could you please update this merge or provide an updated debdiff on the bug?

review: Needs Information

[Mathieu Trudel-Lapierre (cyphermox)]

So I sponsored a fix for this which seemed more solid already; closing as Rejected.

As expressed on the bug, one of the issues with the fix here is that the loopback name is too short in some cases to convey the necessary information, it is better to map it by inode.

review: Disapprove

Unmerged revisions

56. By Jorge Niedbalski on 2015-06-26

Adjusted unreleased to wily

55. By Jorge Niedbalski on 2015-06-26

d/p/1003-Fixing-the-find_loop_by_file-function-to-properly.patch:
Fixing the find_loop_by_file function to properly compare
the filename by respecting the LO_NAME_SIZE. (LP: #1469143).

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-13 09:23:29 +0000
+++ debian/changelog	2015-06-26 19:34:20 +0000
@@ -1,3 +1,11 @@
+multipath-tools (0.4.9-3ubuntu13) wily; urgency=medium
+
+  * d/p/1003-Fixing-the-find_loop_by_file-function-to-properly.patch:
+    Fixing the find_loop_by_file function to properly compare 
+    the filename by respecting the LO_NAME_SIZE. (LP: #1469143).
+
+ -- Jorge Niedbalski <[e-mail]>  Fri, 26 Jun 2015 16:21:48 -0300
+
 multipath-tools (0.4.9-3ubuntu12) vivid; urgency=medium
 
   [ Mauricio Faria de Oliveira ]

=== added file 'debian/patches/1003-Fixing-the-find_loop_by_file-function-to-properly.patch'
--- debian/patches/1003-Fixing-the-find_loop_by_file-function-to-properly.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/1003-Fixing-the-find_loop_by_file-function-to-properly.patch	2015-06-26 19:34:20 +0000
@@ -0,0 +1,30 @@
+From ae917cfc9504e613f59929fd680eb111c8eca8d0 Mon Sep 17 00:00:00 2001
+From: Jorge Niedbalski <[e-mail]>
+Date: Fri, 26 Jun 2015 15:59:25 -0300
+Subject: [PATCH] Fixing the find_loop_by_file function to properly compare the
+ filename by respecting the LO_NAME_SIZE.
+To: [e-mail]
+
+This fixes the bug reported on https://bugs.launchpad.net/ubuntu/+source/multipath-tools/+bug/1469143
+
+Signed-off-by: Jorge Niedbalski <[e-mail]>
+---
+ kpartx/lopart.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kpartx/lopart.c b/kpartx/lopart.c
+index 6f83048..e92aeed 100644
+--- a/kpartx/lopart.c
++++ b/kpartx/lopart.c
+@@ -123,7 +123,7 @@ find_loop_by_file (const char * filename)
+ 				continue;
+ 			}
+ 
+-			if (0 == strcmp(filename, loopinfo.lo_name)) {
++			if (0 == strncmp(filename, loopinfo.lo_name, strlen(loopinfo.lo_name))) {
+ 				close (fd);
+ 				return xstrdup(dev); /*found */
+ 			}
+-- 
+2.1.4
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-04-13 09:23:29 +0000
+++ debian/patches/series	2015-06-26 19:34:20 +0000
@@ -19,3 +19,4 @@
 0016-kpartx-non-512B-GPT.patch
 0017-kpartx-non-512B-sectors.patch
 0018-ext-part-gt-512B-sectors.patch
+1003-Fixing-the-find_loop_by_file-function-to-properly.patch