From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08E0FC2D0DB for ; Sun, 29 Dec 2019 17:35:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CE931206DB for ; Sun, 29 Dec 2019 17:35:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577640909; bh=1VQvL9dRksI4IhYJFs1T/qelYf9r1BRQIl3EuaZdVf4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=voMa0y93zSfzuV351l8WEszuiWiMqumyYFymNb/YlUsdfocS6TVB5Mthz3oW6L/j3 TW8zw6Q1fdp/KAMzhU5fx4S6siIUh5lQ/qbP+heW5+r/URbrfFkZj93Ye6sbmG7I+O 6aS3YC61NTRQ9J/oeoPXhrcGChfniPIsUjdV/7+I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729801AbfL2RfJ (ORCPT ); Sun, 29 Dec 2019 12:35:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:39184 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728389AbfL2RfI (ORCPT ); Sun, 29 Dec 2019 12:35:08 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 296E2207FF; Sun, 29 Dec 2019 17:35:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577640907; bh=1VQvL9dRksI4IhYJFs1T/qelYf9r1BRQIl3EuaZdVf4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ScWhn3GGsvmd/iUYzaJHPCKdUNSjF5PRjjjVnIEr/SFDKWGR8ulLQDj1beAZ2B4gi LTmKvWi+EixPMW774JFHu4fV79G9MzhlKbQubcJskRb8+29XSWf7Qly3dn6UPSRNrB DuIMtEEuV0UWRNk4/5gsyogPopQVLNCRZSK2xM6I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Thumshirn , Omar Sandoval , David Sterba , Sasha Levin Subject: [PATCH 4.19 189/219] btrfs: dont prematurely free work in scrub_missing_raid56_worker() Date: Sun, 29 Dec 2019 18:19:51 +0100 Message-Id: <20191229162538.150206652@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229162508.458551679@linuxfoundation.org> References: <20191229162508.458551679@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Omar Sandoval [ Upstream commit 57d4f0b863272ba04ba85f86bfdc0f976f0af91c ] Currently, scrub_missing_raid56_worker() puts and potentially frees sblock (which embeds the work item) and then submits a bio through scrub_wr_submit(). This is another potential instance of the bug in "btrfs: don't prematurely free work in run_ordered_work()". Fix it by dropping the reference after we submit the bio. Reviewed-by: Johannes Thumshirn Signed-off-by: Omar Sandoval Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/scrub.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index 916c39770467..6b6008db3e03 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c @@ -2145,14 +2145,13 @@ static void scrub_missing_raid56_worker(struct btrfs_work *work) scrub_write_block_to_dev_replace(sblock); } - scrub_block_put(sblock); - if (sctx->is_dev_replace && sctx->flush_all_writes) { mutex_lock(&sctx->wr_lock); scrub_wr_submit(sctx); mutex_unlock(&sctx->wr_lock); } + scrub_block_put(sblock); scrub_pending_bio_dec(sctx); } -- 2.20.1