stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, ethanwu <ethanwu@synology.com>,
	David Sterba <dsterba@suse.com>
Subject: [PATCH 4.16 30/52] btrfs: Take trans lock before access running trans in check_delayed_ref
Date: Tue,  8 May 2018 10:10:28 +0200	[thread overview]
Message-ID: <20180508073932.232169601@linuxfoundation.org> (raw)
In-Reply-To: <20180508073928.058320984@linuxfoundation.org>

4.16-stable review patch.  If anyone has any objections, please let me know.

------------------

From: ethanwu <ethanwu@synology.com>

commit 998ac6d21cfd6efd58f5edf420bae8839dda9f2a upstream.

In preivous patch:
Btrfs: kill trans in run_delalloc_nocow and btrfs_cross_ref_exist
We avoid starting btrfs transaction and get this information from
fs_info->running_transaction directly.

When accessing running_transaction in check_delayed_ref, there's a
chance that current transaction will be freed by commit transaction
after the NULL pointer check of running_transaction is passed.

After looking all the other places using fs_info->running_transaction,
they are either protected by trans_lock or holding the transactions.

Fix this by using trans_lock and increasing the use_count.

Fixes: e4c3b2dcd144 ("Btrfs: kill trans in run_delalloc_nocow and btrfs_cross_ref_exist")
CC: stable@vger.kernel.org # 4.14+
Signed-off-by: ethanwu <ethanwu@synology.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 fs/btrfs/extent-tree.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -3155,7 +3155,11 @@ static noinline int check_delayed_ref(st
 	struct rb_node *node;
 	int ret = 0;
 
+	spin_lock(&root->fs_info->trans_lock);
 	cur_trans = root->fs_info->running_transaction;
+	if (cur_trans)
+		refcount_inc(&cur_trans->use_count);
+	spin_unlock(&root->fs_info->trans_lock);
 	if (!cur_trans)
 		return 0;
 
@@ -3164,6 +3168,7 @@ static noinline int check_delayed_ref(st
 	head = btrfs_find_delayed_ref_head(delayed_refs, bytenr);
 	if (!head) {
 		spin_unlock(&delayed_refs->lock);
+		btrfs_put_transaction(cur_trans);
 		return 0;
 	}
 
@@ -3180,6 +3185,7 @@ static noinline int check_delayed_ref(st
 		mutex_lock(&head->mutex);
 		mutex_unlock(&head->mutex);
 		btrfs_put_delayed_ref_head(head);
+		btrfs_put_transaction(cur_trans);
 		return -EAGAIN;
 	}
 	spin_unlock(&delayed_refs->lock);
@@ -3212,6 +3218,7 @@ static noinline int check_delayed_ref(st
 	}
 	spin_unlock(&head->lock);
 	mutex_unlock(&head->mutex);
+	btrfs_put_transaction(cur_trans);
 	return ret;
 }
 

  parent reply	other threads:[~2018-05-08  8:12 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-08  8:09 [PATCH 4.16 00/52] 4.16.8-stable review Greg Kroah-Hartman
2018-05-08  8:09 ` [PATCH 4.16 01/52] ACPI / button: make module loadable when booted in non-ACPI mode Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 02/52] arm64: Add work around for Arm Cortex-A55 Erratum 1024718 Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 03/52] ALSA: hda - Fix incorrect usage of IS_REACHABLE() Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 04/52] ALSA: pcm: Check PCM state at xfern compat ioctl Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 05/52] ALSA: seq: Fix races at MIDI encoding in snd_virmidi_output_trigger() Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 06/52] ALSA: dice: fix kernel NULL pointer dereference due to invalid calculation for array index Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 07/52] ALSA: aloop: Mark paused device as inactive Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 08/52] ALSA: aloop: Add missing cable lock to ctl API callbacks Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 09/52] errseq: Always report a writeback error once Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 10/52] tracepoint: Do not warn on ENOMEM Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 11/52] scsi: target: Fix fortify_panic kernel exception Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 12/52] Input: leds - fix out of bound access Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 13/52] Input: atmel_mxt_ts - add touchpad button mapping for Samsung Chromebook Pro Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 15/52] rtlwifi: cleanup 8723be ant_sel definition Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 16/52] xfs: prevent creating negative-sized file via INSERT_RANGE Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 17/52] tools: power/acpi, revert to LD = gcc Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 18/52] RDMA/cxgb4: release hw resources on device removal Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 19/52] RDMA/ucma: Allow resolving address w/o specifying source address Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 20/52] RDMA/mlx5: Fix multiple NULL-ptr deref errors in rereg_mr flow Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 21/52] RDMA/mlx4: Add missed RSS hash inner header flag Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 22/52] RDMA/mlx5: Protect from shift operand overflow Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 24/52] IB/mlx5: Use unlimited rate when static rate is not supported Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 25/52] infiniband: mlx5: fix build errors when INFINIBAND_USER_ACCESS=m Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 26/52] IB/hfi1: Fix handling of FECN marked multicast packet Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 27/52] IB/hfi1: Fix loss of BECN with AHG Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 28/52] IB/hfi1: Fix NULL pointer dereference when invalid num_vls is used Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 29/52] iw_cxgb4: Atomically flush per QP HW CQEs Greg Kroah-Hartman
2018-05-08  8:10 ` Greg Kroah-Hartman [this message]
2018-05-08  8:10 ` [PATCH 4.16 31/52] drm/vc4: Make sure vc4_bo_{inc,dec}_usecnt() calls are balanced Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 32/52] drm/vmwgfx: Fix a buffer object leak Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 33/52] drm/bridge: vga-dac: Fix edid memory leak Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 34/52] test_firmware: fix setting old custom fw path back on exit, second try Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 35/52] xhci: Fix use-after-free in xhci_free_virt_device Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 36/52] USB: serial: visor: handle potential invalid device configuration Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 37/52] usb: dwc3: gadget: Fix list_del corruption in dwc3_ep_dequeue Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 38/52] USB: Accept bulk endpoints with 1024-byte maxpacket Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 39/52] USB: serial: option: reimplement interface masking Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 41/52] usb: musb: host: fix potential NULL pointer dereference Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 42/52] usb: musb: trace: fix NULL pointer dereference in musb_g_tx() Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 44/52] platform/x86: Kconfig: Fix dell-laptop dependency chain Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 46/52] x86/tsc: Always unregister clocksource_tsc_early Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 47/52] x86/tsc: Fix mark_tsc_unstable() Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 48/52] irqchip/qcom: Fix check for spurious interrupts Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 49/52] clocksource: Allow clocksource_mark_unstable() on unregistered clocksources Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 50/52] clocksource: Initialize cs->wd_list Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 51/52] clocksource: Consistent de-rate when marking unstable Greg Kroah-Hartman
2018-05-08  8:10 ` [PATCH 4.16 52/52] tracing: Fix bad use of igrab in trace_uprobe.c Greg Kroah-Hartman
2018-05-08 16:22 ` [PATCH 4.16 00/52] 4.16.8-stable review Guenter Roeck
2018-05-08 17:52   ` Greg Kroah-Hartman
2018-05-08 17:56 ` Naresh Kamboju
2018-05-08 18:48   ` Greg Kroah-Hartman
2018-05-08 23:53 ` Shuah Khan
2018-05-09  7:32   ` Greg Kroah-Hartman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180508073932.232169601@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=dsterba@suse.com \
    --cc=ethanwu@synology.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).