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 5FAF2EB64DA for ; Sun, 16 Jul 2023 15:06:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E8AFC6B0071; Sun, 16 Jul 2023 11:06:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E3B3B6B0074; Sun, 16 Jul 2023 11:06:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D02FD6B0075; Sun, 16 Jul 2023 11:06:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id BE8156B0071 for ; Sun, 16 Jul 2023 11:06:07 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 8CDC0B051D for ; Sun, 16 Jul 2023 15:06:07 +0000 (UTC) X-FDA: 81017800374.29.A0AF558 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf28.hostedemail.com (Postfix) with ESMTP id B4965C000F for ; Sun, 16 Jul 2023 15:06:05 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=WpbPdOpU; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf28.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689519965; 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=IB4Lkk+dbyRBq3FDyIovYtAPqz5RrOYmoSTGc6YMPJU=; b=SElqv0rwWx0A3S/jB59A7I6ngGC8zlEAAvgguB1zVXhGVJeFeR9QGnyDG9H9/zFSfParQi H4kN18GXF4P1O2MGoIyC88KHyBZeDidKt3+8r6QQ425/kmGRMaWJ7sznuTMKpYtr/D7f89 cplGR36MShTYwvTdEoO9UgasU3Y1b7Y= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=WpbPdOpU; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf28.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689519965; a=rsa-sha256; cv=none; b=NRB7NAwOqI7VfZX+/5rpfy5RWS0Hz+V1ILgXNzFrOP6EOe3GYMwYT4/Fma6Hi4tN9tsElf 3LuLb0uok1uDLMTnAI6lX/Zo0mZasYjBRJOZL0SrYk6/mJFVUurd9X7MKZAsRLAQRsEYgB KPLw/IZVyz9pQJGblMPw9fnS03Qte+A= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A943160D14; Sun, 16 Jul 2023 15:06:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B33D0C433C8; Sun, 16 Jul 2023 15:06:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1689519964; bh=ItKvbwSASX82aawm12BOyB3nbk4mRx0BckmCM1i+Z/E=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=WpbPdOpU3828OtF44hXRSTTCsnNBTQgowZB9F46r4wFJ19vmG678ZTnBDaazZnDOx aqY8Bzjn1X0bF3BtOIhD1L4dmjkt5FvBtS4CDm31nGLAW9J3oQV4qePjxp2V5uL0k3 Q8zfULCc6uKK4j8DZIc5EPBgFxyGt14BfCUtdkpw= Subject: Patch "mm/mmap: Fix extra maple tree write" has been added to the 6.1-stable tree To: John.Hsu@mediatek.com,Liam.Howlett@oracle.com,akpm@linux-foundation.org,gregkh@linuxfoundation.org,linux-mm@kvack.org Cc: From: Date: Sun, 16 Jul 2023 17:05:15 +0200 In-Reply-To: <20230706185135.2235532-1-Liam.Howlett@oracle.com> Message-ID: <2023071615-stick-bottle-8a39@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-Queue-Id: B4965C000F X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: ma8fg8x7razrjki9jspr7c36jer5gc6o X-HE-Tag: 1689519965-887362 X-HE-Meta: U2FsdGVkX18DVMXUGAz7Be1E+J4whWDS2wgBnMTCcfdDglVvGNTEnCqGv15XJLarZcas5YHbTuiGjCmDNPKmkDcTCn2aF0D4bY37tByPmUXRW00Cn4ro2+2RKjsZAxfo6k3CLcbcQ/UmVClCBjsD+P7EMEzqSS3hV7Re/4rzwBkKBRpIFNV+Jy7Gl9wHFZ91v49jCEBwv0Vp/DXF+VYud5HtAPimWYsw6dt49BNmCmXBbYXxWfBysHhGgEnSNxd1r+VYaSzmcqEP1v8arOA0MoZoQEEHztB1UwhmH9PY4RxMdfnsygbgQlOw7pA7a+Foy9OVevtT/7NsVzBHST4u7M4k61si+f8gduU42XtdAV+bSjjDwSie5uYiAtQroyWQ04jh5bXBJtAiyFQrRhfmlPvSIF2Myrv5upN/qLp29YYyQrqv89WdHPFURwy54p/K9Aay4MCEFWpHG72rDAzrg++MWcgGZldBPCzRI19pY42gsajOyYoHA3OGsXkojzmLTtn78l8kDZ51mse6QqM2oO1QTYMxXTY/tKPSQObWTFIIEC06hh4C62PNdHV+GlmHQHveVvFQlvGb9FR0F6yz9BWevAQRRurR1uqfM0hulSOmGBLw5NM4RyOuGh+FBxGuLzWMUXtmrsHMbt7gTgAVFfpHuU6e5JhwuIkA6IJjRXzDpXLfAtydpBAKfffBG2CZWcY2hH7DNdfD4TmZjE+eFYgTeKSMxaDD4zQLBNpsqym9+qrvbcUhUNz8hwgqgbef7JnMk4axhBVvhI3BeixXk9KojGhnr+/E7xyu3nm9PsgKsBr6KPOfaSAXiFImesblmvTHRMnKGXTFZMAYOPwPjajczXCBw5rBkb4DDYbQgfuzHcVey9yXQk8ATsqj5gIM/DFJCXP8rsTjr4RA9J94PBHRnuveVJ3VFwrtwDu69flLUJHijicqXaEHCKsh0ri9iNNqvR6iemdhQ2OYGG8 joGNcm8W Wc74V3XQ0xRRX0gEMrzlqbBJPz7NNlcmY/gsaf8vo41IfJxjIoIHbBdIMtofbJ2HD329ZoQYA6156nsp+id5zlLUhOjBCc/6iya7X8+rk3VyKDDRhJKGNtiafONn2eA/ws9hw3D7NsKAvT9Ob3fnqJ7AETPR2MAcRxbe+bAvWOnM/zGhTiE54B70qgeQ/wYrtqoDYhuCvXc/1VXn4V+wiIX4Z62HCcpEi9y9Ik7rymTJ3I5W6lwOlEViwCDlXZHZBwVfO3IyFe0f15a6K2hk67uWCB4wNn3+oGpqmXh9tNPaSvR2wzJ2rmMxHo9hi9AmK7J1ycJBlpMWs1lUgilu6ektsMXCsz5+nsZsUfr0TJnrB3E2Ef/qt4Bm/tZ9O6knYE4eD7RwSQpCCWpA2VglMR1TlIfacST4HVyH4bJhsCW7nyBANhLv0ou9XC6/yMmpks7GCpsQckHsca4fSe1A7XRKItL5ibPexGwiS4fctm9fnJPx0xfso7VEvRe5zMzL7e02iPHpQniVc2K1QY4dx8KAcIRlMFqp8Mnugfv0QDd1NMJpduqK2HrJVVNrm8H4Oz039yOvtCbsKzg2L9YD9O4HnlwFG6xnSt9tDO76dSwou+F6Z8NWvO1pCWfvOuYMTdv080I/Q2uD7ZbMGaOmYE8QVn8BxYxSu9p4IvHn88hm4grQ= 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 mm/mmap: Fix extra maple tree write 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: mm-mmap-fix-extra-maple-tree-write.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 Liam.Howlett@oracle.com Sun Jul 16 17:02:51 2023 From: "Liam R. Howlett" Date: Thu, 6 Jul 2023 14:51:35 -0400 Subject: mm/mmap: Fix extra maple tree write To: linux-kernel@vger.kernel.org Cc: Andrew Morton , "Liam R. Howlett" , John Hsu , stable@vger.kernel.org, linux-mm@kvack.org Message-ID: <20230706185135.2235532-1-Liam.Howlett@oracle.com> From: "Liam R. Howlett" based on commit 0503ea8f5ba73eb3ab13a81c1eefbaf51405385a upstream. This was inadvertently fixed during the removal of __vma_adjust(). When __vma_adjust() is adjusting next with a negative value (pushing vma->vm_end lower), there would be two writes to the maple tree. The first write is unnecessary and uses all allocated nodes in the maple state. The second write is necessary but will need to allocate nodes since the first write has used the allocated nodes. This may be a problem as it may not be safe to allocate at this time, such as a low memory situation. Fix the issue by avoiding the first write and only write the adjusted "next" VMA. Reported-by: John Hsu Link: https://lore.kernel.org/lkml/9cb8c599b1d7f9c1c300d1a334d5eb70ec4d7357.camel@mediatek.com/ Cc: stable@vger.kernel.org Cc: linux-mm@kvack.org Signed-off-by: Liam R. Howlett Signed-off-by: Greg Kroah-Hartman --- mm/mmap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/mm/mmap.c +++ b/mm/mmap.c @@ -767,7 +767,8 @@ int __vma_adjust(struct vm_area_struct * } if (end != vma->vm_end) { if (vma->vm_end > end) { - if (!insert || (insert->vm_start != end)) { + if ((vma->vm_end + adjust_next != end) && + (!insert || (insert->vm_start != end))) { vma_mas_szero(&mas, end, vma->vm_end); mas_reset(&mas); VM_WARN_ON(insert && Patches currently in stable-queue which might be from Liam.Howlett@oracle.com are queue-6.1/mm-mmap-fix-extra-maple-tree-write.patch queue-6.1/mm-mmap-fix-vm_locked-check-in-do_vmi_align_munmap.patch