linux-kernel - Re: [PATCH] mm/mremap: fix unaccount of memory on vma

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CADyq12xd+o0fjkjh-MzDmopC94XSxMCKVnQ+jcBr3yJdx+v7sg@mail.gmail.com>
Date:   Wed, 30 Aug 2023 11:42:50 -0400
From:   Brian Geffon <bgeffon@...gle.com>
To:     Anthony Yznaga <anthony.yznaga@...cle.com>
Cc:     linux-mm@...ck.org, linux-kernel@...r.kernel.org,
        akpm@...ux-foundation.org, 0x7f454c46@...il.com
Subject: Re: [PATCH] mm/mremap: fix unaccount of memory on vma_merge() failure

On Tue, Aug 29, 2023 at 8:46 PM Anthony Yznaga
<anthony.yznaga@...cle.com> wrote:
>
> Fix mremap so that only accounted memory is unaccounted if the
> mapping is expandable but vma_merge() fails.
>
> Fixes: fdbef6149135 ("mm/mremap: don't account pages in vma_to_resize()")
> Signed-off-by: Anthony Yznaga <anthony.yznaga@...cle.com>

Looks correct to me.

Acked-by: Brian Geffon <bgeffon@...gle.com>

> ---
>  mm/mremap.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/mm/mremap.c b/mm/mremap.c
> index 056478c106ee..07cdb04d4ab5 100644
> --- a/mm/mremap.c
> +++ b/mm/mremap.c
> @@ -1037,12 +1037,14 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
>                         pgoff_t extension_pgoff = vma->vm_pgoff +
>                                 ((extension_start - vma->vm_start) >> PAGE_SHIFT);
>                         VMA_ITERATOR(vmi, mm, extension_start);
> +                       long charged = 0;
>
>                         if (vma->vm_flags & VM_ACCOUNT) {
>                                 if (security_vm_enough_memory_mm(mm, pages)) {
>                                         ret = -ENOMEM;
>                                         goto out;
>                                 }
> +                               charged = pages;
>                         }
>
>                         /*
> @@ -1058,7 +1060,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
>                                 vma->vm_file, extension_pgoff, vma_policy(vma),
>                                 vma->vm_userfaultfd_ctx, anon_vma_name(vma));
>                         if (!vma) {
> -                               vm_unacct_memory(pages);
> +                               vm_unacct_memory(charged);
>                                 ret = -ENOMEM;
>                                 goto out;
>                         }
> --
> 2.39.3
>