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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA5CDC77B6E for ; Wed, 12 Apr 2023 08:13:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 680E8280009; Wed, 12 Apr 2023 04:13:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 63221280003; Wed, 12 Apr 2023 04:13:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4F942280009; Wed, 12 Apr 2023 04:13:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 3B41E280003 for ; Wed, 12 Apr 2023 04:13:46 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 183DE80F83 for ; Wed, 12 Apr 2023 08:13:46 +0000 (UTC) X-FDA: 80672025252.17.168F028 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf13.hostedemail.com (Postfix) with ESMTP id 5720B20008 for ; Wed, 12 Apr 2023 08:13:44 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=IPp00j1c; spf=pass (imf13.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681287224; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:dkim-signature; bh=yzJ+pH+jp6yPAbDOG4GfQIrJjSrACPeykB115Q3XAu8=; b=CnMuRoayZy78Qq31sAciV/I52WsF4lgJ8+1DzE4Rx8oWgfowqhVcJZpXs9D7r2T2TNubw6 QJ11Eb9EnsZxXTjMvJ2iUZ5Qzfjzi5VTzsD+PMy4YM8dmPhjOudHvom2aExIs2FP9hzg1P P782tocPBUUZIghKEU0Glm6cc2tu4wk= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=IPp00j1c; spf=pass (imf13.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681287224; a=rsa-sha256; cv=none; b=qk/ye7yF6B0gL/AYt7TFW3skGlb3b/nlnjTZ4crT8M+Y3wYoqYDOO1HztHqeCY9re9p/uu vGtzhfWSE8Yh0MZp6Hj5DgLYeR9xBCVLQ8EkaO19/8AYf2tItnXsJkuKnqBF061blSx4qt 2JNQyMMK++MNtfeF/CHcMqAUqZ1JUow= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9B58562F4F; Wed, 12 Apr 2023 08:13:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF6DDC4339B; Wed, 12 Apr 2023 08:13:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1681287223; bh=Iwn7PwwOzcLNaxGES9eLzuitVHJqCCPiIUzwscGIWRc=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=IPp00j1cO5QNifQ2nLgw+0cj2zMlp0l46sqQ/83z7II4f1m59fnwcvfIbL78MtSEA JvhOrQ8npzwcokUtwABw1gr6TDNWW75BLFG5J2nf8mqHPlMxF2wbHXUMPtnqinL/hH 2IO0yeyM14P1iwfluVFFeCGIDb6JTw3AwclyYK9A= Subject: Patch "maple_tree: reduce user error potential" has been added to the 6.1-stable tree To: Liam.Howlett@Oracle.com,Liam.Howlett@oracle.com,gregkh@linuxfoundation.org,linux-mm@kvack.org,maple-tree@lists.infradead.org Cc: From: Date: Wed, 12 Apr 2023 10:13:26 +0200 In-Reply-To: <20230411151055.2910579-4-Liam.Howlett@oracle.com> Message-ID: <2023041226-curler-pristine-4663@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit X-stable: commit X-Patchwork-Hint: ignore X-Stat-Signature: mjtd9sar3isbobi4kz3ihtxgz9fcbf6b X-Rspam-User: X-Rspamd-Queue-Id: 5720B20008 X-Rspamd-Server: rspam06 X-HE-Tag: 1681287224-74664 X-HE-Meta: U2FsdGVkX18PAlmd0X4OPl+bvbsZNfR+4iufnbEqfCkGGN9TnWK44X8OY65EP5KYJUZ48BE21v4v5tzdeVgn0LxWrJoDsEJP5h/MkUXs4D+hWnsNG7OXWtlSYNG0+d3TCwXqevkwNLhpIq9mJye7UZ8YyyY8g26XT0352U+pxNHMLRfXw5J8pedkU7vnrq9Wye0OOHDYVJUF0ZDblVLIokaC5IwOm37HqfAvqESspXFQV/JUanMWedGrt3GLg/gD6NFnwGxDfZatybS2gx30QKsRxt90qAYrUMN38i5nZxhfV2PUEhbSTy1ocM5UUQVRAEgJzQ52Q4uIDh7DViYYFH+8HXZYqJunZNmw0fwMpCbOTGADo43Oy+EY5WehdWZZnLlNp6+SU14lJpraUZycluQxs/HUtCSAiOvaWXzMjk6R4uyUtDac1KJnW/paj0zFflVOI0x19FavJocbogOPkaz2vdbr4sBZ5wpNHAjfTOeQxlnLFlAx12ZFJiDSRDlRfoX8m1C4MsUdLzEQVT4k1vQamZ+DWzmV8PG2J3OBqsINsqQysxhGQVm8O6X9gVc3C36wdNdLz3TONZHzlELAWyzGylv/iKTf0gauXa9Qn+721WjA6tBz8D8IM1jqayLh/36BAS6xLQijyZkNjxlW9nFJLAzawHxO0N46r02PH5Q8WSt/VT0ANXJC7PAmk2ui5mrULlLPNnndoZtj2QXnj7Std6wh9APm/qY6dBpUat8F9+BgE5ZIisQxNZioL+m8lqSh1xM6xPdwYD1Odxi6SBbErML1oe55s+CXNivCZTywc6Fzy+LIJnxnu86qM++j1Qs/NPCdq58s9rtONj7Sb5B1NDdubm/vfNTS54SmtGaGD/odcizFQ57LFQxyvAiK3EMzCmNj4c309QHiVn8rlrwolkssqFOuwyRHKFWemzgSIlcUrnJHOWYwmm1r9GSRKbgAJSB4bl9VfVPcQTM bH6aXJ7K Jx2oAgd6TVBMsFbO/GZ1G/oSZ+kp1h0bmaUzoeHlYPtPf1EyFEKY0YRSYohwGDkKCgEXlY/FJsiQvLgLudUCB8YrYU1djPbQDBFKfDsedJswBzMmsO2hgJZywt3hIz0wP/UPa4A6UODHvHNfzVcbaRXO3hVHognS3rU+SmduzL6z/2RvdbQ6usoQRFn1SROC+7OIVDCwYWrD/EsMMFo+5PZ7QMGIFOYtd0jf1R9fXbHfwulC4uwVW6lzF1MjjQFjl5AGg3nB8nhxqTeIIgr2oMO5Z7SkEX36RXKMr6P7X7DNvPTvOl1/x6QoWpRBf9x7DWvC4TIdCqBqSf/I0V21QoZw0YUJVQasrdDYbTn1yNR7TcHPfTRU6gD6ZlliQ20iG/cm6eoIvcNCJ1Ks0/PENEnW6yfX8+j81BB/wY9yFmyiGhzdbK376yQmSftW6ofr2Ck1Vo+RRmTEZ61T2kIJQg/f7DG3YQkiIFvYbVIuwrFY0ZGJ+FTc0V40Crkpui7FC4mzAzci7+oubiHMxCpvwF/KjdNwCm7CPFytZNFalhnjlCH6XCkRMdg69ateqlyZTPd4ox8VlGVk1OjYHMTvbH0PLiPIZpyKN+wtIdmmnwXQV1CaKLVhN3A8/5A== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: This is a note to let you know that I've just added the patch titled maple_tree: reduce user error potential to the 6.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: maple_tree-reduce-user-error-potential.patch and it can be found in the queue-6.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From stable-owner@vger.kernel.org Tue Apr 11 17:12:40 2023 From: "Liam R. Howlett" Date: Tue, 11 Apr 2023 11:10:44 -0400 Subject: maple_tree: reduce user error potential To: Greg Kroah-Hartman , stable@vger.kernel.org Cc: maple-tree@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Liam R. Howlett" , Stable@vger.kernel.org, "Liam R . Howlett" Message-ID: <20230411151055.2910579-4-Liam.Howlett@oracle.com> From: "Liam R. Howlett" commit 50e81c82ad947045c7ed26ddc9acb17276b653b6 upstream. When iterating, a user may operate on the tree and cause the maple state to be altered and left in an unintuitive state. Detect this scenario and correct it by setting to the limit and invalidating the state. Link: https://lkml.kernel.org/r/20230120162650.984577-4-Liam.Howlett@oracle.com Cc: Fixes: 54a611b60590 ("Maple Tree: add new data structure") Signed-off-by: Liam R. Howlett Signed-off-by: Greg Kroah-Hartman --- lib/maple_tree.c | 10 ++++++++++ 1 file changed, 10 insertions(+) --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4731,6 +4731,11 @@ static inline void *mas_next_entry(struc unsigned long last; enum maple_type mt; + if (mas->index > limit) { + mas->index = mas->last = limit; + mas_pause(mas); + return NULL; + } last = mas->last; retry: offset = mas->offset; @@ -4837,6 +4842,11 @@ static inline void *mas_prev_entry(struc { void *entry; + if (mas->index < min) { + mas->index = mas->last = min; + mas_pause(mas); + return NULL; + } retry: while (likely(!mas_is_none(mas))) { entry = mas_prev_nentry(mas, min, mas->index); Patches currently in stable-queue which might be from stable-owner@vger.kernel.org are queue-6.1/maple_tree-fix-potential-rcu-issue.patch queue-6.1/maple_tree-add-smp_rmb-to-dead-node-detection.patch queue-6.1/maple_tree-add-rcu-lock-checking-to-rcu-callback-functions.patch queue-6.1/maple_tree-fix-handle-of-invalidated-state-in-mas_wr_store_setup.patch queue-6.1/maple_tree-reduce-user-error-potential.patch queue-6.1/maple_tree-fix-mas_prev-and-mas_find-state-handling.patch queue-6.1/maple_tree-remove-gfp_zero-from-kmem_cache_alloc-and-kmem_cache_alloc_bulk.patch queue-6.1/maple_tree-be-more-cautious-about-dead-nodes.patch queue-6.1/mm-enable-maple-tree-rcu-mode-by-default.patch queue-6.1/maple_tree-detect-dead-nodes-in-mas_start.patch queue-6.1/maple_tree-fix-freeing-of-nodes-in-rcu-mode.patch queue-6.1/maple_tree-remove-extra-smp_wmb-from-mas_dead_leaves.patch queue-6.1/maple_tree-refine-ma_state-init-from-mas_start.patch