linux-arch.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Vladimir Murzin <murzin.v@gmail.com>
To: linux-arch@vger.kernel.org
Cc: tglx@linutronix.de, davem@davemloft.net, lethal@linux-sh.org,
	linux@arm.linux.org.uk, Vladimir Murzin <murzin.v@gmail.com>
Subject: [PATCH 5/6] get_unmapped_area checks for TASK_SIZE before MAP_FIXED on x86_64
Date: Tue,  8 May 2012 18:40:21 +0400	[thread overview]
Message-ID: <1336488022-3723-6-git-send-email-murzin.v@gmail.com> (raw)
In-Reply-To: <1336488022-3723-1-git-send-email-murzin.v@gmail.com>

Move check for TASK_SIZE before MAP_FIXED in x86_64's arch_get_unmapped_area().

Signed-off-by: Vladimir Murzin <murzin.v@gmail.com>
---
 arch/x86/kernel/sys_x86_64.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
index 0514890..1988a9f 100644
--- a/arch/x86/kernel/sys_x86_64.c
+++ b/arch/x86/kernel/sys_x86_64.c
@@ -129,14 +129,14 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
 	unsigned long start_addr;
 	unsigned long begin, end;
 
-	if (flags & MAP_FIXED)
-		return addr;
-
 	find_start_end(flags, &begin, &end);
 
 	if (len > end)
 		return -ENOMEM;
 
+	if (flags & MAP_FIXED)
+		return addr;
+
 	if (addr) {
 		addr = PAGE_ALIGN(addr);
 		vma = find_vma(mm, addr);
-- 
1.7.2.5

  parent reply	other threads:[~2012-05-08 14:43 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-08 14:40 [PATCH 0/6] get rid of extra check for TASK_SIZE in get_unmapped_area Vladimir Murzin
2012-05-08 14:40 ` [PATCH 1/6] get_unmapped_area checks for TASK_SIZE before MAP_FIXED on arm Vladimir Murzin
2012-05-08 14:40 ` [PATCH 2/6] get_unmapped_area checks for TASK_SIZE before MAP_FIXED on sh Vladimir Murzin
2012-05-08 14:40 ` [PATCH 3/6] get_unmapped_area checks for TASK_SIZE before MAP_FIXED on sparc32 Vladimir Murzin
2012-05-08 16:27   ` Sam Ravnborg
2012-05-09  8:07     ` Vladimir Murzin
2012-05-09 16:18       ` Sam Ravnborg
2012-05-09 18:04         ` Vladimir Murzin
2012-05-08 17:00   ` David Miller
2012-05-08 14:40 ` [PATCH 4/6] get_unmapped_area checks for TASK_SIZE before MAP_FIXED on sparc64 Vladimir Murzin
2012-05-08 17:00   ` David Miller
2012-05-08 14:40 ` Vladimir Murzin [this message]
2012-05-08 14:40 ` [PATCH 6/6] get_unmapped_area remove extra check for TASK_SIZE Vladimir Murzin
2012-05-09 16:26 ` [PATCH 0/6] get rid of extra check for TASK_SIZE in get_unmapped_area Russell King - ARM Linux
2012-05-09 17:56   ` Vladimir Murzin
2012-05-09 18:07     ` Russell King - ARM Linux
2012-05-10  3:01       ` Vladimir Murzin
2012-05-10  7:55         ` Russell King - ARM Linux
2012-05-10 18:08           ` Vladimir Murzin

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=1336488022-3723-6-git-send-email-murzin.v@gmail.com \
    --to=murzin.v@gmail.com \
    --cc=davem@davemloft.net \
    --cc=lethal@linux-sh.org \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=tglx@linutronix.de \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).