Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0BB5B46D09B; Tue, 21 Jul 2026 17:34:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784655260; cv=none; b=T4zm2xSZrfyU74MXFRqLS5j51OjRvMGqnAwB4KT24zx2TI2nNL7kofEHO8vxr8nCgsN30U+UpNL7pEViuMy9y3QmW0l70C9mMBRAsCAfgUEGeHbGjAjVTTRPTdLUUEuxdJSEYZcqSckg8NzisWbxrTUEAy4nGLOm5MZzM/8lLag= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784655260; c=relaxed/simple; bh=1tJ560gZL2hvhRCcTSDYQTnwKX2/zq6uKx3sWztc7Ig=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=minmHeWHpDb3s2990d0xf09XQaOcq9nE3DVNM52lCFrn6a/Lss+S+FdjwdHjjOu1AoMzoSYFHIkIFC4qtnjsd/j9cIPJkuN+T4EokTcLqabTP93gRCtKT618hxji4QWZHUpW3ECOpCEKTD8YdH6W/jvTYa5JEfD52lxGqP74llI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=dcQZsT1d; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="dcQZsT1d" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7201B1F000E9; Tue, 21 Jul 2026 17:34:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784655258; bh=Rd6kGBsasMb1cpH3HG2j9IiRrwQU7t6lmoLb0cIdNVk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dcQZsT1d151c6ifqbeu/zAR2z524Bpe5bVqeSq77gxsYKtwff57FWuTFMVeVZ9XJ5 e01ys48wqT7t6c3+j7O+A7NimhNZPUKzMBEcmbRSxbi00OYE0gouXpywVYkRyEGYkP ULm6ZKvYLmehwdLbuIad9r8M5ikBbEVDmlpn7sFk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Maoyi Xie , Ulf Hansson Subject: [PATCH 7.1 2015/2077] memstick: ms_block: reject a card that reports too many blocks Date: Tue, 21 Jul 2026 17:28:08 +0200 Message-ID: <20260721152640.232521934@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152552.646164743@linuxfoundation.org> References: <20260721152552.646164743@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Maoyi Xie commit 718178f524b98bc920d74bc771aed823c8b81425 upstream. msb_ftl_initialize() computes the zone count from the card block count with no bound: msb->zone_count = msb->block_count / MS_BLOCKS_IN_ZONE; ... for (i = 0; i < msb->zone_count; i++) msb->free_block_count[i] = MS_BLOCKS_IN_ZONE; msb->block_count is a card value. msb_read_boot_blocks() reads number_of_blocks from the card boot page and byte swaps it. free_block_count is a fixed int[MS_MAX_ZONES]. MS_MAX_ZONES is 16, so the valid indices are 0 to 15. The init loop above indexes it by zone_count. msb_mark_block_used() and msb_mark_block_unused() index it by pba / MS_BLOCKS_IN_ZONE, for pba up to block_count - 1. A card may report up to 65535 blocks. A block_count above 8192 (MS_MAX_ZONES * MS_BLOCKS_IN_ZONE) lets the pba index reach 16. That writes past free_block_count[] and corrupts struct msb_data. A larger count runs the init loop past the end too. A real Memory Stick has at most 16 zones. So it has at most 8192 blocks. msb_ftl_initialize() now rejects a card that reports more than MS_MAX_ZONES * MS_BLOCKS_IN_ZONE blocks. Fixes: 0ab30494bc4f ("memstick: add support for legacy memorysticks") Cc: stable@vger.kernel.org Signed-off-by: Maoyi Xie Signed-off-by: Ulf Hansson Signed-off-by: Greg Kroah-Hartman --- drivers/memstick/core/ms_block.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/drivers/memstick/core/ms_block.c +++ b/drivers/memstick/core/ms_block.c @@ -1338,6 +1338,10 @@ static int msb_ftl_initialize(struct msb return 0; msb->zone_count = msb->block_count / MS_BLOCKS_IN_ZONE; + if (msb->block_count > MS_MAX_ZONES * MS_BLOCKS_IN_ZONE) { + pr_err("Too many blocks: %d\n", msb->block_count); + return -EINVAL; + } msb->logical_block_count = msb->zone_count * 496 - 2; msb->used_blocks_bitmap = bitmap_zalloc(msb->block_count, GFP_KERNEL);