From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 C2FA2196C7C; Tue, 26 Aug 2025 13:24:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756214687; cv=none; b=oB+Iak9/zegqhKwblqDyzaDBp4JjoW0IZiEfHrRXO2qRqJEj8Up1T6OYC4MSo0T+2tmra3jsCkmBAxqQxEHUKDXzgyfyLMXQ0UilNb/EKgPLMSZZbUBMIka3OMBIg1VWRguOSmjPVUFK9nrEtvef+o7kKGxWK7JRGpmBJz8k8pM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756214687; c=relaxed/simple; bh=+9A24ZZCwsxlixOBvNVL/W7hoFdZw2qYNtYYzUxJd3A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BeFkDHnLEIzdCs2LlWE9k3KJm7pM8QSoFBlmacb2KtVfkHLqwhcCOvbpSmuXGbkb7B/Vz1/oBVekURXO4KS4hq6kXbY19Dcmo9XjqD83ozr7HeYfgTemCJzGbF9N/WfyIooXdcGt0UUkZr4Md1FeK4zGSVpmwqT5GsuA5a6olnA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Ol0deSoQ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Ol0deSoQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 53B73C4CEF1; Tue, 26 Aug 2025 13:24:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756214687; bh=+9A24ZZCwsxlixOBvNVL/W7hoFdZw2qYNtYYzUxJd3A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ol0deSoQ4Lk+Hy/unkhJY6/DqkP95yo11G0fPBS/xC5xlPp7ePGWpxdn52gnvf0e/ tQt/Fqb8QgctExYYqyiwQI2XWsO+hB+XND/fakJSujCxhJrJ5a5aHybIfpVtSmVXa4 7TzpgvqEDU9CzNcHIJZ0d02pIXYRP0u2aitUchSw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Hannes Reinecke , "Martin K. Petersen" , John Garry , Damien Le Moal , Jens Axboe , Sasha Levin Subject: [PATCH 6.1 232/482] block: avoid possible overflow for chunk_sectors check in blk_stack_limits() Date: Tue, 26 Aug 2025 13:08:05 +0200 Message-ID: <20250826110936.504505273@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250826110930.769259449@linuxfoundation.org> References: <20250826110930.769259449@linuxfoundation.org> User-Agent: quilt/0.68 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 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: John Garry [ Upstream commit 448dfecc7ff807822ecd47a5c052acedca7d09e8 ] In blk_stack_limits(), we check that the t->chunk_sectors value is a multiple of the t->physical_block_size value. However, by finding the chunk_sectors value in bytes, we may overflow the unsigned int which holds chunk_sectors, so change the check to be based on sectors. Reviewed-by: Hannes Reinecke Reviewed-by: Martin K. Petersen Signed-off-by: John Garry Reviewed-by: Damien Le Moal Link: https://lore.kernel.org/r/20250729091448.1691334-2-john.g.garry@oracle.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/blk-settings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/blk-settings.c b/block/blk-settings.c index c702f408bbc0..305b47a38429 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -628,7 +628,7 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, } /* chunk_sectors a multiple of the physical block size? */ - if ((t->chunk_sectors << 9) & (t->physical_block_size - 1)) { + if (t->chunk_sectors % (t->physical_block_size >> SECTOR_SHIFT)) { t->chunk_sectors = 0; t->misaligned = 1; ret = -1; -- 2.39.5