From patchwork Tue Jul 25 18:50:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 125547 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2410252vqg; Tue, 25 Jul 2023 04:49:57 -0700 (PDT) X-Google-Smtp-Source: APBJJlG90PMRWRjhMpaSMBFkQpF9bKe+HzYpamrk295tLin1kqGfeqBz0hT2a9ppF2NoHRszb1af X-Received: by 2002:a17:906:778e:b0:994:3395:942f with SMTP id s14-20020a170906778e00b009943395942fmr13837570ejm.17.1690285797429; Tue, 25 Jul 2023 04:49:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690285797; cv=none; d=google.com; s=arc-20160816; b=C8PGRj2qlFVtej8arU2xdyW7K+12n4085NAOQ+MFN0mmbjZQhkvPnXLhhuljdeCY8e jvgQRv1l+nc5lGbNkdxUbY95MM2aFpKU7bp45esnLplZ4do2ZI8NbGO3YtxMIUnQEpAp 89caR1qmIFuEDQhVLt8zABgP+bNe5/vIoVOYxX1CVDGK7pliDarWL7MYohGDydyaNJeW kB6fflXPSmi9UGm6DxG3FQBYIRVuCqzjgFWa6gILpJwrsmU2X98Nt01b4o4YkUJx67ry OJDL5NKK7rW+4jpNhUenVT4mkOiZpM7qsj/C7NrgYMslZvKjK+e6skMo20hmGuC8VKxt uocQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=DEMgrKXFeo2BEWOkWuyCkAEGWhuKa/OcmOkK0opMoBg=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=UthC+Qdz4maTYajabgs5Jqw6Yd+s2jvz94N8uIkuwsOHQ5dfZ66TUNUmfpe5E0PnvV Xc4wag+6tT4QUY/ZqpMAtepkuM5h2Ih6K0WC2htHbhER+Z0bmNa6yhzbB2CG8NE/Yn+A DVy6oyXmRWbGsz0+vkaI6L4Jvx4LlopJfOn68ot24qlQprQaZQi/s1E9yp0Dad3hCpXF /xhY8TUFR4byVwv7IXbRPDYn4QwOepOn03U4pDuaKXlwcqufx/OGu1yyJQ/SnL5kbBHB 7LfjX42Hk2BQ2oiMdbURiAvulwCs3rYAoqyTrcY0DoA4+WCxgXWtkqpw3eczZnEAcfiu Yx9A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e14-20020a170906080e00b0099b9df9a864si2512105ejd.738.2023.07.25.04.49.33; Tue, 25 Jul 2023 04:49:57 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232389AbjGYKva (ORCPT + 99 others); Tue, 25 Jul 2023 06:51:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233748AbjGYKvJ (ORCPT ); Tue, 25 Jul 2023 06:51:09 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4F381FE5; Tue, 25 Jul 2023 03:50:43 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4R9DMg5jjTz4f3sjT; Tue, 25 Jul 2023 18:50:39 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgC3quj+qL9kl7XQOg--.17520S4; Tue, 25 Jul 2023 18:50:40 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ritesh.list@gmail.com, ojaswin@linux.ibm.com, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Cc: shikemeng@huaweicloud.com Subject: [PATCH v2 02/10] ext4: avoid potential data overflow in next_linear_group Date: Wed, 26 Jul 2023 02:50:58 +0800 Message-Id: <20230725185106.2147273-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230725185106.2147273-1-shikemeng@huaweicloud.com> References: <20230725185106.2147273-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgC3quj+qL9kl7XQOg--.17520S4 X-Coremail-Antispam: 1UD129KBjvJXoW7Ww1fAw1xWr45Gw17Ww48Zwb_yoW8JFy5pr s7Ga48urWaqr1DGa9xGayvg3WrK3yxW3WUJryfuw12vFyxJry8GFZrtr10vFy3GF4UAF15 Xa15AF1Uu3W3uaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPSb4IE77IF4wAFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zV CS5cI20VAGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E 5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAV WUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY 1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI 0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7s RNVbyUUUUUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, KHOP_HELO_FCRDNS,MAY_BE_FORGED,SPF_HELO_NONE,SPF_NONE, 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772393120597416027 X-GMAIL-MSGID: 1772393120597416027 ngroups is ext4_group_t (unsigned int) while next_linear_group treat it in int. If ngroups is bigger than max number described by int, it will be treat as a negative number. Then "return group + 1 >= ngroups ? 0 : group + 1;" may keep returning 0. Switch int to ext4_group_t in next_linear_group to fix the overflow. Fixes: 196e402adf2e ("ext4: improve cr 0 / cr 1 group scanning") Signed-off-by: Kemeng Shi Reviewed-by: Ritesh Harjani (IBM) --- fs/ext4/mballoc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 62e7a045ad79..3cd795e98008 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -1080,8 +1080,9 @@ static inline int should_optimize_scan(struct ext4_allocation_context *ac) * Return next linear group for allocation. If linear traversal should not be * performed, this function just returns the same group */ -static int -next_linear_group(struct ext4_allocation_context *ac, int group, int ngroups) +static ext4_group_t +next_linear_group(struct ext4_allocation_context *ac, ext4_group_t group, + ext4_group_t ngroups) { if (!should_optimize_scan(ac)) goto inc_and_return;