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;