* [PATCH -next] nommu: Provide mmap_min_addr definition.
@ 2009-06-09 8:48 Paul Mundt
2009-06-09 10:03 ` Stephen Rothwell
2009-06-09 23:25 ` James Morris
0 siblings, 2 replies; 3+ messages in thread
From: Paul Mundt @ 2009-06-09 8:48 UTC (permalink / raw)
To: James Morris; +Cc: Christoph Lameter, linux-next
With the "security: use mmap_min_addr indepedently of security models"
change, mmap_min_addr is used in common areas, which susbsequently blows
up the nommu build. This stubs in the definition in the nommu case as
well.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Cc: Christoph Lameter <cl@linux-foundation.org>
Cc: James Morris <jmorris@namei.org>
--
mm/nommu.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/mm/nommu.c b/mm/nommu.c
index b571ef7..2fd2ad5 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -69,6 +69,9 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
int heap_stack_gap = 0;
+/* amount of vm to protect from userspace access */
+unsigned long mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
+
atomic_long_t mmap_pages_allocated;
EXPORT_SYMBOL(mem_map);
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH -next] nommu: Provide mmap_min_addr definition.
2009-06-09 8:48 [PATCH -next] nommu: Provide mmap_min_addr definition Paul Mundt
@ 2009-06-09 10:03 ` Stephen Rothwell
2009-06-09 23:25 ` James Morris
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2009-06-09 10:03 UTC (permalink / raw)
To: James Morris; +Cc: Paul Mundt, Christoph Lameter, linux-next
[-- Attachment #1: Type: text/plain, Size: 709 bytes --]
Hi James,
On Tue, 9 Jun 2009 17:48:56 +0900 Paul Mundt <lethal@linux-sh.org> wrote:
>
> With the "security: use mmap_min_addr indepedently of security models"
> change, mmap_min_addr is used in common areas, which susbsequently blows
> up the nommu build. This stubs in the definition in the nommu case as
> well.
I have reverted the above commit
(e0a94c2a63f2644826069044649669b5e7ca75d3 "security: use mmap_min_addr
indepedently of security models") from linux-next for today. Hopefully
you will apply Paul's patch (or something similar) to the
security-testing tree for tomorrow.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH -next] nommu: Provide mmap_min_addr definition.
2009-06-09 8:48 [PATCH -next] nommu: Provide mmap_min_addr definition Paul Mundt
2009-06-09 10:03 ` Stephen Rothwell
@ 2009-06-09 23:25 ` James Morris
1 sibling, 0 replies; 3+ messages in thread
From: James Morris @ 2009-06-09 23:25 UTC (permalink / raw)
To: Paul Mundt; +Cc: Christoph Lameter, linux-next
On Tue, 9 Jun 2009, Paul Mundt wrote:
> With the "security: use mmap_min_addr indepedently of security models"
> change, mmap_min_addr is used in common areas, which susbsequently blows
> up the nommu build. This stubs in the definition in the nommu case as
> well.
>
Thanks.
Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next
> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
> Cc: Christoph Lameter <cl@linux-foundation.org>
> Cc: James Morris <jmorris@namei.org>
>
> --
>
> mm/nommu.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/mm/nommu.c b/mm/nommu.c
> index b571ef7..2fd2ad5 100644
> --- a/mm/nommu.c
> +++ b/mm/nommu.c
> @@ -69,6 +69,9 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
> int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
> int heap_stack_gap = 0;
>
> +/* amount of vm to protect from userspace access */
> +unsigned long mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
> +
> atomic_long_t mmap_pages_allocated;
>
> EXPORT_SYMBOL(mem_map);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-next" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
James Morris
<jmorris@namei.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-06-09 23:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-06-09 8:48 [PATCH -next] nommu: Provide mmap_min_addr definition Paul Mundt
2009-06-09 10:03 ` Stephen Rothwell
2009-06-09 23:25 ` James Morris
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).