Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Chunhai Guo <guochunhai@vivo.com>
To:     xiang@kernel.org
Cc:     chao@kernel.org, huyue2@coolpad.com, jefflexu@linux.alibaba.com,
        linux-erofs@lists.ozlabs.org, linux-kernel@vger.kernel.org,
        Chunhai Guo <guochunhai@vivo.com>
Subject: [PATCH] erofs: fix to avoid infinite loop in z_erofs_do_read_page() when read page beyond EOF
Date:   Mon, 10 Jul 2023 17:34:10 +0800
Message-Id: <20230710093410.44071-1-guochunhai@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?M9l8xoCLRRk+JGPBVtt5Y5Qa5PQFjYEmPf23Gv26L/C6IW474yPPnSmILkOb?=
 =?us-ascii?Q?LnVvG/476oIhIC7TRYes1ylvb7KUy2r6lUVLvd5rvGaxvS1RMmiAjtre76PH?=
 =?us-ascii?Q?xq4eiNCbNdNz0GFYnFbYK1dVvgQzcwaMLzcmDwXxdReRBlr+dCYeceQYP0t9?=
 =?us-ascii?Q?iW4iVTFTmF61llJ/vqjQDmhYB1tedyC+HhDhYt/XoZNvDMQ8t+f51jkOGKXz?=
 =?us-ascii?Q?tAZMB4bwmzAu1by3D3NMXnztRm1hYOQikP7U+vvRlwi133M1altig19JXwUO?=
 =?us-ascii?Q?I4nrd/ZSS7GPhdfqHi2OVw69uvH60UAzAK4cGZpBUuPHl0xm5ebU/tIBVUan?=
 =?us-ascii?Q?5a4tnXraDURh5qJeCXJWvBnfBeeFUhgxz+9FH+BxGNMwAd/bEp4i6OIPWRSv?=
 =?us-ascii?Q?2w/2Y4iimGqpcijLFhIgTDGApwcmoh+EiEUbPcVjoB3V69965bnSGlNvJ8HO?=
 =?us-ascii?Q?k9dPZBFIrkfhPrMM6Z1fNlUOPwQz84hZQHKe8Ixk6cFfds9BZU24ayuPpi/h?=
 =?us-ascii?Q?6D0ybzbuI7adG2oZs7qgf4Yyb3sLkIPqcXC+FKEpE66PIOOsGQYlVYrMEKSN?=
 =?us-ascii?Q?vCtAMMjkylB2wGV6QyQrh72+IRMUHURyDiY4GDwMBvY6JPd/Kc4lPDxczCl4?=
 =?us-ascii?Q?6iUI3IEwmKuLl5uBkQsiC1zJmCcVEgD38QERc67k7wedWVpk5akcKBm7u9hU?=
 =?us-ascii?Q?0nhNDw5OZgRhWGxyX32RUK6kvVhzpspacDRd3tNVdbrdmxwNwuRobMH2Zj/V?=
 =?us-ascii?Q?05fgNyypW1wQcUI4IBvFc8AuhxswCo11gkJzl8+/HwscZ4BTxDcJ/DnHcfC4?=
 =?us-ascii?Q?Tjq0/tOaS3rJI69w7NMjR0+35Lj8SMAt6FG+03kpvh5rEjjYX3/317FtfibM?=
 =?us-ascii?Q?eMRnyB5ktayyckbnU+heemdN9SXCeoSBIwutcnROt/OOPnwf3Mxv7P9LLdwh?=
 =?us-ascii?Q?vnSiBcUtXTdUVPU0oEnCTtxfPdbX2xYE5cLvGcBVLnAHyiCC00LA0UifRK33?=
 =?us-ascii?Q?OujtjNAhU3NPkTz7KIRQLqHydBqs5fk/kTM+ne2qs8rCXXu09+na7DTtXro8?=
 =?us-ascii?Q?l8a6QPbQkN/uzQ6FGYL8MK72+rAgXi8A0YE/u/ykDvi+q+MORmaQsSJoeFUB?=
 =?us-ascii?Q?vjTQvEE+kSgwxHyTthmrGvxvAHxh6ppHY5WKfmGtOTKE76U2WCb1pmvwkYqZ?=
 =?us-ascii?Q?4BCmc51S21fKfB1B5Fmbco3WIh8e/+VrBPcv6lo4xE7y0Sq4A06pJo6I60a8?=
 =?us-ascii?Q?u5uiEowc6sQbEWwY6jj+LLnE8hc5qmzA7P6pDq5XRA8rHfrhc3JabTfhd2rL?=
 =?us-ascii?Q?dcljoea0i5J+Tnd03wi4eFywggd5hcMgKD1c50vCSXmL20P1lccvzuNL8HsC?=
 =?us-ascii?Q?H4H0uCqM/bWLg6YXwjBCdOez4s5S36Nr0ZFvPy5VQdrg8bwqAxupedsM3R33?=
 =?us-ascii?Q?I9GOrau12clUySanU4Cy4N/TY5PHW7aTWxQpQbUgCKzcuabsq4pEPPKMGj7+?=
 =?us-ascii?Q?KwAKTCWsepKdb6mdokPq5SSPrKrzAUgvgWUgH8FyeN0hg9K2l+0iWwMWFXLa?=
 =?us-ascii?Q?KOg4rNfGy/mA5mvGq91G9WJm9z9/DfAXAlxQ16do?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 36c68bd9-a5fc-4f74-16cb-08db8128e298
X-MS-Exchange-CrossTenant-AuthSource: SG2PR06MB3338.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2023 09:34:40.4576
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: UvQDhNVIzcflYrnkSJlsVA2SzFAlCQNIvGh7GXmxRbOTBVO2riTqBCjurxVbO+z8yWJ3gcpog4uKft5J57M7hQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PUZPR06MB5555
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

z_erofs_do_read_page() may loop infinitely due to the inappropriate
truncation in the below statement. Since the offset is 64 bits and min_t()
truncates the result to 32 bits. The solution is to replace unsigned int
with a 64-bit type, such as erofs_off_t.
    cur = end - min_t(unsigned int, offset + end - map->m_la, end);

    - For example:
        - offset = 0x400160000
        - end = 0x370
        - map->m_la = 0x160370
        - offset + end - map->m_la = 0x400000000
        - offset + end - map->m_la = 0x00000000 (truncated as unsigned int)
    - Expected result:
        - cur = 0
    - Actual result:
        - cur = 0x370

Signed-off-by: Chunhai Guo <guochunhai@vivo.com>
---
 fs/erofs/zdata.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
index d9a0763f4595..b69d89a11dd0 100644
--- a/fs/erofs/zdata.c
+++ b/fs/erofs/zdata.c
@@ -1035,7 +1035,7 @@ static int z_erofs_do_read_page(struct z_erofs_decompress_frontend *fe,
 	 */
 	tight &= (fe->mode > Z_EROFS_PCLUSTER_FOLLOWED_NOINPLACE);
 
-	cur = end - min_t(unsigned int, offset + end - map->m_la, end);
+	cur = end - min_t(erofs_off_t, offset + end - map->m_la, end);
 	if (!(map->m_flags & EROFS_MAP_MAPPED)) {
 		zero_user_segment(page, cur, end);
 		goto next_part;
-- 
2.25.1