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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 257C0C433F5 for ; Tue, 17 May 2022 17:37:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351493AbiEQRhV (ORCPT ); Tue, 17 May 2022 13:37:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351499AbiEQRhU (ORCPT ); Tue, 17 May 2022 13:37:20 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A7313A18E for ; Tue, 17 May 2022 10:37:19 -0700 (PDT) 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 ams.source.kernel.org (Postfix) with ESMTPS id 39EF3B81B0D for ; Tue, 17 May 2022 17:37:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F15BAC385B8; Tue, 17 May 2022 17:37:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1652809037; bh=0p7yo0DaSFJUa9OSpPZrLDdoYzPSe2X90mCSBBXqSr4=; h=Date:To:From:Subject:From; b=roq5TaW2juIMti1KR07YevFoVlVk3WOBFUD2x6ZaawOcJuFbpWZXqajilWPBH77XW yHGJe0QxVRpOSwqt9nFhyKsrPdZj5h//uHq8nP85hp4k4kPFsh/GP+o3SqAO59H+J0 WXRklIz+zGmKXNd+MK2wLbJoJuoeFV4wP3jxaP5U= Date: Tue, 17 May 2022 10:37:16 -0700 To: mm-commits@vger.kernel.org, svens@linux.ibm.com, sfr@canb.auug.org.au, linux@roeck-us.net, Liam.Howlett@oracle.com, hca@linux.ibm.com, liam.howlett@oracle.com, akpm@linux-foundation.org From: Andrew Morton Subject: + maple-tree-add-new-data-structure-fix-2.patch added to mm-unstable branch Message-Id: <20220517173716.F15BAC385B8@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: maple_tree: fix mas_next() when already on the last node entry has been added to the -mm mm-unstable branch. Its filename is maple-tree-add-new-data-structure-fix-2.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/maple-tree-add-new-data-structure-fix-2.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Liam Howlett Subject: maple_tree: fix mas_next() when already on the last node entry Date: Tue, 17 May 2022 14:59:22 +0000 It is possible to return the metadata as the next entry if the last node entry is already in the maple state and the limit is not reached. Check for this condition in mas_next_nentry() where the node end is returned. Link: https://lkml.kernel.org/r/20220517145913.3480729-1-Liam.Howlett@oracle.com Signed-off-by: Liam R. Howlett Reported-by: Sven Schnelle Reported-by: Guenter Roeck Reported-by: Heiko Carstens Tested-by: Sven Schnelle Cc: Stephen Rothwell Signed-off-by: Andrew Morton --- lib/maple_tree.c | 3 +++ 1 file changed, 3 insertions(+) --- a/lib/maple_tree.c~maple-tree-add-new-data-structure-fix-2 +++ a/lib/maple_tree.c @@ -4547,6 +4547,9 @@ static inline void *mas_next_nentry(stru return NULL; count = ma_data_end(node, type, pivots, mas->max); + if (mas->offset > count) + return NULL; + while (mas->offset < count) { pivot = pivots[mas->offset]; entry = mas_slot(mas, slots, mas->offset); _ Patches currently in -mm which might be from liam.howlett@oracle.com are maple-tree-add-new-data-structure-fix.patch maple-tree-add-new-data-structure-fix-2.patch lib-test_maple_tree-add-testing-for-maple-tree-fix.patch mm-start-tracking-vmas-with-maple-tree-fix-2.patch mm-remove-the-vma-linked-list-fix.patch