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, chao@kernel.org
Cc:     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 two loop issues when read page beyond EOF
Date:   Sat,  8 Jul 2023 14:24:32 +0800
Message-Id: <20230708062432.67344-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?eAGsGzH40NzUXhkzbB12d9DTJ5aI6I03ulawyNt90nMnr+96sc3cBgkxGX+8?=
 =?us-ascii?Q?XELQQjq6eGCG4l6eiTylwyt8tv/TKWOVEQ73rep4P1nKxKuBcHUCFOBtTzU+?=
 =?us-ascii?Q?DcNCcpKGERf1pVCKnaUVCkt3YdcX58PlUeu9/iLsgF19XCFJWgpKKLz9+Eo3?=
 =?us-ascii?Q?tgpd+I0nJ3REyIYMiC5PBHzM4ek4DzFXiiXFOBxK3fy0h/8JbfXkofRH6nRX?=
 =?us-ascii?Q?EyTS2/5DbvUWTKrZ0qSMVRFkFVK0ZKetIJ4+8qYdZ3wYEjKL34SNvBvpiltG?=
 =?us-ascii?Q?ZSf2VUR9benPDhlMkJZuCdYds/sbL1aewCjrSKtIDPzY0nHzhLi1iGdsIPTP?=
 =?us-ascii?Q?7un6vU6QG9JdtBYye1N8Jr5cl/2iAsjCERzY9aNuFnYsK9xgp6Mc5Y0W7dI0?=
 =?us-ascii?Q?SxlQrD10e9kedM5KuQJqTOnOHT3Bsf650NzYoo4qgqJfPHjSV/XK5ROmB2js?=
 =?us-ascii?Q?U1Z5PMAZdk2UXR2e9QQVSWT/eGpbS7X2vBFk3WE8Ur35OjwLvYbj3WH5WJyp?=
 =?us-ascii?Q?xBQQbId6GyBYgVBGoVmCbkFPQV5gEdX294SSgjrlEjCMpsCdJtPFyJhVO0Gg?=
 =?us-ascii?Q?sCldQKZf23S4YG0jZHA7JpC0bE4E3ERtiK693Pnsq2HUyeuoNRA5oXdSUdh7?=
 =?us-ascii?Q?AOxyvKs8LJ0p4syy2hxIHfAbEfAnrPi6vblDOFFFJdMRi/7MOAuBidprGail?=
 =?us-ascii?Q?v8NF1I6vMZOZZvu1FYxh0d3ei9HkQSGHkK8XILXHBDMSA1em3buR9HoZQm6X?=
 =?us-ascii?Q?3Pu6zrdJ6VIofGrMUP5cJu2BY1zubfVfKw2/jAvQNZlUuCN8Xe4aWKMpEYec?=
 =?us-ascii?Q?HW+eDDl3lhqlkN0bRqkOsCyomJ3u/mrtk900y2AjXbXc+tFMsC1rf/hyp47L?=
 =?us-ascii?Q?3O3fQc0Hh/SFj8pSqCEkfRV+lEHYmNduYJjBa9pG3C/eBlK9QTRixwQZPm/c?=
 =?us-ascii?Q?iMyy0GJwKxMo8saPctViroTGNt8oHMlV1rprWQKWTcYM6LfsZbnPpse8xE86?=
 =?us-ascii?Q?XYtfyM79IpVc05qIEAmIntOdvI+ypCtRy4lAagtIDoLjwgxhqrqlhBjFmrXp?=
 =?us-ascii?Q?aUsxtUCzm9haZ3n+DSkP6VgwdTi/PMvs3sMZO/USvTpgqNF9Xo1Gql/NQBhR?=
 =?us-ascii?Q?JMVHxjsfucj+mZTH7f4NDBlMB++Ekg/fM+ueby0VEV+cEiucajGmVzunPjPm?=
 =?us-ascii?Q?91mNbHtZwrlSv42bP057W/nRHDU1XLhk5SV25Dute/AL9PBmn1BVc6POX5yf?=
 =?us-ascii?Q?4zEf/d1ScHwrlcgKefUTNwuhztMQ3GvcB3uajO7FJbngngUEgutS02ZxUc17?=
 =?us-ascii?Q?N9/DebyU+jQ1OsU0cO55EZ5uKnGLEQR3lUHqJXUX6KEK5IpkPnbAcNtyPATX?=
 =?us-ascii?Q?w7QcjqOQ7WTBy1GCmX2GJl/VENcHPIaBplqwegtALi+4KNoH2GdS1sM0eqNn?=
 =?us-ascii?Q?IECapZTOaB1ACLmq5OEEOaXRaiXsqsKYSakfq+oddGqhdJQEKJh/bzvOaCHr?=
 =?us-ascii?Q?PEyTIuD/1zjb9QN6QJHMKk30AuLBW81LexoNw1Cek9lOmcx/y703J2zfaodh?=
 =?us-ascii?Q?medgDs3dws3YKQWNEpTEKTUELzApaS+jG65aKdAx?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: bc6bf441-165d-4a18-1938-08db7f7c2208
X-MS-Exchange-CrossTenant-AuthSource: TY2PR06MB3342.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jul 2023 06:25:32.9775
 (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: pRb6DHBizRuKwg6+3Jz56Mbm8V/y6awwPVC/UT7WzdUXJQZWjiz9SBdr7JuxFeF1ymeoRxRC3lG/Eo7Iy1yQ4A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PSAPR06MB4503
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_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED 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

When z_erofs_read_folio() reads a page with an offset far beyond EOF, two
issues may occur:
- z_erofs_pcluster_readmore() may take a long time to loop when the offset
  is big enough, which is unnecessary.
    - For example, it will loop 4691368 times and take about 27 seconds
      with following case.
        - offset = 19217289215
        - inode_size = 1442672
- 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 another 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 | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
index 5f1890e309c6..6abbd4510076 100644
--- a/fs/erofs/zdata.c
+++ b/fs/erofs/zdata.c
@@ -972,7 +972,8 @@ static int z_erofs_do_read_page(struct z_erofs_decompress_frontend *fe,
 	struct erofs_map_blocks *const map = &fe->map;
 	const loff_t offset = page_offset(page);
 	bool tight = true, exclusive;
-	unsigned int cur, end, spiltted;
+	erofs_off_t cur, end;
+	unsigned int spiltted;
 	int err = 0;
 
 	/* register locked file pages as online pages in pack */
@@ -1035,7 +1036,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;
@@ -1841,7 +1842,7 @@ static void z_erofs_pcluster_readmore(struct z_erofs_decompress_frontend *f,
 	}
 
 	cur = map->m_la + map->m_llen - 1;
-	while (cur >= end) {
+	while ((cur >= end) && (cur < i_size_read(inode))) {
 		pgoff_t index = cur >> PAGE_SHIFT;
 		struct page *page;
 
@@ -1876,6 +1877,12 @@ static int z_erofs_read_folio(struct file *file, struct folio *folio)
 	trace_erofs_readpage(page, false);
 	f.headoffset = (erofs_off_t)page->index << PAGE_SHIFT;
 
+	/* when trying to read beyond EOF, return zero page directly */
+	if (f.headoffset >= i_size_read(inode)) {
+		zero_user_segment(page, 0, PAGE_SIZE);
+		return 0;
+	}
+
 	z_erofs_pcluster_readmore(&f, NULL, true);
 	err = z_erofs_do_read_page(&f, page);
 	z_erofs_pcluster_readmore(&f, NULL, false);
-- 
2.25.1