linux-kernel - Re: [PATCH 1/2] mm: replace BUG_ON in vm_insert

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <a2376ae0-c6a2-12e4-d4ad-04696eb51535@huawei.com>
Date:   Wed, 3 Feb 2021 09:27:04 +0800
From:   Miaohe Lin <linmiaohe@...wei.com>
To:     Suren Baghdasaryan <surenb@...gle.com>, <sumit.semwal@...aro.org>
CC:     <akpm@...ux-foundation.org>, <hch@...radead.org>,
        <lmark@...eaurora.org>, <labbott@...hat.com>,
        <Brian.Starkey@....com>, <john.stultz@...aro.org>,
        <christian.koenig@....com>, <cgoldswo@...eaurora.org>,
        <orjan.eide@....com>, <robin.murphy@....com>, <jajones@...dia.com>,
        <minchan@...nel.org>, <hridya@...gle.com>, <sspatil@...gle.com>,
        <linux-media@...r.kernel.org>, <dri-devel@...ts.freedesktop.org>,
        <linaro-mm-sig@...ts.linaro.org>, <linux-mm@...ck.org>,
        <linux-kernel@...r.kernel.org>, <kernel-team@...roid.com>
Subject: Re: [PATCH 1/2] mm: replace BUG_ON in vm_insert_page with a return of
 an error

Hi:
On 2021/2/3 8:31, Suren Baghdasaryan wrote:
> Replace BUG_ON(vma->vm_flags & VM_PFNMAP) in vm_insert_page with
> WARN_ON_ONCE and returning an error. This is to ensure users of the
> vm_insert_page that set VM_PFNMAP are notified of the wrong flag usage
> and get an indication of an error without panicing the kernel.
> This will help identifying drivers that need to clear VM_PFNMAP before
> using dmabuf system heap which is moving to use vm_insert_page.
> 
> Suggested-by: Christoph Hellwig <hch@...radead.org>
> Signed-off-by: Suren Baghdasaryan <surenb@...gle.com>

Looks reasonable. Thanks.
Reviewed-by: Miaohe Lin <linmiaohe@...wei.com>

> ---
>  mm/memory.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/mm/memory.c b/mm/memory.c
> index feff48e1465a..e503c9801cd9 100644
> --- a/mm/memory.c
> +++ b/mm/memory.c
> @@ -1827,7 +1827,8 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
>  		return -EINVAL;
>  	if (!(vma->vm_flags & VM_MIXEDMAP)) {
>  		BUG_ON(mmap_read_trylock(vma->vm_mm));
> -		BUG_ON(vma->vm_flags & VM_PFNMAP);
> +		if (WARN_ON_ONCE(vma->vm_flags & VM_PFNMAP))
> +			return -EINVAL;
>  		vma->vm_flags |= VM_MIXEDMAP;
>  	}
>  	return insert_page(vma, addr, page, vma->vm_page_prot);
>