LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: WANG Cong <xiyou.wangcong@gmail.com>
To: Andrew Morton <akpm@osdl.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
WANG Cong <xiyou.wangcong@gmail.com>,
Christoph Hellwig <hch@infradead.org>,
Christoph Lameter <clameter@sgi.com>
Subject: [PATCH 02/16] mm: use get_personality()
Date: Sat, 23 Feb 2008 16:14:05 +0800 [thread overview]
Message-ID: <1203754478165-git-send-email-xiyou.wangcong@gmail.com> (raw)
In-Reply-To: <12037544671847-git-send-email-xiyou.wangcong@gmail.com>
Use get_personality() macro instead of explicit reference
for mm/ code.
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Christoph Lameter <clameter@sgi.com>
---
mm/mmap.c | 2 +-
mm/mprotect.c | 2 +-
mm/nommu.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/mm/mmap.c b/mm/mmap.c
index a32d28c..42d647f 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -910,7 +910,7 @@ unsigned long do_mmap_pgoff(struct file * file, unsigned long addr,
* (the exception is when the underlying filesystem is noexec
* mounted, in which case we dont add PROT_EXEC.)
*/
- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
+ if ((prot & PROT_READ) && (get_personality() & READ_IMPLIES_EXEC))
if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
prot |= PROT_EXEC;
diff --git a/mm/mprotect.c b/mm/mprotect.c
index 4de5468..620b8db 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -237,7 +237,7 @@ sys_mprotect(unsigned long start, size_t len, unsigned long prot)
/*
* Does the application expect PROT_READ to imply PROT_EXEC:
*/
- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
+ if ((prot & PROT_READ) && (get_personality() & READ_IMPLIES_EXEC))
prot |= PROT_EXEC;
vm_flags = calc_vm_prot_bits(prot);
diff --git a/mm/nommu.c b/mm/nommu.c
index 5d8ae08..a1c6162 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -665,7 +665,7 @@ static int validate_mmap_request(struct file *file,
}
else if ((prot & PROT_READ) && !(prot & PROT_EXEC)) {
/* handle implication of PROT_EXEC by PROT_READ */
- if (current->personality & READ_IMPLIES_EXEC) {
+ if (get_personality() & READ_IMPLIES_EXEC) {
if (capabilities & BDI_CAP_EXEC_MAP)
prot |= PROT_EXEC;
}
@@ -686,7 +686,7 @@ static int validate_mmap_request(struct file *file,
/* handle PROT_EXEC implication by PROT_READ */
if ((prot & PROT_READ) &&
- (current->personality & READ_IMPLIES_EXEC))
+ (get_personality() & READ_IMPLIES_EXEC))
prot |= PROT_EXEC;
}
--
1.5.3.8
next prev parent reply other threads:[~2008-02-23 8:29 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-23 8:14 [PATCH 00/16] (Resend) Use get_personality() WANG Cong
2008-02-23 8:14 ` [PATCH 01/16] Make the macro get_personality function-like WANG Cong
2008-02-23 8:14 ` WANG Cong [this message]
2008-02-23 8:14 ` [PATCH 03/16] fs: use get_personality() WANG Cong
2008-02-23 8:14 ` [PATCH 04/16] powerpc: " WANG Cong
2008-02-23 8:14 ` [PATCH 05/16] parisc: " WANG Cong
2008-02-23 8:14 ` [PATCH 06/16] sparc(64): " WANG Cong
2008-02-23 8:14 ` [PATCH 07/16] arm: " WANG Cong
2008-02-23 8:14 ` [PATCH 08/16] x86: " WANG Cong
2008-02-23 8:14 ` [PATCH 09/16] um: " WANG Cong
2008-02-23 8:14 ` [PATCH 10/16] s390: " WANG Cong
2008-02-23 8:14 ` [PATCH 11/16] mips: " WANG Cong
2008-02-23 8:14 ` [PATCH 12/16] ia64: " WANG Cong
2008-02-23 8:14 ` [PATCH 13/16] alpha: " WANG Cong
2008-02-23 8:14 ` [PATCH 14/16] frv: " WANG Cong
2008-02-23 8:14 ` [PATCH 15/16] mn10300: " WANG Cong
2008-02-23 8:14 ` [PATCH 16/16] kernel: " WANG Cong
2008-02-23 12:03 ` [PATCH 15/16] mn10300: " David Howells
2008-02-23 12:02 ` [PATCH 14/16] frv: " David Howells
2008-02-23 10:08 ` [PATCH 08/16] x86: " Ingo Molnar
2008-02-23 10:19 ` Ingo Molnar
2008-02-23 10:39 ` WANG Cong
2008-02-23 9:06 ` Accessor macros vs reference counting Matthew Wilcox
2008-02-23 12:46 ` David Newall
2008-02-23 14:56 ` Matthew Wilcox
2008-02-23 8:58 ` [PATCH 01/16] Make the macro get_personality function-like Bryan Wu
2008-02-23 8:51 ` [PATCH 00/16] (Resend) Use get_personality() Alexey Dobriyan
2008-02-23 8:59 ` WANG Cong
2008-02-23 9:27 ` Alexey Dobriyan
2008-02-23 9:56 ` WANG Cong
2008-02-23 18:37 ` Christoph Hellwig
2008-02-23 19:16 ` Andrew Morton
2008-02-24 4:03 ` WANG Cong
2008-02-25 2:14 ` [PATCH] Remove the macro get_personality WANG Cong
2008-02-23 12:02 ` [PATCH 01/16] Make the macro get_personality function-like David Howells
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=1203754478165-git-send-email-xiyou.wangcong@gmail.com \
--to=xiyou.wangcong@gmail.com \
--cc=akpm@osdl.org \
--cc=clameter@sgi.com \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--subject='Re: [PATCH 02/16] mm: use get_personality()' \
/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
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).