From patchwork Mon Oct 15 02:32:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Schmitz X-Patchwork-Id: 10641037 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 EA95F17E3 for ; Mon, 15 Oct 2018 02:32:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CEDC0295AF for ; Mon, 15 Oct 2018 02:32:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C26B9295B5; Mon, 15 Oct 2018 02:32:36 +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 5CF0C295B1 for ; Mon, 15 Oct 2018 02:32:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726400AbeJOKPo (ORCPT ); Mon, 15 Oct 2018 06:15:44 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:44519 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726397AbeJOKPo (ORCPT ); Mon, 15 Oct 2018 06:15:44 -0400 Received: by mail-pl1-f195.google.com with SMTP id p25-v6so8504496pli.11; Sun, 14 Oct 2018 19:32:35 -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=MRN5AJNoe+EciY9swvrrooylKYHm23srOeRVu0RSXVptVWBNPuSAoKFNf1die8Q79H FcztFtDoj3vU16CR/q4Xk9f5siRHSmo2HSxeXJHkZkHzAOGau/QR/afVsuqFLHUYNPlD mLowrVantoLPPQFj8wQo2UZ7HFVrzR6U0htHE+MT5S5SfDOlpuHZUHa5ROSr/1heWUBA JGbirxRJqoVS3UspF7iyDLoQzhB471A6DuMQzI1nnwYI9SETW/7+h9MGzTgruuyRGg+O rmVLZCsVxb9yP2ky1+4mXwW7TiVkXSroaxvbqjLNXslu5tsPXd5SAKMsQlEsAFgAJ8Sz 0NeQ== 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=LH90+fVE1mn+dwgg+96EzUbN6+MFgMDvXgWiLwQEPaJNcIMRyehIbZAtJzDlLXcOjQ CVNJvMCQbOFKy4+rIeNNAjVsbIvS7d9ZsBIb9HwudgDHg7Q9Z4d8UeaOhzKl6qYJ62Nw UAz7fZQLW54KFr6Hc6qTUjtWu9wbDukyo5Gi2PJdbzDnebHfzqG44NC1d0k6vGh89dVn tklxdlpIdU7xEq1vc2Bs9ba/n/3rrLtytYa/2XnWRQA4RU/X9wowiT+VGCOcqKwiW/ZE aFvj0Iq0ucLcXupc1g+bQYd5HdVt4cLTJEzCEGXcRP7eDvJN4tsZYQSLy/UuGtfCNXk9 QERA== X-Gm-Message-State: ABuFfohD89C7bxNhOR7+5g94ZTlowtJYo7G+ejgW0VspEo7ydJDDsbtL p40Sl1wzcsrJGBXOA9Wo9WU= X-Google-Smtp-Source: ACcGV61GsdDlPlzO59FU1XuzYNiuzSYOfYxjqKziNslkxiLQiBqOdcbcXC2UKy9ISa6eiJ9s9h8seQ== X-Received: by 2002:a17:902:44:: with SMTP id 62-v6mr15335695pla.181.1539570755072; Sun, 14 Oct 2018 19:32:35 -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 i21-v6sm11297161pgj.55.2018.10.14.19.32.33 (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 14 Oct 2018 19:32:33 -0700 (PDT) Received: by xplor.waratah.dyndns.org (Postfix, from userid 1000) id 40A93360084; Mon, 15 Oct 2018 15:32:29 +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 v7 1/2] block: fix signed int overflow in Amiga partition support Date: Mon, 15 Oct 2018 15:32:26 +1300 Message-Id: <1539570747-19906-2-git-send-email-schmitzmic@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1539570747-19906-1-git-send-email-schmitzmic@gmail.com> References: <1539570747-19906-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;