linux-kernel - [PATCH 3.16 252/366] mm: refuse wrapped vm

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]

Date:   Sun, 11 Nov 2018 19:49:05 +0000
From:   Ben Hutchings <ben@...adent.org.uk>
To:     linux-kernel@...r.kernel.org, stable@...r.kernel.org
CC:     akpm@...ux-foundation.org, "Kees Cook" <keescook@...omium.org>,
        "Andrea Arcangeli" <aarcange@...hat.com>,
        "Konstantin Khlebnikov" <koct9i@...il.com>,
        "Linus Torvalds" <torvalds@...ux-foundation.org>,
        "Alexander Viro" <viro@...iv.linux.org.uk>,
        "Chen Gang" <gang.chen.5i5j@...il.com>,
        "Hector Marco-Gisbert" <hecmargi@....es>,
        "Michal Hocko" <mhocko@...e.com>,
        "Kirill A. Shutemov" <kirill.shutemov@...ux.intel.com>,
        "Ismael Ripoll Ripoll" <iripoll@....es>,
        "Andrey Ryabinin" <aryabinin@...tuozzo.com>,
        "Oleg Nesterov" <oleg@...hat.com>
Subject: [PATCH 3.16 252/366] mm: refuse wrapped vm_brk requests

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

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

From: Kees Cook <keescook@...omium.org>

commit ba093a6d9397da8eafcfbaa7d95bd34255da39a0 upstream.

The vm_brk() alignment calculations should refuse to overflow.  The ELF
loader depending on this, but it has been fixed now.  No other unsafe
callers have been found.

Link: http://lkml.kernel.org/r/1468014494-25291-3-git-send-email-keescook@chromium.org
Signed-off-by: Kees Cook <keescook@...omium.org>
Reported-by: Hector Marco-Gisbert <hecmargi@....es>
Cc: Ismael Ripoll Ripoll <iripoll@....es>
Cc: Alexander Viro <viro@...iv.linux.org.uk>
Cc: "Kirill A. Shutemov" <kirill.shutemov@...ux.intel.com>
Cc: Oleg Nesterov <oleg@...hat.com>
Cc: Chen Gang <gang.chen.5i5j@...il.com>
Cc: Michal Hocko <mhocko@...e.com>
Cc: Konstantin Khlebnikov <koct9i@...il.com>
Cc: Andrea Arcangeli <aarcange@...hat.com>
Cc: Andrey Ryabinin <aryabinin@...tuozzo.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>
---
 mm/mmap.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2751,16 +2751,18 @@ static inline void verify_mm_writelocked
  *  anonymous maps.  eventually we may be able to do some
  *  brk-specific accounting here.
  */
-static unsigned long do_brk(unsigned long addr, unsigned long len)
+static unsigned long do_brk(unsigned long addr, unsigned long request)
 {
 	struct mm_struct * mm = current->mm;
 	struct vm_area_struct * vma, * prev;
-	unsigned long flags;
+	unsigned long flags, len;
 	struct rb_node ** rb_link, * rb_parent;
 	pgoff_t pgoff = addr >> PAGE_SHIFT;
 	int error;
 
-	len = PAGE_ALIGN(len);
+	len = PAGE_ALIGN(request);
+	if (len < request)
+		return -ENOMEM;
 	if (!len)
 		return addr;