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 09A26C7619A for ; Wed, 12 Apr 2023 08:12:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9B678900007; Wed, 12 Apr 2023 04:12:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 940026B0075; Wed, 12 Apr 2023 04:12:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7B9CA900007; Wed, 12 Apr 2023 04:12:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 6B6176B0074 for ; Wed, 12 Apr 2023 04:12:32 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 498781C6DC1 for ; Wed, 12 Apr 2023 08:12:32 +0000 (UTC) X-FDA: 80672022144.11.5CB9984 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf16.hostedemail.com (Postfix) with ESMTP id 85E74180019 for ; Wed, 12 Apr 2023 08:12:30 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=e9FXwsCo; spf=pass (imf16.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=1681287150; 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=SS0p5J7T4ebkS1SVSro+IjsCjvH5hzfiui92LN/lQF8=; b=MQEqNVRWCPz80xNLa7tjconA+p1Xo+whZD6GJ1V+abUqFkSHQLgbzIdALM97forBUMtUFf M1U7HtM+YUOWuYNX4qTNGYf6t884h1liFpbKCsWTvI3rsjduHeENDnBLgRRLA+crvLhnCj /11zSKhUUU/kWgD7os7SMzDoWFz59+c= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=e9FXwsCo; spf=pass (imf16.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=1681287150; a=rsa-sha256; cv=none; b=7m0JV7oiueX16jkKy577FAt2j+etLC5YF0trqjOL7MtHMOOSNTmcXeaNHUVJYUHnJ91cwQ +y8coGR7MlvPr/44dwJf+NXe7KDR8Ei9gX0FYFh0t82EmGnhsn55IODTfAK+YmJkzL/1lf bNnsL9jtcQqDwfqQZYzCpobg7t/6L3Y= 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 B155E62F61; Wed, 12 Apr 2023 08:12:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CB29EC433D2; Wed, 12 Apr 2023 08:12:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1681287149; bh=7Gw6x5wXuYHIGcQASrjpY2HDQUTUF2GQrGVgx9j2S6c=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=e9FXwsCoCFdrDTfp4ms98uW3u+AjT0ZX2AETPSoqlsShV5DYRR4DP048Awfo2wDcx NXme9sq6s2AOnIRTgjp/eOSopEnfETrNL8nbcly7Da6/rUokIpUIUIz4NZ4moro8wh WtnN+Lt2HY84UnF+aDilnY70qNCz0dOv+OiPDj9E= Subject: Patch "maple_tree: reduce user error potential" has been added to the 6.2-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:12:09 +0200 In-Reply-To: <20230411151055.2910579-4-Liam.Howlett@oracle.com> Message-ID: <2023041209-gaffe-cement-0f35@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-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 85E74180019 X-Stat-Signature: kjdd8k4kzdjmttf3r67ofw9omshectrz X-Rspam-User: X-HE-Tag: 1681287150-779245 X-HE-Meta: U2FsdGVkX1+8jH8TNXLmn336uKgJf3wIOrjpQW9gcBT+IaGyLj7rQtanVmNSLCgXM2E+G+LSRmIxVldbGmNRkXi7bb7/SRL/Lml6og8BwULGHwpoL3M/LtxjEX/G1qnh0swSROV+UDT2KCt4/Ug6pQ7WWZKLIoDfgR9Q43dFZvYCNWQXP9qW2QiwlEYiTqe1npKyPXKu6RNK8sVd+O3M2FIGgnG8vUMr4dd4Y5YkvTasZM3v6PEkO3py9YQSWw/NsMgAjT2i+yuGLaeiY+XALMQM/9kvmpoIl9wiM6Ra3dm8zd5qLlOutqs1X2PLcXXktttynZqgdUVQ6PgPVRM88DomPOY7Bi/lFoH7CBXWHg3JEwLg/eB37XkLYg4oHAP9c1oEMkXgKPAvih376ZwixKLDCACEQ8ZEktYNqCPClyVIQI/dfgHItkG6c9SLEQrJTTDEEOWx+zTBdgwmtqLayLkUwENlUCdptifp3zr3OA2fcR2hcwBnfFD025yjAeupB47yXRHU6WRYFlQNAQgfAmiKXzSvQLP8ycd9VdQlJEwm+ijjqMOtU6YDrQKsz6e5vErwLinemnpp8vqSHgfd0aGuWvnkqwP1fff5a8lfb3pYOdfTRRpZ49ti2kxhhF2lWo4ULjiA9KMRYY0E9H+q8vSON5sbe/qMBlit1piYw3loZs4SYn4TAOrSmgkT2tLSmIX7q72Aza7RRr9fbbRxH1qGZTFL66M2tt/Yo8B0wPxVhUuh5tcjZAQ8s6jiDH8ZSmyf9M6yAf8BiBGFuSGv/VgBd0PQV55kbJK+GDhJeT8RLy3O+KQ+OjSm+RXpTnkPEaxEQdEGCQYSInk/7wy/cPgJ1GHyFiHDlGUay8Aajw1gciKo4JHRrMzC0TNka13hyU61pCwLMsoIU331cOWGtV4ts9pkmrbcVRZt/Ah8mpSZjn3ThcTx1K73r0GGyzyBMxFK55S8cNELsz0FHyc wkpZFs4D b9YSxKGTwwU+DW1Fe2OE4XyX2B0CJNCYsmfR9kWW4ZiSGM6klbl72G6e6egx53vRwbBXJMP/npWEHd7GStfWiGyyrf64tRpmNNcCtd3B0bIrv4j14gvY0XXKVhxa1OmDJsNn1vjI14MP0xK7X/jpjyKM5nFW53Na6m/rws5rRJJth5o/ay3n4oSyMjNZNGDbldy3oBLm4ZGmTsZ84uq3xqVMcFXyeQ9/SsEGX8nW0XXd8u2XkU1nr8rzQajgreRzwdG+aFYd3dYlcl8EKgTO8kKdcsF1blrDtKgm97oeCPUInrTA5gVo/gQe/W118zScfSS2afa+1hKLaqGU+NoI4bTCqRymhR4wt7AlBUPww3vsAUlmQe/bSRRCapY19kh/iUbPMty/E+PHqmvdSG7uLRWQrIa7c1AUm7RYI7ytqw0Xxk4nzP0IDPdpqgAhTW1j/Y5HSKWMC8vnWWxifnB5Vrewdta1TD84cqpAXvRVbZPAfseEjUB+U6ptdnCZZBso/Gb5qwOqDt6Rl5vgkdJdGA5L2eodmf+OnxHYHIJw7c8+zKoYRuQfAn9ZauaJpR95cmHFkDde3/cKCQhBr3C+A1OtneB0t6U9EWHPAzIm8lFaYBrsuGuF7bpr5YA== 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.2-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.2 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 @@ -4736,6 +4736,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; @@ -4842,6 +4847,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.2/maple_tree-fix-potential-rcu-issue.patch queue-6.2/maple_tree-add-smp_rmb-to-dead-node-detection.patch queue-6.2/maple_tree-add-rcu-lock-checking-to-rcu-callback-functions.patch queue-6.2/maple_tree-fix-handle-of-invalidated-state-in-mas_wr_store_setup.patch queue-6.2/maple_tree-reduce-user-error-potential.patch queue-6.2/maple_tree-fix-mas_prev-and-mas_find-state-handling.patch queue-6.2/maple_tree-remove-gfp_zero-from-kmem_cache_alloc-and-kmem_cache_alloc_bulk.patch queue-6.2/maple_tree-be-more-cautious-about-dead-nodes.patch queue-6.2/mm-enable-maple-tree-rcu-mode-by-default.patch queue-6.2/maple_tree-detect-dead-nodes-in-mas_start.patch queue-6.2/maple_tree-fix-freeing-of-nodes-in-rcu-mode.patch queue-6.2/maple_tree-remove-extra-smp_wmb-from-mas_dead_leaves.patch queue-6.2/maple_tree-refine-ma_state-init-from-mas_start.patch