diff options
| author | Richard <richard@aaazen.com> | 2017-05-21 12:27:00 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-17 06:41:49 +0200 |
| commit | 220b67a16fde7187fae7efcc6809d658e4c49525 (patch) | |
| tree | ed04596369ee036dfcbfbc1417e354564e56c271 | |
| parent | 7a7b2d5f65a7a12c4f5d43fb10913ca908102833 (diff) | |
| download | linux-stable-220b67a16fde7187fae7efcc6809d658e4c49525.tar.gz linux-stable-220b67a16fde7187fae7efcc6809d658e4c49525.tar.bz2 linux-stable-220b67a16fde7187fae7efcc6809d658e4c49525.zip | |
partitions/msdos: FreeBSD UFS2 file systems are not recognized
commit 223220356d5ebc05ead9a8d697abb0c0a906fc81 upstream.
The code in block/partitions/msdos.c recognizes FreeBSD, OpenBSD
and NetBSD partitions and does a reasonable job picking out OpenBSD
and NetBSD UFS subpartitions.
But for FreeBSD the subpartitions are always "bad".
Kernel: <bsd:bad subpartition - ignored
Though all 3 of these BSD systems use UFS as a file system, only
FreeBSD uses relative start addresses in the subpartition
declarations.
The following patch fixes this for FreeBSD partitions and leaves
the code for OpenBSD and NetBSD intact:
Signed-off-by: Richard Narron <comet.berkeley@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | block/partitions/msdos.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/partitions/msdos.c b/block/partitions/msdos.c index 93e7c1b32edd..5610cd537da7 100644 --- a/block/partitions/msdos.c +++ b/block/partitions/msdos.c @@ -300,6 +300,8 @@ static void parse_bsd(struct parsed_partitions *state, continue; bsd_start = le32_to_cpu(p->p_offset); bsd_size = le32_to_cpu(p->p_size); + if (memcmp(flavour, "bsd\0", 4) == 0) + bsd_start += offset; if (offset == bsd_start && size == bsd_size) /* full parent partition, we have it already */ continue; |