Skip to contentSkip to conversation

nommu: Provide mmap_min_addr definition.

PATCH In review Paul Mundt 3 participants 3 messages Jun 9, 2009

Subsystems (3)
Memory management Linux-next tree Memory mapping
lore
Share & tools
lore

Paul Mundt

author
#0 lore raw

PATCH 1/1 nommu: Provide mmap_min_addr definition.

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 <[email protected]>
Cc Christoph Lameter <[email protected]>
Cc James Morris <[email protected]>

--

 mm/nommu.c |    3 +++
 1 file changed, 3 insertions(+)
mm/nommu.c +3 -0
index b571ef7..2fd2ad5 100644
@@ -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);
#1 lore raw

Hi James,

Quoted 5 lines · On Tue, 9 Jun 2009 17:48:56 +0900 Paul Mundt <[email protected]> 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.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
#2 lore raw
In reply to Paul Mundt
Quoted 5 lines · Paul Mundt

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

Quoted 28 lines
Signed-off-by Paul Mundt <[email protected]>
Cc Christoph Lameter <[email protected]>
Cc James Morris <[email protected]>

--

 mm/nommu.c |    3 +++
 1 file changed, 3 insertions(+)
mm/nommu.c +3 -1
index b571ef7..2fd2ad5 100644
@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Signature · 2 lines
James Morris
<[email protected]>