4.9-stable patches

added patches:
	partitions-msdos-unable-to-mount-ufs-44bsd-partitions.patch

diff --git a/queue-4.9/partitions-msdos-unable-to-mount-ufs-44bsd-partitions.patch b/queue-4.9/partitions-msdos-unable-to-mount-ufs-44bsd-partitions.patch
new file mode 100644 (file)
index 0000000..66871c7
--- /dev/null
+++ b/queue-4.9/partitions-msdos-unable-to-mount-ufs-44bsd-partitions.patch
@@ -0,0 +1,39 @@
+From 5f15684bd5e5ef39d4337988864fec8012471dda Mon Sep 17 00:00:00 2001
+From: Richard Narron <comet.berkeley@gmail.com>
+Date: Wed, 10 Jan 2018 09:12:16 -0700
+Subject: partitions/msdos: Unable to mount UFS 44bsd partitions
+
+From: Richard Narron <comet.berkeley@gmail.com>
+
+commit 5f15684bd5e5ef39d4337988864fec8012471dda upstream.
+
+UFS partitions from newer versions of FreeBSD 10 and 11 use relative
+addressing for their subpartitions. But older versions of FreeBSD still
+use absolute addressing just like OpenBSD and NetBSD.
+
+Instead of simply testing for a FreeBSD partition, the code needs to
+also test if the starting offset of the C subpartition is zero.
+
+https://bugzilla.kernel.org/show_bug.cgi?id=197733
+
+Signed-off-by: Richard Narron <comet.berkeley@gmail.com>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ block/partitions/msdos.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/block/partitions/msdos.c
++++ b/block/partitions/msdos.c
+@@ -300,7 +300,9 @@ static void parse_bsd(struct parsed_part
+                       continue;
+               bsd_start = le32_to_cpu(p->p_offset);
+               bsd_size = le32_to_cpu(p->p_size);
+-              if (memcmp(flavour, "bsd\0", 4) == 0)
++              /* FreeBSD has relative offset if C partition offset is zero */
++              if (memcmp(flavour, "bsd\0", 4) == 0 &&
++                  le32_to_cpu(l->d_partitions[2].p_offset) == 0)
+                       bsd_start += offset;
+               if (offset == bsd_start && size == bsd_size)
+                       /* full parent partition, we have it already */

diff --git a/queue-4.9/series b/queue-4.9/series
index 276ca27a31ccaa1cd0afae45442ee87c768618f2..28d59d40cd94ef61ac27ac74c1432a480ed70e05 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -8,3 +8,4 @@ ceph-only-dirty-iter_iovec-pages-for-direct-read.patch
 ipc-shm.c-add-split-function-to-shm_vm_ops.patch
 powerpc-64s-fix-lost-pending-interrupt-due-to-race-causing-lost-update-to-irq_happened.patch
 powerpc-64s-fix-i-side-slb-miss-bad-address-handler-saving-nonvolatile-gprs.patch
+partitions-msdos-unable-to-mount-ufs-44bsd-partitions.patch