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 0EEA5C433EF for ; Thu, 19 May 2022 17:00:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234219AbiESRAJ (ORCPT ); Thu, 19 May 2022 13:00:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234096AbiESRAI (ORCPT ); Thu, 19 May 2022 13:00:08 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B4F4B66 for ; Thu, 19 May 2022 10:00:07 -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 0C57BB82763 for ; Thu, 19 May 2022 17:00:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C126FC385AA; Thu, 19 May 2022 17:00:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1652979604; bh=vNZPxeNqpDawNg/a2xrEqDvASAuYzgzlfPEQNCyeNbw=; h=Date:To:From:Subject:From; b=BDkJVUFju6uchk2/bTcfzJ5SPJzXiDesChhOUUaU5A2+ywgMzJPZNUMsXGnHXlswW yHGGsJbbVWjjvNv9E6poVtizMUoNsWizRE5BpH4KgDN1CxC+Jp9xakkcca2i+Uccdo nIg295W8v1R50Zp/g1BLrZ5r8ZtB3ivcQEaQuZUU= Date: Thu, 19 May 2022 10:00:04 -0700 To: mm-commits@vger.kernel.org, Liam.Howlett@oracle.com, liam.howlett@oracle.com, akpm@linux-foundation.org From: Andrew Morton Subject: + mm-mmap-use-advanced-maple-tree-api-for-mmap_region-fix-2.patch added to mm-unstable branch Message-Id: <20220519170004.C126FC385AA@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: mm/mmap: qvoid dereferencing next on null in BUG_ON() has been added to the -mm mm-unstable branch. Its filename is mm-mmap-use-advanced-maple-tree-api-for-mmap_region-fix-2.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-mmap-use-advanced-maple-tree-api-for-mmap_region-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: mm/mmap: qvoid dereferencing next on null in BUG_ON() Date: Thu, 19 May 2022 15:04:50 +0000 Check there is a next before checking the bounds. Link: https://lkml.kernel.org/r/20220519150442.1289962-1-Liam.Howlett@oracle.com Signed-off-by: Liam R. Howlett Signed-off-by: Andrew Morton --- mm/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/mmap.c~mm-mmap-use-advanced-maple-tree-api-for-mmap_region-fix-2 +++ a/mm/mmap.c @@ -685,7 +685,7 @@ inline int vma_expand(struct ma_state *m } /* Not merging but overwriting any part of next is not handled. */ - VM_BUG_ON(!remove_next && next != vma && end > next->vm_start); + VM_BUG_ON(next && !remove_next && next != vma && end > next->vm_start); /* Only handles expanding */ VM_BUG_ON(vma->vm_start < start || vma->vm_end > end); _ 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 maple-tree-add-new-data-structure-fix-3.patch maple-tree-add-new-data-structure-fix-4.patch lib-test_maple_tree-add-testing-for-maple-tree-fix.patch mm-start-tracking-vmas-with-maple-tree-fix-2.patch mm-mmap-use-advanced-maple-tree-api-for-mmap_region-fix-2.patch mm-remove-the-vma-linked-list-fix.patch