From patchwork Sun Oct 14 04:48:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Schmitz X-Patchwork-Id: 10640509 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 214AD14BD for ; Sun, 14 Oct 2018 04:48:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1254B2A41F for ; Sun, 14 Oct 2018 04:48:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F09802A432; Sun, 14 Oct 2018 04:48:45 +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 4DD5A2A425 for ; Sun, 14 Oct 2018 04:48:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725848AbeJNM2X (ORCPT ); Sun, 14 Oct 2018 08:28:23 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:34708 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725987AbeJNM2X (ORCPT ); Sun, 14 Oct 2018 08:28:23 -0400 Received: by mail-pg1-f195.google.com with SMTP id g12-v6so7626242pgs.1; Sat, 13 Oct 2018 21:48:42 -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=W9zibn5ZPAe2eR5i6xKHLTY8NrpASUJ4VCryxn+G8tE=; b=h2phup294wh6NT+8vjUEqVr3VAXspeEq9n9RStSIEcEYARy/+tq7Zx8tsNuUTgUkDc b1sCFwLp7aLzWt4iG2msg5AWeKGSFFFOMNc49xqjMGU9vjTOlIifUS22hV0VcIpDrwsI 237p+yG7gX/QkuymVAHmuqWwgNYRt75mDYbO2wZ9EBGfhlua8RkE7nW23Flzvqqs9QUV EGbb8YwuQOzXgHrbNNfeWvSGeQj84d0gYsd+mC+np6EZzaIP/ZoyDds51HnuxJ4L2cN+ 01VHZX3RndaO8jYS3u0laWje3Q4FvOp/KpxuHedvS8OIVnXmLQ0Mpd2Xd7uO36gv89Bc W8nA== 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=W9zibn5ZPAe2eR5i6xKHLTY8NrpASUJ4VCryxn+G8tE=; b=NBvXXd+O+etFocCtlOpQkDh+XDjnwb1hYAKfRYOV1cTe72wiJF8RVyaUA2v1C9WaR3 95ml653ZEFA6AzgK+2GDkzUfQSR9FmhSFduV4B3Q8G0VqNJ7i0XgNOR4KQLtA6SKAWPd TsLch1kpIvFO9RuvVXj6+b5hDSpZoi1IHKNubVgpCXowjgMgCCs4ggeWgSE9VBtRXaUO YCpxx3KJ+5hr/8/hQOdfm0ZUbV+zbFrWtzJU9Fgr526tClsov/gwvw2ZIOkOOtK87f07 5KfG+1J4eGuyoOq8f7ZDCA1BtJ8rDebveC5cX1jTmYMv/CyJR0qRuYts7acl3mrRZJYn GNSg== X-Gm-Message-State: ABuFfoh6jjBaQpJcd3wdZ1rC5yDcOn9OQr/MlVmn7t/EJx08ShWzorFL oXY/+H7pFJI1cQxn4R9/9+w0lgJv X-Google-Smtp-Source: ACcGV62aUXEgQD7CCHN7SgdCmcvipcDwpfOqliAlspse9T5fjeeDsLjNkd5IqGMrus7iFVDkRsHFbA== X-Received: by 2002:a65:6144:: with SMTP id o4-v6mr11493196pgv.387.1539492522618; Sat, 13 Oct 2018 21:48:42 -0700 (PDT) Received: from xplor.waratah.dyndns.org (122-62-216-69-adsl.sparkbb.co.nz. [122.62.216.69]) by smtp.gmail.com with ESMTPSA id m7-v6sm6633883pgq.59.2018.10.13.21.48.40 (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 13 Oct 2018 21:48:41 -0700 (PDT) Received: by xplor.waratah.dyndns.org (Postfix, from userid 1000) id 23CF4360079; Sun, 14 Oct 2018 17:48:37 +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 v6 1/2] block: fix signed int overflow in Amiga partition support Date: Sun, 14 Oct 2018 17:48:34 +1300 Message-Id: <1539492515-1782-2-git-send-email-schmitzmic@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1539492515-1782-1-git-send-email-schmitzmic@gmail.com> References: <1539492515-1782-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;