From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934557AbdKGO5C (ORCPT ); Tue, 7 Nov 2017 09:57:02 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:50841 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933803AbdKGO5B (ORCPT ); Tue, 7 Nov 2017 09:57:01 -0500 X-Google-Smtp-Source: ABhQp+QATQ6dFW+kzeqwuVmtGfKWlYx01GJ3F0aulleyGsqqyyV2LceKp7KP/kOCFXRzmGvYsX0/UA== Date: Tue, 7 Nov 2017 06:56:55 -0800 (PST) From: Richard Narron X-X-Sender: comet.berkeley@joy.test To: Jens Axboe cc: linux-kernel@vger.kernel.org Subject: [PATCH 1/1] partitions/msdos: Unable to mount UFS 44bsd partitions Message-ID: User-Agent: Alpine 2.21 (LNX 202 2017-01-01) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- --- a/block/partitions/msdos.c.orig 2017-11-05 13:05:14.000000000 -0800 +++ b/block/partitions/msdos.c 2017-11-06 09:46:00.148228242 -0800 @@ -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 */