All of lore.kernel.org
 help / color / mirror / Atom feed
From: Oleg Nesterov <oleg@redhat.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Benjamin LaHaise <bcrl@kvack.org>,
	David Rientjes <rientjes@google.com>,
	Hugh Dickins <hughd@google.com>, Jeff Moyer <jmoyer@redhat.com>,
	Kirill Shutemov <kirill.shutemov@linux.intel.com>,
	Pavel Emelyanov <xemul@parallels.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH v2 5/5] mremap: simplify the "overlap" check in mremap_to()
Date: Thu, 2 Jul 2015 01:03:14 +0200	[thread overview]
Message-ID: <20150701230314.GA18043@redhat.com> (raw)
In-Reply-To: <20150701230244.GA18003@redhat.com>

Minor, but this check is overcomplicated. Two half-intervals do NOT
overlap if END1 <= START2 || END2 <= START1, mremap_to() just needs
to negate this check.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: David Rientjes <rientjes@google.com>
---
 mm/mremap.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/mm/mremap.c b/mm/mremap.c
index d3f42be..5a71cce 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -407,13 +407,8 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
 	if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
 		goto out;
 
-	/* Check if the location we're moving into overlaps the
-	 * old location at all, and fail if it does.
-	 */
-	if ((new_addr <= addr) && (new_addr+new_len) > addr)
-		goto out;
-
-	if ((addr <= new_addr) && (addr+old_len) > new_addr)
+	/* Ensure the old/new locations do not overlap */
+	if (addr + old_len > new_addr && new_addr + new_len > addr)
 		goto out;
 
 	ret = do_munmap(mm, new_addr, new_len);
-- 
1.5.5.1


  parent reply	other threads:[~2015-07-01 23:05 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-01 23:02 [PATCH v2 0/5] mremap fix/cleanups Oleg Nesterov
2015-07-01 23:03 ` [PATCH v2 1/5] mremap: don't leak new_vma if f_op->mremap() fails Oleg Nesterov
2015-07-01 23:03 ` [PATCH v2 2/5] mm: move ->mremap() from file_operations to vm_operations_struct Oleg Nesterov
2015-07-01 23:03 ` [PATCH v2 3/5] mremap: don't do mm_populate(new_addr) on failure Oleg Nesterov
2015-07-01 23:03 ` [PATCH v2 4/5] mremap: don't do uneccesary checks if new_len == old_len Oleg Nesterov
2015-07-01 23:03 ` Oleg Nesterov [this message]
2015-07-15 23:34 ` [PATCH v2 0/5] mremap fix/cleanups David Rientjes
2015-07-15 23:46   ` Andrew Morton

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=20150701230314.GA18043@redhat.com \
    --to=oleg@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=bcrl@kvack.org \
    --cc=hughd@google.com \
    --cc=jmoyer@redhat.com \
    --cc=kirill.shutemov@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rientjes@google.com \
    --cc=xemul@parallels.com \
    /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.