linux-kernel - [PATCH 3.16 009/410] mm/madvise.c: fix madvise() infinite loop under special circumstances

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 for Android: free password hash cracker in your pocket

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

Message-ID: <lsq.1528380321.948186959@decadent.org.uk>
Date:   Thu, 07 Jun 2018 15:05:21 +0100
From:   Ben Hutchings <ben@...adent.org.uk>
To:     linux-kernel@...r.kernel.org, stable@...r.kernel.org
CC:     akpm@...ux-foundation.org, "Miao Xie" <miaoxie@...wei.com>,
        "Dan Williams" <dan.j.williams@...el.com>,
        "David Rientjes" <rientjes@...gle.com>,
        "Carsten Otte" <cotte@...ibm.com>, "Shaohua Li" <shli@...com>,
        "Mel Gorman" <mgorman@...hsingularity.net>,
        "Mike Rapoport" <rppt@...ux.vnet.ibm.com>,
        "Linus Torvalds" <torvalds@...ux-foundation.org>,
        "Anshuman Khandual" <khandual@...ux.vnet.ibm.com>,
        "Kirill A. Shutemov" <kirill.shutemov@...ux.intel.com>,
        "Rik van Riel" <riel@...hat.com>,
        "zhangyi (F)" <yi.zhang@...wei.com>,
        "Andrea Arcangeli" <aarcange@...hat.com>,
        "Michal Hocko" <mhocko@...e.com>,
        "guoxuenan" <guoxuenan@...wei.com>,
        "Minchan Kim" <minchan@...nel.org>, "chenjie" <chenjie6@...wei.com>
Subject: [PATCH 3.16 009/410] mm/madvise.c: fix madvise() infinite loop
 under special circumstances

3.16.57-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: chenjie <chenjie6@...wei.com>

commit 6ea8d958a2c95a1d514015d4e29ba21a8c0a1a91 upstream.

MADVISE_WILLNEED has always been a noop for DAX (formerly XIP) mappings.
Unfortunately madvise_willneed() doesn't communicate this information
properly to the generic madvise syscall implementation.  The calling
convention is quite subtle there.  madvise_vma() is supposed to either
return an error or update &prev otherwise the main loop will never
advance to the next vma and it will keep looping for ever without a way
to get out of the kernel.

It seems this has been broken since introduction.  Nobody has noticed
because nobody seems to be using MADVISE_WILLNEED on these DAX mappings.

[mhocko@...e.com: rewrite changelog]
Link: http://lkml.kernel.org/r/20171127115318.911-1-guoxuenan@huawei.com
Fixes: fe77ba6f4f97 ("[PATCH] xip: madvice/fadvice: execute in place")
Signed-off-by: chenjie <chenjie6@...wei.com>
Signed-off-by: guoxuenan <guoxuenan@...wei.com>
Acked-by: Michal Hocko <mhocko@...e.com>
Cc: Minchan Kim <minchan@...nel.org>
Cc: zhangyi (F) <yi.zhang@...wei.com>
Cc: Miao Xie <miaoxie@...wei.com>
Cc: Mike Rapoport <rppt@...ux.vnet.ibm.com>
Cc: Shaohua Li <shli@...com>
Cc: Andrea Arcangeli <aarcange@...hat.com>
Cc: Mel Gorman <mgorman@...hsingularity.net>
Cc: Kirill A. Shutemov <kirill.shutemov@...ux.intel.com>
Cc: David Rientjes <rientjes@...gle.com>
Cc: Anshuman Khandual <khandual@...ux.vnet.ibm.com>
Cc: Rik van Riel <riel@...hat.com>
Cc: Carsten Otte <cotte@...ibm.com>
Cc: Dan Williams <dan.j.williams@...el.com>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@...ux-foundation.org>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@...adent.org.uk>
---
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -221,9 +221,9 @@ static long madvise_willneed(struct vm_a
 {
 	struct file *file = vma->vm_file;
 
+	*prev = vma;
 #ifdef CONFIG_SWAP
 	if (!file || mapping_cap_swap_backed(file->f_mapping)) {
-		*prev = vma;
 		if (!file)
 			force_swapin_readahead(vma, start, end);
 		else
@@ -241,7 +241,6 @@ static long madvise_willneed(struct vm_a
 		return 0;
 	}
 
-	*prev = vma;
 	start = ((start - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
 	if (end > vma->vm_end)
 		end = vma->vm_end;