Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp1083184ybn; Tue, 24 Sep 2019 14:28:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqxYBNI6TTov8Mw/9whknqIfNGf8Ga8im2/e9IF1PyDyd+X9l0q8aJ4jsGhP5REBN6Ys+HDE X-Received: by 2002:a1c:cc0e:: with SMTP id h14mr2693666wmb.117.1569360526710; Tue, 24 Sep 2019 14:28:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569360526; cv=none; d=google.com; s=arc-20160816; b=fJNWbWvElo+3gX5Um2Fs6uOBLAFvXPHRSiolCrcC4jUAhD79NcE+wCKJVhFxOLh3F3 uOGANZWkyNjdHJpq1Dyl8I1zpHkVbcJ3RAMXZv6/NSp1OFdn5S1nw52PqCD65G9gtD7d 8WxpPzZUPxCrDhnE4Nw9++s1VaZrpmieqLWxH1p3jYuze8QwNvbICWLx2Wgzyf7mw9zq 3vvh9Fv2Oa/2V1qF68caaiZGCM1k0S+ufb8J0yqOMcOAS0DBIvSNDdCyOyBTzEfP1dOC MOhvOMkFgopl0zh03IeZoQelKtdMovAaLT6vxgdWW6AYzAikONmqY7GsWsNKoXhvnsF5 zBjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=rx3doC+zLsDIToBRaSsFQjFKKzd+/bcAl1GqgoupEOg=; b=Oguuxrg7gVaW5PR/FYvmLkHNe5OAcT4mxG/tmCyQplpayEit69l6+rdmSKQtMHVBOm iODHMJX/2+08GDyAIsvxJYR9e1oU4xyt34Ky6/fzudgs15hNtvn8LB5V1jpvhTnp8RdL oYgUHAJdqdLwss1sAhXFE7TOpImt36tZpMqt1/qGN1niuOLf4nLDW5DEOsY4OOFZZg5c 7j9tAM9CJSPnm4LBdDli9LE2EXqzZar84osvwFPpZDKZ+FrrIYtCXhEvP0qQ6Ww9BHPd yd/8GBC5xOyrEJ+qGdd5ku02uR1VVS52udVENWpBA8tF6J6+uWG1dEDDxyoALIO5g0Gz hXiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=CqDreZYt; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t14si1603198ejx.372.2019.09.24.14.28.23; Tue, 24 Sep 2019 14:28:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=CqDreZYt; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394348AbfIVTaj (ORCPT + 99 others); Sun, 22 Sep 2019 15:30:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:46268 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392103AbfIVStO (ORCPT ); Sun, 22 Sep 2019 14:49:14 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 594FF208C2; Sun, 22 Sep 2019 18:49:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178153; bh=BfTwByiLBOEtLAiKrDFm0+a1C2cPRfgHJQH9uMU+AJg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CqDreZYtQnCS3hIesWW+cCH4z+LduxQLbiFAuninchOD8BNydttvpvM49nk/1j3Pn Bjn+OZu1DkvM8xmZuFQBOwxvU42L2ww3HoFSm326SyzOZCKvskv8bYS8lkcFB6Mx9r XTDMOU8gg06k9tFPOxaoxK6hPXLBLtUxbfzA9F34= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Qu Wenruo , David Sterba , Sasha Levin , linux-btrfs@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 199/203] btrfs: delayed-inode: Kill the BUG_ON() in btrfs_delete_delayed_dir_index() Date: Sun, 22 Sep 2019 14:43:45 -0400 Message-Id: <20190922184350.30563-199-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Qu Wenruo [ Upstream commit 933c22a7512c5c09b1fdc46b557384efe8d03233 ] There is one report of fuzzed image which leads to BUG_ON() in btrfs_delete_delayed_dir_index(). Although that fuzzed image can already be addressed by enhanced extent-tree error handler, it's still better to hunt down more BUG_ON(). This patch will hunt down two BUG_ON()s in btrfs_delete_delayed_dir_index(): - One for error from btrfs_delayed_item_reserve_metadata() Instead of BUG_ON(), we output an error message and free the item. And return the error. All callers of this function handles the error by aborting current trasaction. - One for possible EEXIST from __btrfs_add_delayed_deletion_item() That function can return -EEXIST. We already have a good enough error message for that, only need to clean up the reserved metadata space and allocated item. To help above cleanup, also modifiy __btrfs_remove_delayed_item() called in btrfs_release_delayed_item(), to skip unassociated item. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=203253 Signed-off-by: Qu Wenruo Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/delayed-inode.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index 43fdb2992956a..6858a05606dd3 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c @@ -474,6 +474,9 @@ static void __btrfs_remove_delayed_item(struct btrfs_delayed_item *delayed_item) struct rb_root_cached *root; struct btrfs_delayed_root *delayed_root; + /* Not associated with any delayed_node */ + if (!delayed_item->delayed_node) + return; delayed_root = delayed_item->delayed_node->root->fs_info->delayed_root; BUG_ON(!delayed_root); @@ -1525,7 +1528,12 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans, * we have reserved enough space when we start a new transaction, * so reserving metadata failure is impossible. */ - BUG_ON(ret); + if (ret < 0) { + btrfs_err(trans->fs_info, +"metadata reservation failed for delayed dir item deltiona, should have been reserved"); + btrfs_release_delayed_item(item); + goto end; + } mutex_lock(&node->mutex); ret = __btrfs_add_delayed_deletion_item(node, item); @@ -1534,7 +1542,8 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans, "err add delayed dir index item(index: %llu) into the deletion tree of the delayed node(root id: %llu, inode id: %llu, errno: %d)", index, node->root->root_key.objectid, node->inode_id, ret); - BUG(); + btrfs_delayed_item_release_metadata(dir->root, item); + btrfs_release_delayed_item(item); } mutex_unlock(&node->mutex); end: -- 2.20.1