[PATCH 4/4] mremap: simplify the "overlap" check in mremap_to()

From: Oleg Nesterov
Date: Fri Jun 19 2015 - 19:21:05 EST


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@xxxxxxxxxx>
---
mm/mremap.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/mm/mremap.c b/mm/mremap.c
index 2416721..ed1b13a 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -406,10 +406,7 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
/* 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)
+ 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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
Please read the FAQ at http://www.tux.org/lkml/