From patchwork Tue Jul 26 23:58:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Schmitz X-Patchwork-Id: 12929931 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A33FC19F2B for ; Tue, 26 Jul 2022 23:58:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240017AbiGZX6T (ORCPT ); Tue, 26 Jul 2022 19:58:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240008AbiGZX6S (ORCPT ); Tue, 26 Jul 2022 19:58:18 -0400 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67000286F9; Tue, 26 Jul 2022 16:58:17 -0700 (PDT) Received: by mail-pl1-x630.google.com with SMTP id x1so12967098plb.3; Tue, 26 Jul 2022 16:58:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=A3910st5lAPxa3eOzPeoaXcmTzbCAY5r2x+4hDwdkxs=; b=aaH/YjD1lqu+XfKnHDWQRwD8Qptq2u3XC0I07I3yyiP/GtcZVbfNViuxWIaj0eBDVo SJVsnTanj1uWpWNcTtMWKHdVRkiR3UtttMVsfEZfNBIMAnZuGSFSnyVRybk2s1qWGm3O VoKg689aYVko1I2lf5+FITy54IDEhW7Tx6MG6fq71bYFVZf7CkrCgjd/2kkhgwXYYcQ/ yVpGvLwDDLYvQPDrxzEoYy8ryLwP3Q78NxKSYaZa7p6zgmpGpgIiur6GqWgK2cPb8qdF 3SfQtXiFzMMH2zqr6OjtOoBvOC2xDxSh8w9BPoiy8vJhUxjlGxGGUWXTyywKrfK7xQAg H3Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=A3910st5lAPxa3eOzPeoaXcmTzbCAY5r2x+4hDwdkxs=; b=CePKQ8nGe1pROQHuvh86l/sQlfopyNAd/lpuC58OmEfFUMnZc8Zc6f18456X21tDnY ZYzxyck6NVWJSOSuSa61AxZT3/Vh2VeVQv/Y0h3nlr8Uj7khwnpq/hQXFmh4HMYfR9V9 UpzG+/DhPIOEOpvXq1Q490a24aZrL+q4OiGOScEzR06BUqUfOQBKfMLG+MWtXNgq54qR FjJI76twTZxlCmjktqJdXV1mqt7njkOcPTVLY9zFdfW5fhww+lvsKQgEzBFaKG3B3ty5 r4KcGqJSSVRSuT7bDatweXynILsgmOjKcv4sFhFgrK6dcB3mrhp16EYSxGCTuODw1BBi 73mw== X-Gm-Message-State: AJIora+zyzT9ymuA8TSBydt2tAKNmTwUW6i7fcPBGoRgwqLqtisckKNP kAPeHp7ExGoLMDpTiWnM9VycbcnXC0s= X-Google-Smtp-Source: AGRyM1v6NaOVoKeutE2D9L0qvAtWByDFksn11+1URfoL4lSPnc6i7FNrKZ49rxzR6IwWwQq4RkjG6Q== X-Received: by 2002:a17:903:40c5:b0:16d:35e6:c561 with SMTP id t5-20020a17090340c500b0016d35e6c561mr19546374pld.12.1658879896853; Tue, 26 Jul 2022 16:58:16 -0700 (PDT) Received: from xplor.waratah.dyndns.org (222-155-0-244-adsl.sparkbb.co.nz. [222.155.0.244]) by smtp.gmail.com with ESMTPSA id e30-20020aa798de000000b0052ab8a92496sm12225654pfm.168.2022.07.26.16.58.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jul 2022 16:58:16 -0700 (PDT) Received: by xplor.waratah.dyndns.org (Postfix, from userid 1000) id D13CF360326; Wed, 27 Jul 2022 11:58:12 +1200 (NZST) From: Michael Schmitz To: linux-block@vger.kernel.org, axboe@kernel.dk Cc: linux-m68k@vger.kernel.org, geert@linux-m68k.org, hch@lst.de, Michael Schmitz Subject: [PATCH v9 1/2] block: fix signed int overflow in Amiga partition support Date: Wed, 27 Jul 2022 11:58:08 +1200 Message-Id: <20220726235809.15215-2-schmitzmic@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220726235809.15215-1-schmitzmic@gmail.com> References: <20220726235809.15215-1-schmitzmic@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org The Amiga partition parser module uses signed int for partition sector address and count, which will overflow for disks larger than 1 TB. Use sector_t as type for sector address and size to allow using disks up to 2 TB without LBD support, and disks larger than 2 TB with LBD. This bug was reported originally in 2012, and the fix was created by the RDB author, Joanne Dow . A patch had been discussed and reviewed on linux-m68k at that time but never officially submitted. This patch differs from Joanne's patch only in its use of sector_t instead of unsigned int. No checking for overflows is done (see patch 2 of this series for that). Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=43511 Reported-by: Martin Steigerwald Message-ID: <201206192146.09327.Martin@lichtvoll.de> Signed-off-by: Michael Schmitz Tested-by: Martin Steigerwald Reviewed-by: Geert Uytterhoeven Reviewed-by: Christoph Hellwig --- Changes from v3: - split off change of sector address type as quick fix. - cast to sector_t in sector address calculations. - move overflow checking to separate patch for more thorough review. Changes from v4: Andreas Schwab: - correct cast to sector_t in sector address calculations Changes from v7: Christoph Hellwig - correct style issues --- block/partitions/amiga.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/block/partitions/amiga.c b/block/partitions/amiga.c index 5c8624e26a54..85c5c79aae48 100644 --- a/block/partitions/amiga.c +++ b/block/partitions/amiga.c @@ -31,7 +31,8 @@ int amiga_partition(struct parsed_partitions *state) unsigned char *data; struct RigidDiskBlock *rdb; struct PartitionBlock *pb; - int start_sect, nr_sects, blk, part, res = 0; + sector_t start_sect, nr_sects; + int blk, part, res = 0; int blksize = 1; /* Multiplier for disk block size */ int slot = 1; @@ -96,14 +97,14 @@ int amiga_partition(struct parsed_partitions *state) /* Tell Kernel about it */ - nr_sects = (be32_to_cpu(pb->pb_Environment[10]) + 1 - - be32_to_cpu(pb->pb_Environment[9])) * + nr_sects = ((sector_t)be32_to_cpu(pb->pb_Environment[10]) + 1 - + be32_to_cpu(pb->pb_Environment[9])) * be32_to_cpu(pb->pb_Environment[3]) * be32_to_cpu(pb->pb_Environment[5]) * blksize; if (!nr_sects) continue; - start_sect = be32_to_cpu(pb->pb_Environment[9]) * + start_sect = (sector_t)be32_to_cpu(pb->pb_Environment[9]) * be32_to_cpu(pb->pb_Environment[3]) * be32_to_cpu(pb->pb_Environment[5]) * blksize; From patchwork Tue Jul 26 23:58:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Schmitz X-Patchwork-Id: 12929932 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E05B7C19F2A for ; Tue, 26 Jul 2022 23:58:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240008AbiGZX6U (ORCPT ); Tue, 26 Jul 2022 19:58:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229458AbiGZX6S (ORCPT ); Tue, 26 Jul 2022 19:58:18 -0400 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C25DC28700; Tue, 26 Jul 2022 16:58:17 -0700 (PDT) Received: by mail-pj1-x1031.google.com with SMTP id f11-20020a17090a4a8b00b001f2f7e32d03so1977450pjh.0; Tue, 26 Jul 2022 16:58:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CJX/Wn9DYCDCQoZrqKrx/qoE+nVqmeYVuWrKqHfu8Ak=; b=Iq9qXR8WxgfVbAbrhSmyvgdlFd48JzwR72ZpHd5+mSMhnBxsm9KUul4yqc+jDt8+Jq q8OALhyPNwwM/jWRneVfZr6rL6VUwSuZzbYib/IovJZtOLTMuVKy7YyfJERqtKS7MDEU k4mrwKn7XbGiVK5acAThctU3ind4GdeUvvofxnVleBNBbj00ZXvmyXxph8mjJo9we+wP 3Cfc9WvagQcYz/rKdD6HL9I8YCFQd2aLE+1vCRaHQnoIi+bhBw1In+FhaD6iS39vPGhC /YjkqT04kbnk2KPu7/T+nnvpKKjdxcjPNseAnYAV8gRcJ9Uyus+ZTruuY6AiAuIO6Z8B wpjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=CJX/Wn9DYCDCQoZrqKrx/qoE+nVqmeYVuWrKqHfu8Ak=; b=BiGig14rgbLg4eAHnpJu3jpEQBcDPPX/nMRfNQzU4U9itd/qoOTrno1hm9WjUk/kEK s840nSgoBs0wV/0p4YGzhZIXga494Pw5i26aro1OnJaz7W1TBF3EnAoHtrXl6eTFFaUQ BDBE1hLdS4XtgP7sEk+SgY/Qiop8VjMNqmDQMxzPGN67NmL1bdcccRBkp1GjrT1Wi9Hs dbsL9hgYuz5yZVNdlI/mOty4HlWS/N4KhvSyLRykpm9Me/9/JTSXOOlBReogfmCNjxFd 54uh7VLJ5q31alMTXvSRkBISyNvATS01DxDHhO2WY9B69L8yX6Y7z4AmMZzv6E0da2Wl aE0A== X-Gm-Message-State: AJIora9rshXx8KEwjUhBrx88dAUf4x+eCOr/OqCW8wBr7dCY2RzcQTiu l+OQYWWhecbZF9ZmTKpXKCsvrsJtQmU= X-Google-Smtp-Source: AGRyM1tIVvykSUtGz0wW4kJKR1YzmfbEwPn7QrMkmBPCnKCl1M7fWPAytQgQY3qa+Z8k8GGPedbwmg== X-Received: by 2002:a17:90b:4d12:b0:1f2:ad15:3ee8 with SMTP id mw18-20020a17090b4d1200b001f2ad153ee8mr1517612pjb.82.1658879897133; Tue, 26 Jul 2022 16:58:17 -0700 (PDT) Received: from xplor.waratah.dyndns.org (222-155-0-244-adsl.sparkbb.co.nz. [222.155.0.244]) by smtp.gmail.com with ESMTPSA id y22-20020a170902b49600b0016c5306917fsm12128754plr.53.2022.07.26.16.58.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jul 2022 16:58:16 -0700 (PDT) Received: by xplor.waratah.dyndns.org (Postfix, from userid 1000) id 61662360333; Wed, 27 Jul 2022 11:58:13 +1200 (NZST) From: Michael Schmitz To: linux-block@vger.kernel.org, axboe@kernel.dk Cc: linux-m68k@vger.kernel.org, geert@linux-m68k.org, hch@lst.de, Michael Schmitz Subject: [PATCH v9 2/2] block: add overflow checks for Amiga partition support Date: Wed, 27 Jul 2022 11:58:09 +1200 Message-Id: <20220726235809.15215-3-schmitzmic@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220726235809.15215-1-schmitzmic@gmail.com> References: <20220726235809.15215-1-schmitzmic@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org The Amiga partition parser module uses signed int for partition sector address and count, which will overflow for disks larger than 1 TB. Use u64 as type for sector address and size to allow using disks up to 2 TB without LBD support, and disks larger than 2 TB with LBD. The RBD format allows to specify disk sizes up to 2^128 bytes (though native OS limitations reduce this somewhat, to max 2^68 bytes), so check for u64 overflow carefully to protect against overflowing sector_t. Bail out if sector addresses overflow 32 bits on kernels without LBD support. This bug was reported originally in 2012, and the fix was created by the RDB author, Joanne Dow . A patch had been discussed and reviewed on linux-m68k at that time but never officially submitted (now resubmitted as separate patch). This patch adds additional error checking and warning messages. Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=43511 Reported-by: Martin Steigerwald Message-ID: <201206192146.09327.Martin@lichtvoll.de> Signed-off-by: Michael Schmitz Reviewed-by: Geert Uytterhoeven --- Changes from RFC: - use u64 instead of sector_t, since that may be u32 without LBD support - check multiplication overflows each step - 3 u32 values may exceed u64! - warn against use on AmigaDOS if partition data overflow u32 sector count. - warn if partition CylBlocks larger than what's stored in the RDSK header. - bail out if we were to overflow sector_t (32 or 64 bit). Changes from v1: Kars de Jong: - use defines for magic offsets in DosEnvec struct Geert Uytterhoeven: - use u64 cast for multiplications of u32 numbers - use array3_size for overflow checks - change pr_err to pr_warn - discontinue use of pr_cont - reword log messages - drop redundant nr_sects overflow test - warn against 32 bit overflow for each affected partition - skip partitions that overflow sector_t size instead of aborting scan Changes from v2: - further trim 32 bit overflow test - correct duplicate types.h inclusion introduced in v2 Changes from v3: - split off sector address type fix for independent review - change blksize to unsigned - use check_mul_overflow() instead of array3_size() - rewrite checks to avoid 64 bit divisions in check_mul_overflow() Changes from v5: Geert Uytterhoeven: - correct ineffective u64 cast to avoid 32 bit mult. overflow - fix mult. overflow in partition block address calculation Changes from v6: Geert Uytterhoeven: - don't fail hard on partition block address overflow Changes from v7: - replace bdevname(state->bdev, b) by state->disk->disk_name - drop warn_no_part conditionals - remove remaining warn_no_part Changes from v8: Christoph Hellwig: - whitespace fix, drop unnecessary u64 casts kbuid warning: - sparse warning fix --- block/partitions/amiga.c | 103 ++++++++++++++++++++++++++++++++------- 1 file changed, 85 insertions(+), 18 deletions(-) diff --git a/block/partitions/amiga.c b/block/partitions/amiga.c index 85c5c79aae48..e28a4b917822 100644 --- a/block/partitions/amiga.c +++ b/block/partitions/amiga.c @@ -11,10 +11,18 @@ #define pr_fmt(fmt) fmt #include +#include +#include #include #include "check.h" +/* magic offsets in partition DosEnvVec */ +#define NR_HD 3 +#define NR_SECT 5 +#define LO_CYL 9 +#define HI_CYL 10 + static __inline__ u32 checksum_block(__be32 *m, int size) { @@ -31,9 +39,12 @@ int amiga_partition(struct parsed_partitions *state) unsigned char *data; struct RigidDiskBlock *rdb; struct PartitionBlock *pb; - sector_t start_sect, nr_sects; - int blk, part, res = 0; - int blksize = 1; /* Multiplier for disk block size */ + u64 start_sect, nr_sects; + sector_t blk, end_sect; + u32 cylblk; /* rdb_CylBlocks = nr_heads*sect_per_track */ + u32 nr_hd, nr_sect, lo_cyl, hi_cyl; + int part, res = 0; + unsigned int blksize = 1; /* Multiplier for disk block size */ int slot = 1; for (blk = 0; ; blk++, put_dev_sector(sect)) { @@ -41,7 +52,7 @@ int amiga_partition(struct parsed_partitions *state) goto rdb_done; data = read_part_sector(state, blk, §); if (!data) { - pr_err("Dev %s: unable to read RDB block %d\n", + pr_err("Dev %s: unable to read RDB block %llu\n", state->disk->disk_name, blk); res = -1; goto rdb_done; @@ -58,12 +69,12 @@ int amiga_partition(struct parsed_partitions *state) *(__be32 *)(data+0xdc) = 0; if (checksum_block((__be32 *)data, be32_to_cpu(rdb->rdb_SummedLongs) & 0x7F)==0) { - pr_err("Trashed word at 0xd0 in block %d ignored in checksum calculation\n", + pr_err("Trashed word at 0xd0 in block %llu ignored in checksum calculation\n", blk); break; } - pr_err("Dev %s: RDB in block %d has bad checksum\n", + pr_err("Dev %s: RDB in block %llu has bad checksum\n", state->disk->disk_name, blk); } @@ -80,10 +91,15 @@ int amiga_partition(struct parsed_partitions *state) blk = be32_to_cpu(rdb->rdb_PartitionList); put_dev_sector(sect); for (part = 1; blk>0 && part<=16; part++, put_dev_sector(sect)) { - blk *= blksize; /* Read in terms partition table understands */ + /* Read in terms partition table understands */ + if (check_mul_overflow(blk, (sector_t) blksize, &blk)) { + pr_err("Dev %s: overflow calculating partition block %llu! Skipping partitions %u and beyond\n", + state->disk->disk_name, blk, part); + break; + } data = read_part_sector(state, blk, §); if (!data) { - pr_err("Dev %s: unable to read partition block %d\n", + pr_err("Dev %s: unable to read partition block %llu\n", state->disk->disk_name, blk); res = -1; goto rdb_done; @@ -95,19 +111,70 @@ int amiga_partition(struct parsed_partitions *state) if (checksum_block((__be32 *)pb, be32_to_cpu(pb->pb_SummedLongs) & 0x7F) != 0 ) continue; - /* Tell Kernel about it */ + /* RDB gives us more than enough rope to hang ourselves with, + * many times over (2^128 bytes if all fields max out). + * Some careful checks are in order, so check for potential + * overflows. + * We are multiplying four 32 bit numbers to one sector_t! + */ + + nr_hd = be32_to_cpu(pb->pb_Environment[NR_HD]); + nr_sect = be32_to_cpu(pb->pb_Environment[NR_SECT]); + + /* CylBlocks is total number of blocks per cylinder */ + if (check_mul_overflow(nr_hd, nr_sect, &cylblk)) { + pr_err("Dev %s: heads*sects %u overflows u32, skipping partition!\n", + state->disk->disk_name, cylblk); + continue; + } + + /* check for consistency with RDB defined CylBlocks */ + if (cylblk > be32_to_cpu((__be32)rdb->rdb_CylBlocks)) { + pr_warn("Dev %s: cylblk %u > rdb_CylBlocks %u!\n", + state->disk->disk_name, cylblk, + be32_to_cpu(rdb->rdb_CylBlocks)); + } + + /* RDB allows for variable logical block size - + * normalize to 512 byte blocks and check result. + */ + + if (check_mul_overflow(cylblk, blksize, &cylblk)) { + pr_err("Dev %s: partition %u bytes per cyl. overflows u32, skipping partition!\n", + state->disk->disk_name, part); + continue; + } + + /* Calculate partition start and end. Limit of 32 bit on cylblk + * guarantees no overflow occurs if LBD support is enabled. + */ + + lo_cyl = be32_to_cpu(pb->pb_Environment[LO_CYL]); + start_sect = ((u64) lo_cyl * cylblk); + + hi_cyl = be32_to_cpu(pb->pb_Environment[HI_CYL]); + nr_sects = (((u64) hi_cyl - lo_cyl + 1) * cylblk); - nr_sects = ((sector_t)be32_to_cpu(pb->pb_Environment[10]) + 1 - - be32_to_cpu(pb->pb_Environment[9])) * - be32_to_cpu(pb->pb_Environment[3]) * - be32_to_cpu(pb->pb_Environment[5]) * - blksize; if (!nr_sects) continue; - start_sect = (sector_t)be32_to_cpu(pb->pb_Environment[9]) * - be32_to_cpu(pb->pb_Environment[3]) * - be32_to_cpu(pb->pb_Environment[5]) * - blksize; + + /* Warn user if partition end overflows u32 (AmigaDOS limit) */ + + if ((start_sect + nr_sects) > UINT_MAX) { + pr_warn("Dev %s: partition %u (%llu-%llu) needs 64 bit device support!\n", + state->disk->disk_name, part, + start_sect, start_sect + nr_sects); + } + + if (check_add_overflow(start_sect, nr_sects, &end_sect)) { + pr_err("Dev %s: partition %u (%llu-%llu) needs LBD device support, skipping partition!\n", + state->disk->disk_name, part, + start_sect, end_sect); + continue; + } + + /* Tell Kernel about it */ + put_partition(state,slot++,start_sect,nr_sects); { /* Be even more informative to aid mounting */