From patchwork Fri Jul 21 17:09: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: 123678 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp76903vqg; Fri, 21 Jul 2023 02:22:44 -0700 (PDT) X-Google-Smtp-Source: APBJJlEtq24x+09NDJzZpflEnlUMekFEGeIUgePjZEO0RSGfHfeZzkEYGdSiGth4ODaVc9lLGNlj X-Received: by 2002:aa7:db4e:0:b0:521:29a:8ee3 with SMTP id n14-20020aa7db4e000000b00521029a8ee3mr1453276edt.5.1689931364089; Fri, 21 Jul 2023 02:22:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689931364; cv=none; d=google.com; s=arc-20160816; b=iiKSKoAszZG1otjeXuzqRxHWY/Ji8XBSzy99NuDOjPDvTIcLssLvcAWTcFNh3JXOVk rezKbr3SMygNOwXw+2wNg/+I+i7V19h6nlBoesKe+PmbhMhzNUqim5qB550/8oe1hwhR 7vtvLXx7Drcbfy8qM/Ermaz6IcFr/S8FlNiUJlyDNV86I8h/gr96bWUOh64iwBze+N3a +iqUrFzkUoZbq1oxkFjLIL5QIp89rx8AiRVWa3IkeTFB9nq0UwpKtld0YnuKVDx4u5kd 9FGwPn25BfrZ+qkNu9Mb9mkBOqjeeBzhYdpY0FeYG993hjjoyuOOsOFNjmrJSM0+ib33 GprA== 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=LXZDkbE1yGQqYEm081f2soMgVUBEksVq85+edYsEhZU=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=FwHJbhKnUvR+m0JTk1shBrPPPlHTb8yW5KaYPzBbv3hD99nqnIQ1zuumnMLC+stiB/ Srf+nNJXwunrh6ChaiEXAxKs5DB6A1IW9gf4Wzs5hlpVxLHAqi5ZJAYfGWTFtNuRPnS/ nzNOjAgW9jXqJpSPmKNqqJoFoiZGqaAQavAMxRQtLWmgbEKOCICtS6MC1oUN1uFSc7v/ AJmJ/C5gGMrqpi9smWJe2lXhePReSMVmQ6oYr+oVaXZV0SzvC8g6BKImCs8KTO+B/T3a 2JG/tJjA05s5uMaHUXRHyyEh06ln1BEBAkZSBFD533xWesHYPse+vnY30wOJLkqpiGBx 0bZQ== 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 i11-20020a50fc0b000000b0051e252568besi1986324edr.662.2023.07.21.02.22.18; Fri, 21 Jul 2023 02:22:44 -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 S231605AbjGUJJu (ORCPT + 99 others); Fri, 21 Jul 2023 05:09:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231343AbjGUJJm (ORCPT ); Fri, 21 Jul 2023 05:09:42 -0400 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF6BB30C0; Fri, 21 Jul 2023 02:09:40 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4R6kJt34nwz4f3mLw; Fri, 21 Jul 2023 17:09:34 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrFPS7pkqi7fOQ--.527S3; Fri, 21 Jul 2023 17:09:36 +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 01/10] ext4: correct grp validation in ext4_mb_good_group Date: Sat, 22 Jul 2023 01:09:58 +0800 Message-Id: <20230721171007.2065423-2-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230721171007.2065423-1-shikemeng@huaweicloud.com> References: <20230721171007.2065423-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHvrFPS7pkqi7fOQ--.527S3 X-Coremail-Antispam: 1UD129KBjvdXoWruryxZrWUXFWrJF1fZF48tFb_yoW3Xwb_Ga 4DAr4kAFZ3J34Ik3WIyws7try0ga1xGr45J39xtr45ZF98WF4kAa4kJryfAF4xWrWav345 Za45GryUKrWSvjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb6AFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUGwA2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E 87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYx C7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_ Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x 0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8 JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIx AIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7sREgyCDUUUUU= = 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, RCVD_IN_DNSWL_BLOCKED,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: 1772021469877897119 X-GMAIL-MSGID: 1772021469877897119 Group corruption check will access memory of grp and will trigger kernel crash if grp is NULL. So do NULL check before corruption check. Signed-off-by: Kemeng Shi --- fs/ext4/mballoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 3ab37533349f..90ffabac100b 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2554,7 +2554,7 @@ static bool ext4_mb_good_group(struct ext4_allocation_context *ac, BUG_ON(cr < CR_POWER2_ALIGNED || cr >= EXT4_MB_NUM_CRS); - if (unlikely(EXT4_MB_GRP_BBITMAP_CORRUPT(grp) || !grp)) + if (!grp || unlikely(EXT4_MB_GRP_BBITMAP_CORRUPT(grp))) return false; free = grp->bb_free;