linux-kernel - Re: [PATCH v2] hugetlb, userfaultfd: Fix reservation restore on userfaultfd error

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: <a51f7e4c-674d-a282-e3dd-c03a199ef5d6@oracle.com>
Date:   Wed, 17 Nov 2021 12:44:12 -0800
From:   Mike Kravetz <mike.kravetz@...cle.com>
To:     Mina Almasry <almasrymina@...gle.com>,
        Andrew Morton <akpm@...ux-foundation.org>
Cc:     Wei Xu <weixugc@...gle.com>, stable@...r.kernel.org,
        James Houghton <jthoughton@...gle.com>, linux-mm@...ck.org,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2] hugetlb, userfaultfd: Fix reservation restore on
 userfaultfd error

On 11/17/21 11:38, Mina Almasry wrote:
> Currently in the is_continue case in hugetlb_mcopy_atomic_pte(), if we
> bail out using "goto out_release_unlock;" in the cases where idx >=
> size, or !huge_pte_none(), the code will detect that new_pagecache_page
> == false, and so call restore_reserve_on_error().
> In this case I see restore_reserve_on_error() delete the reservation,
> and the following call to remove_inode_hugepages() will increment
> h->resv_hugepages causing a 100% reproducible leak.
> 
> We should treat the is_continue case similar to adding a page into the
> pagecache and set new_pagecache_page to true, to indicate that there is
> no reservation to restore on the error path, and we need not call
> restore_reserve_on_error().  Rename new_pagecache_page to
> page_in_pagecache to make that clear.
> 
> Cc: Wei Xu <weixugc@...gle.com>
> 
> Cc: stable@...r.kernel.org
> 
> Fixes: c7b1850dfb41 ("hugetlb: don't pass page cache pages to restore_reserve_on_error")
> Signed-off-by: Mina Almasry <almasrymina@...gle.com>
> Reported-by: James Houghton <jthoughton@...gle.com>
> 
> 
> ---
> 
> Changes in v2:
> - Renamed new_pagecache_page to page_in_pagecache
> - Removed unnecessary comment after the name update.
> - Cc: stable

Thanks for making the changes!

Reviewed-by: Mike Kravetz <mike.kravetz@...cle.com>

-- 
Mike Kravetz