From: Greg Kroah-Hartman Date: Sun, 1 Apr 2018 09:50:19 +0000 (+0200) Subject: 4.15-stable patches X-Git-Tag: v3.18.103~58 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf2fab63e6b14908f5e321218db8797c60df6e0f;p=thirdparty%2Fkernel%2Fstable-queue.git 4.15-stable patches added patches: partitions-msdos-unable-to-mount-ufs-44bsd-partitions.patch --- diff --git a/queue-4.15/partitions-msdos-unable-to-mount-ufs-44bsd-partitions.patch b/queue-4.15/partitions-msdos-unable-to-mount-ufs-44bsd-partitions.patch new file mode 100644 index 00000000000..a601534bb65 --- /dev/null +++ b/queue-4.15/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 +Date: Wed, 10 Jan 2018 09:12:16 -0700 +Subject: partitions/msdos: Unable to mount UFS 44bsd partitions + +From: Richard Narron + +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 +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman + +--- + block/partitions/msdos.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/block/partitions/msdos.c ++++ b/block/partitions/msdos.c +@@ -301,7 +301,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.15/series b/queue-4.15/series index 219cdddde68..8283e7b685f 100644 --- a/queue-4.15/series +++ b/queue-4.15/series @@ -16,3 +16,4 @@ powerpc-mm-add-tracking-of-the-number-of-coprocessors-using-a-context.patch powerpc-mm-workaround-nest-mmu-bug-with-tlb-invalidations.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