From: Greg Kroah-Hartman Date: Tue, 19 Nov 2019 04:59:47 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v5.3.12~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ffe9a69e13a6ef5ccb0fd95879ac2639bb90db5;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: memfd-use-radix_tree_deref_slot_protected-to-avoid-the-warning.patch --- diff --git a/queue-4.14/memfd-use-radix_tree_deref_slot_protected-to-avoid-the-warning.patch b/queue-4.14/memfd-use-radix_tree_deref_slot_protected-to-avoid-the-warning.patch new file mode 100644 index 00000000000..83adb218135 --- /dev/null +++ b/queue-4.14/memfd-use-radix_tree_deref_slot_protected-to-avoid-the-warning.patch @@ -0,0 +1,39 @@ +From zhongjiang@huawei.com Tue Nov 19 05:55:06 2019 +From: zhong jiang +Date: Mon, 18 Nov 2019 11:26:07 +0800 +Subject: memfd: Use radix_tree_deref_slot_protected to avoid the warning. +To: , , , +Cc: , +Message-ID: <20191118032610.182862-1-zhongjiang@huawei.com> + +From: zhong jiang + +The commit 391d4ee568b5 ("memfd: Fix locking when tagging pins") +introduces the following warning messages. + +*WARNING: suspicious RCU usage in memfd_wait_for_pins* + +It is because we still use radix_tree_deref_slot without read_rcu_lock. +We should use radix_tree_deref_slot_protected instead in the case. + +Cc: stable@vger.kernel.org +Fixes: 391d4ee568b5 ("memfd: Fix locking when tagging pins") +Signed-off-by: zhong jiang +Reviewed-by: Matthew Wilcox (Oracle) +Signed-off-by: Greg Kroah-Hartman + +--- + mm/shmem.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/mm/shmem.c ++++ b/mm/shmem.c +@@ -2664,7 +2664,7 @@ static void shmem_tag_pins(struct addres + + spin_lock_irq(&mapping->tree_lock); + radix_tree_for_each_slot(slot, &mapping->page_tree, &iter, start) { +- page = radix_tree_deref_slot(slot); ++ page = radix_tree_deref_slot_protected(slot, &mapping->tree_lock); + if (!page || radix_tree_exception(page)) { + if (radix_tree_deref_retry(page)) { + slot = radix_tree_iter_retry(&iter); diff --git a/queue-4.14/series b/queue-4.14/series index 4b01f173d94..432c1579fee 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -237,3 +237,4 @@ usb-xhci-mtk-fix-isoc-error-when-interval-is-zero.patch fuse-use-read_once-on-congestion_threshold-and-max_b.patch ib-iser-fix-possible-null-deref-at-iser_inv_desc.patch net-phy-mdio-bcm-unimac-mark-pm-functions-as-__maybe.patch +memfd-use-radix_tree_deref_slot_protected-to-avoid-the-warning.patch