stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michael Schmitz <schmitzmic@gmail.com>
To: linux-block@vger.kernel.org, axboe@kernel.dk
Cc: linux-m68k@vger.kernel.org, chzigotzky@xenosoft.de,
	geert@linux-m68k.org, hch@lst.de, martin@lichtvoll.de,
	Michael Schmitz <schmitzmic@gmail.com>,
	stable@vger.kernel.org
Subject: [PATCH v4 1/1] block: bugfix for Amiga partition overflow check patch
Date: Wed,  5 Jul 2023 11:38:08 +1200	[thread overview]
Message-ID: <20230704233808.25166-2-schmitzmic@gmail.com> (raw)
In-Reply-To: <20230704233808.25166-1-schmitzmic@gmail.com>

Making 'blk' sector_t (i.e. 64 bit if LBD support is active)
fails the 'blk>0' test in the partition block loop if a
value of (signed int) -1 is used to mark the end of the
partition block list.

This bug was introduced in patch 3 of my prior Amiga partition
support fixes series, and spotted by Christian Zigotzky when
testing the latest block updates.

Explicitly cast 'blk' to signed int to allow use of -1 to
terminate the partition block linked list.

Reported-by: Christian Zigotzky <chzigotzky@xenosoft.de>
Fixes: b6f3f28f60 ("block: add overflow checks for Amiga partition support")
Message-ID: 024ce4fa-cc6d-50a2-9aae-3701d0ebf668@xenosoft.de
Cc: <stable@vger.kernel.org> # 5.2
Link: https://lore.kernel.org/r/024ce4fa-cc6d-50a2-9aae-3701d0ebf668@xenosoft.de
Signed-off-by: Michael Schmitz <schmitzmic@gmail.com>
Reviewed-by: Martin Steigerwald <martin@lichtvoll.de>
Tested-by: Christian Zigotzky <chzigotzky@xenosoft.de>

--

Changes since v1:

- corrected Fixes: tag
- added Tested-by:
- reworded commit message to describe filesystem partition
  size mismatch problem

Changes since v2:

Adrian Glaubitz:
- fix typo in commit message

Changes since v3:

Greg KH:
- fix stable tag

Geert Uytterhoeven:
- revert changes to commit message since v1
---
 block/partitions/amiga.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/partitions/amiga.c b/block/partitions/amiga.c
index ed222b9c901b..506921095412 100644
--- a/block/partitions/amiga.c
+++ b/block/partitions/amiga.c
@@ -90,7 +90,7 @@ 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)) {
+	for (part = 1; (s32) blk>0 && part<=16; part++, put_dev_sector(sect)) {
 		/* 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",
-- 
2.17.1


  parent reply	other threads:[~2023-07-04 23:38 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20230620201725.7020-1-schmitzmic@gmail.com>
2023-06-20 20:17 ` [PATCH v13 1/3] block: fix signed int overflow in Amiga partition support Michael Schmitz
2023-06-20 20:17 ` [PATCH v13 2/3] block: change all __u32 annotations to __be32 in affs_hardblocks.h Michael Schmitz
2023-06-20 20:17 ` [PATCH v13 3/3] block: add overflow checks for Amiga partition support Michael Schmitz
     [not found] ` <20230704233808.25166-1-schmitzmic@gmail.com>
2023-07-04 23:38   ` Michael Schmitz [this message]
2023-07-05  7:28     ` [PATCH v4 1/1] block: bugfix for Amiga partition overflow check patch Geert Uytterhoeven
2023-07-05  8:53       ` Michael Schmitz
2023-07-05  9:08         ` Geert Uytterhoeven
2023-07-05 19:25           ` Michael Schmitz
2023-07-05 20:42     ` Jens Axboe
2023-07-05 21:41       ` Michael Schmitz
2023-07-05 21:44         ` Jens Axboe
2023-07-05 22:09           ` Michael Schmitz
2023-07-05 22:13             ` Jens Axboe
2023-07-05 22:25               ` Michael Schmitz
2023-07-05 22:34                 ` Jens Axboe
2023-07-05 22:38                   ` Jens Axboe
2023-07-05 23:54                     ` Michael Schmitz
2023-07-06  7:23                       ` Martin Steigerwald

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230704233808.25166-2-schmitzmic@gmail.com \
    --to=schmitzmic@gmail.com \
    --cc=axboe@kernel.dk \
    --cc=chzigotzky@xenosoft.de \
    --cc=geert@linux-m68k.org \
    --cc=hch@lst.de \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-m68k@vger.kernel.org \
    --cc=martin@lichtvoll.de \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).