From patchwork Fri Oct 12 00:26:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Schmitz X-Patchwork-Id: 10637673 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9B7A61869 for ; Fri, 12 Oct 2018 00:27:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 87F5D2C393 for ; Fri, 12 Oct 2018 00:27:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7C4F02C39C; Fri, 12 Oct 2018 00:27:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CB5412C393 for ; Fri, 12 Oct 2018 00:27:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727042AbeJLH4t (ORCPT ); Fri, 12 Oct 2018 03:56:49 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:45262 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725913AbeJLH4t (ORCPT ); Fri, 12 Oct 2018 03:56:49 -0400 Received: by mail-pl1-f195.google.com with SMTP id y15-v6so5003710plr.12; Thu, 11 Oct 2018 17:27:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=t3MrGmdl15OY3M1gJ9KysolTZ4TTEYl2+Jr4hXsrwyU=; b=m0iRJqGiBaeNoR6GvixXKfDz8M4Cj2sMBo6UlsMHBxoS7m2kliQdJ3aWhsHGmsmGfO ia9v+qq32f758G+1qvb5gWxt70BNyZp4fY2RtSOpFPLdKpEFfvbpL6YJVerXPTUIwm5z 3Nl3mVBHjDAQ8WhxhTYZf5ex/pif8Kz3MzZd5JmQgZfAOb16CxtZZJcpo3KFcUUG8AtJ +vO9txyukJNMiP3fT1s7yy2evk+wl3iqV/V45CW7dUR1vbePxLYCcMLdPDP8icFleyZo BJDudBqFmMW3qjvYXuf7bOiWvT9dICtyfL9xauBFqFv+yTo77zK5wABcFRJ5MQaQZPoa u5zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=t3MrGmdl15OY3M1gJ9KysolTZ4TTEYl2+Jr4hXsrwyU=; b=KT37ZjFiK8dH2mHISUVetDNiMBv4m5vVXk5d2O5IvzJr8soxshqCQca6NFxiHvVtLp 499OkUSNdHAH9eifn2gXYfqf1DAvjN+u3dQhxM5DtLlWgAVAH4KzfJpU4UPNgmKw8rAU KmXUy6m9+F0aS83BdCSdntsy5KEn+k+rE000qu3w8Rpt9cFkR1pxLAef08gJ3DVRUMit ZKknWii+HgYYG8W2bwWG7aPXhP+AUinxP8xv0dr0YpoYRV0Kt553xuobDxaceTmsxnW3 pybCxq6ptW29yxrG93ozdrBItKlB9fkqpsDnFkUV5JJ3A7mbIyR2pTy7A/ADr+x6j16e RKcg== X-Gm-Message-State: ABuFfoiDACD2OVKi2sYUrdXxWjjeSrUrdDzZlg4wnLjVIr14BnQyedL/ fsZIxhwwyAP52AqPZzuRKpY= X-Google-Smtp-Source: ACcGV61Nx6BAgmUB+9t7mqaJXphr/8qge4rwJgQuLsVvKpfXy43U1gMOqdZne2vxkMi37fZJpEpMTA== X-Received: by 2002:a17:902:768b:: with SMTP id m11-v6mr3609703pll.163.1539304028056; Thu, 11 Oct 2018 17:27:08 -0700 (PDT) Received: from xplor.waratah.dyndns.org (122-58-183-253-adsl.sparkbb.co.nz. [122.58.183.253]) by smtp.gmail.com with ESMTPSA id z22-v6sm28861305pgv.24.2018.10.11.17.27.06 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 11 Oct 2018 17:27:06 -0700 (PDT) Received: by xplor.waratah.dyndns.org (Postfix, from userid 1000) id A962B360079; Fri, 12 Oct 2018 13:27:02 +1300 (NZDT) From: Michael Schmitz To: linux-block@vger.kernel.org, axboe@kernel.dk Cc: linux-m68k@vger.kernel.org, geert@linux-m68k.org, Michael Schmitz Subject: [PATCH v5 1/2] block: fix signed int overflow in Amiga partition support Date: Fri, 12 Oct 2018 13:26:57 +1300 Message-Id: <1539304018-11786-2-git-send-email-schmitzmic@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1539304018-11786-1-git-send-email-schmitzmic@gmail.com> References: <1539304018-11786-1-git-send-email-schmitzmic@gmail.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 --- 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 5609366..7ea9540 100644 --- a/block/partitions/amiga.c +++ b/block/partitions/amiga.c @@ -32,7 +32,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; char b[BDEVNAME_SIZE]; @@ -100,14 +101,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 Fri Oct 12 00:26:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Schmitz X-Patchwork-Id: 10637675 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EE388112B for ; Fri, 12 Oct 2018 00:27:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB4B62C393 for ; Fri, 12 Oct 2018 00:27:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CEEAC2C39C; Fri, 12 Oct 2018 00:27:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36F2E2C393 for ; Fri, 12 Oct 2018 00:27:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727173AbeJLH4v (ORCPT ); Fri, 12 Oct 2018 03:56:51 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:36030 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725913AbeJLH4u (ORCPT ); Fri, 12 Oct 2018 03:56:50 -0400 Received: by mail-pg1-f194.google.com with SMTP id f18-v6so4965319pgv.3; Thu, 11 Oct 2018 17:27:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GlXK8aGYwgNmPvIGyXuZoFj8+mx1eHDyH1a2BT461gM=; b=jFJvF+xkV8gGreJ3K+0pS/icO8/Sjo0EA9ZXID6mR4T/qhFpxSgIZLupPvWWMyul+1 ohHrKB0bXGXf+tMgs21o29JsyLC6WI88O6CAqRVzFf3JHB2Wjzywdbr7H29VYSsw4xDT +iwOQCkRlgmXfhFTuukld6Nt0pdIvlMV4bFGJlwrtIZ/0BhL5Yexmxj0y2jLVHvqsOBO INV5oYz3PlgASl7LkErzx4HQ+dA2Htz2xlkOLwI3pxIme84ST9ugMBmXIoTD6GzjsU88 P67Fc8VqsLeUVkSdBOnkLbGpsE00F0oWbyI7RBwfWBv6QSw+Dgn6WFm4/wPw69WiCnRH fxbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GlXK8aGYwgNmPvIGyXuZoFj8+mx1eHDyH1a2BT461gM=; b=tx9Vn/RXbtIuX0Damw5yOtNZifeYsLB100uPzKnyttmHMbnTxNiBqaNd5HZA5EZipy uepXRPl2ekLiPeMwywryfKaEq8ncyaYELN+o2xPwiczYLREqLxbeu5fWorP2CNaAGyXC 1dIhEy6luZnLwLGokxTc6lxQ628dy+CjtHzhpD1+h71Vj5s0BMfBFceF+wdfnrWww3EL E3gEWET2umtRPE1z4lSLaNoZKgQgI9VnXpfq8HZr16I7bZzlGKTLeznvdwV4FeFcIbRp Cr4Zfi0GX+arMrX/TYXcSkrP52chN7vTrKaeskM0V45A6OeE1Gckl3hP0wRvVisFSnWt LN3w== X-Gm-Message-State: ABuFfoj2lp07ermJ5eCGHpzVhuCMflTJQzujfbFeeCmNh4v7RsA8Yjqv yHQ6BxoFDigSSa+tRyNvNfzb+c0G X-Google-Smtp-Source: ACcGV60HVwRO2OCme4dA9r0fRmrlxirSBN2GFYdD7TXFKxmumu1N8YyczRA8VQ7H0LmifRT2nxV/aA== X-Received: by 2002:a62:36c3:: with SMTP id d186-v6mr3636753pfa.133.1539304028836; Thu, 11 Oct 2018 17:27:08 -0700 (PDT) Received: from xplor.waratah.dyndns.org (122-58-183-253-adsl.sparkbb.co.nz. [122.58.183.253]) by smtp.gmail.com with ESMTPSA id e2-v6sm27042592pgv.25.2018.10.11.17.27.06 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 11 Oct 2018 17:27:06 -0700 (PDT) Received: by xplor.waratah.dyndns.org (Postfix, from userid 1000) id BFE72360082; Fri, 12 Oct 2018 13:27:02 +1300 (NZDT) From: Michael Schmitz To: linux-block@vger.kernel.org, axboe@kernel.dk Cc: linux-m68k@vger.kernel.org, geert@linux-m68k.org, Michael Schmitz Subject: [PATCH v5 2/2] block: add overflow checks for Amiga partition support Date: Fri, 12 Oct 2018 13:26:58 +1300 Message-Id: <1539304018-11786-3-git-send-email-schmitzmic@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1539304018-11786-1-git-send-email-schmitzmic@gmail.com> References: <1539304018-11786-1-git-send-email-schmitzmic@gmail.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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() --- block/partitions/amiga.c | 86 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 74 insertions(+), 12 deletions(-) diff --git a/block/partitions/amiga.c b/block/partitions/amiga.c index 7ea9540..193e6c3 100644 --- a/block/partitions/amiga.c +++ b/block/partitions/amiga.c @@ -11,11 +11,19 @@ #define pr_fmt(fmt) fmt #include +#include +#include #include #include "check.h" #include "amiga.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) { @@ -32,9 +40,12 @@ int amiga_partition(struct parsed_partitions *state) unsigned char *data; struct RigidDiskBlock *rdb; struct PartitionBlock *pb; - sector_t start_sect, nr_sects; + u64 start_sect, nr_sects; + sector_t end_sect; + u32 cylblk; /* rdb_CylBlocks = nr_heads*sect_per_track */ + u32 nr_hd, nr_sect, lo_cyl, hi_cyl; int blk, part, res = 0; - int blksize = 1; /* Multiplier for disk block size */ + unsigned int blksize = 1; /* Multiplier for disk block size */ int slot = 1; char b[BDEVNAME_SIZE]; @@ -99,19 +110,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", + bdevname(state->bdev, b), cylblk); + continue; + } + + /* check for consistency with RDB defined CylBlocks */ + if (cylblk > be32_to_cpu(rdb->rdb_CylBlocks)) { + pr_warn("Dev %s: cylblk %u > rdb_CylBlocks %u!\n", + bdevname(state->bdev, b), 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", + bdevname(state->bdev, b), 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", + bdevname(state->bdev, b), 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", + bdevname(state->bdev, b), part, + start_sect, (u64) end_sect); + continue; + } + + /* Tell Kernel about it */ + put_partition(state,slot++,start_sect,nr_sects); { /* Be even more informative to aid mounting */