All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Jörn Engel" <joern@purestorage.com>
To: Helge Deller <deller@gmx.de>, Hugh Dickins <hughd@google.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH] mm: Fix overflow check in expand_upwards()
Date: Thu, 29 Jun 2017 16:02:56 -0700	[thread overview]
Message-ID: <20170629230256.GB494@cork> (raw)

I believe the overflow check was correct, then got subtly broken by
	commit bd726c90b6b8
	Author: Helge Deller <deller@gmx.de>
	Date:   Mon Jun 19 17:34:05 2017 +0200

	    Allow stack to grow up to address space limit

The old overflow check may have been a bit subtle and I suppose Helge
missed its importance.

	if (!address)
		return -ENOMEM;

Functionally the my check is identical to the old one.  I just hope the
alternative form (and comment!) make it harder to miss and break things
in a future patch.

Signed-off-by: Joern Engel <joern@logfs.org>
---
 mm/mmap.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mm/mmap.c b/mm/mmap.c
index a5e3dcd75e79..7366f62c31f4 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2232,7 +2232,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
 
 	/* Guard against exceeding limits of the address space. */
 	address &= PAGE_MASK;
-	if (address >= TASK_SIZE)
+	/* second check is for integer overflow */
+	if (address >= TASK_SIZE || address + PAGE_SIZE < address)
 		return -ENOMEM;
 	address += PAGE_SIZE;
 
-- 
2.1.4

             reply	other threads:[~2017-06-29 23:04 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-29 23:02 Jörn Engel [this message]
2017-06-30  6:57 ` [PATCH] mm: Fix overflow check in expand_upwards() Helge Deller
2017-06-30  7:34   ` Helge Deller
2017-06-30 18:26     ` Jörn Engel
2017-06-30 14:51   ` Jörn Engel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170629230256.GB494@cork \
    --to=joern@purestorage.com \
    --cc=deller@gmx.de \
    --cc=hughd@google.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.