Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp191646iog; Sun, 12 Jun 2022 23:50:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/FgLgmbYbwoPY/KK4VMDhQUBd0w4RXM7bZHpLseGyCP6wM78lw68ByDsSMErgbjpQvmiq X-Received: by 2002:a05:6402:5109:b0:42e:1bd:8602 with SMTP id m9-20020a056402510900b0042e01bd8602mr64831288edd.269.1655103022003; Sun, 12 Jun 2022 23:50:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655103021; cv=none; d=google.com; s=arc-20160816; b=Ab+oiKleRKRXC+Kq9sWcIo9QWZMfn1r3/KvOllqw9IYHn5KXw3cebCKyV2hDW8ct2F MxkoXhlPDM2Se8b2/asvPem0NRTm1Ng0ppreUtqh+0kkE61ozTgzlSyJDnGTwoBXUoNJ wQc6dlJIIkLGOpewfUMbGRuREeZCU06pOFxSOO8N5FiOTv2GNjtA0Rxm3PlHNVqSWgZk 6JygIsRQe14FYQ9xEI6QoE66yrivoAotFvnfoIoUqP78cCrMIFFKAk4Aaei5tOsO2ROl K7Cxb+/ntrxoXt88rTH3SOYaEp9Ee9gmIX236rACz+Aqesn8zSRG2Kb6J2Za5zylNu3R QBAQ== 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 :message-id:date:subject:cc:to:from; bh=Fx1JUtwWWwf1JDPdLm1l/4/4yi0nd9C5loM+cf4Lw8c=; b=Lzx6EhTNXSJ43K+XE0zT/fPgqgXyd4H6RnwXTFB8Vd+rdFFI0oQcURRlzHy0uPT9gz g4PdHogYRpJ6IVRnjdmK5rZLYHvQSTcsPGWzdQpOBzsD2ZTiaC6dF+jcKDW25vsK3UFj al9e20UorN6rTHsmvWWG6WgH5Dx0ZMUwvY2ngtorahcl61W3WkDosk2WgXoKVGYc5u0J LP5cSAkI5a7tHZaq4erF2B7JBybkpb25me71QZBHGiHIbuLKMWqjG7e60zExGx6roGyQ M/05fIbmWQ8gnza901RGbisuZ5GCIpeObygBT6qdlAZyO0IXOdVpF6QKsgpiYhwiA72q 7EHQ== 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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sh36-20020a1709076ea400b007035cc3a941si7609662ejc.875.2022.06.12.23.49.56; Sun, 12 Jun 2022 23:50:21 -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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236451AbiFMGqR (ORCPT + 99 others); Mon, 13 Jun 2022 02:46:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230380AbiFMGqO (ORCPT ); Mon, 13 Jun 2022 02:46:14 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49B3110545 for ; Sun, 12 Jun 2022 23:46:11 -0700 (PDT) Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4LM27d1vMhzRj0j; Mon, 13 Jun 2022 14:42:53 +0800 (CST) Received: from kwepemm600013.china.huawei.com (7.193.23.68) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 13 Jun 2022 14:46:00 +0800 Received: from huawei.com (10.175.127.227) by kwepemm600013.china.huawei.com (7.193.23.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 13 Jun 2022 14:45:59 +0800 From: Zhihao Cheng To: , , , , CC: , , , Subject: [PATCH v2] ubi: ubi_wl_put_peb: Fix infinite loop when wear-leveling work failed Date: Mon, 13 Jun 2022 14:59:04 +0800 Message-ID: <20220613065904.326567-1-chengzhihao1@huawei.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemm600013.china.huawei.com (7.193.23.68) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,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: X-Mailing-List: linux-kernel@vger.kernel.org Following process will trigger an infinite loop in ubi_wl_put_peb(): ubifs_bgt ubi_bgt ubifs_leb_unmap ubi_leb_unmap ubi_eba_unmap_leb ubi_wl_put_peb wear_leveling_worker e1 = rb_entry(rb_first(&ubi->used) e2 = get_peb_for_wl(ubi) ubi_io_read_vid_hdr // return err (flash fault) out_error: ubi->move_from = ubi->move_to = NULL wl_entry_destroy(ubi, e1) ubi->lookuptbl[e->pnum] = NULL retry: e = ubi->lookuptbl[pnum]; // return NULL if (e == ubi->move_from) { // NULL == NULL gets true goto retry; // infinite loop !!! $ top PID USER PR NI VIRT RES SHR S %CPU %MEM COMMAND 7676 root 20 0 0 0 0 R 100.0 0.0 ubifs_bgt0_0 Fix it by: 1) Letting ubi_wl_put_peb() returns directly if wearl leveling entry has been removed from 'ubi->lookuptbl'. 2) Using 'ubi->wl_lock' protecting wl entry deletion to preventing an use-after-free problem for wl entry in ubi_wl_put_peb(). Fetch a reproducer in [Link]. Fixes: 43f9b25a9cdd7b1 ("UBI: bugfix: protect from volume removal") Fixes: ee59ba8b064f692 ("UBI: Fix stale pointers in ubi->lookuptbl") Link: https://bugzilla.kernel.org/show_bug.cgi?id=216111 Signed-off-by: Zhihao Cheng --- v1->v2: Don't split wl_entry_destroy(), since kmem_cache_free() can be executed wrapped a spinlock, eg dtl_disable(). drivers/mtd/ubi/wl.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c index 55bae06cf408..ee0100740869 100644 --- a/drivers/mtd/ubi/wl.c +++ b/drivers/mtd/ubi/wl.c @@ -973,11 +973,11 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk, spin_lock(&ubi->wl_lock); ubi->move_from = ubi->move_to = NULL; ubi->move_to_put = ubi->wl_scheduled = 0; + wl_entry_destroy(ubi, e1); + wl_entry_destroy(ubi, e2); spin_unlock(&ubi->wl_lock); ubi_free_vid_buf(vidb); - wl_entry_destroy(ubi, e1); - wl_entry_destroy(ubi, e2); out_ro: ubi_ro_mode(ubi); @@ -1253,6 +1253,18 @@ int ubi_wl_put_peb(struct ubi_device *ubi, int vol_id, int lnum, retry: spin_lock(&ubi->wl_lock); e = ubi->lookuptbl[pnum]; + if (!e) { + /* + * This wl entry has been removed for some errors by other + * process (eg. wear leveling worker), corresponding process + * (except __erase_worker, which cannot concurrent with + * ubi_wl_put_peb) will set ubi ro_mode at the same time, + * just ignore this wl entry. + */ + spin_unlock(&ubi->wl_lock); + up_read(&ubi->fm_protect); + return 0; + } if (e == ubi->move_from) { /* * User is putting the physical eraseblock which was selected to -- 2.31.1