]>
Commit | Line | Data |
---|---|---|
2380c486 JR |
1 | --- linux-2.6.28/fs/proc/Kconfig~ 2008-11-20 23:26:34.000000000 +0100 |
2 | +++ linux-2.6.28/fs/proc/Kconfig 2008-12-01 20:37:12.000000000 +0100 | |
3 | @@ -59,8 +59,8 @@ | |
4 | limited in memory. | |
87bc9f9d JR |
5 | |
6 | config PROC_PAGE_MONITOR | |
7 | - default n | |
8 | - depends on PROC_FS && MMU && !GRKERNSEC | |
9 | + default y | |
10 | + depends on PROC_FS && MMU | |
11 | bool "Enable /proc page monitoring" if EMBEDDED | |
12 | help | |
13 | Various /proc files exist to monitor process memory utilization: | |
2380c486 JR |
14 | --- linux-2.6.28/mm/slab.c~ 2009-01-18 02:10:12.395711069 +0100 |
15 | +++ linux-2.6.28/mm/slab.c 2009-01-18 02:18:05.632401077 +0100 | |
16 | @@ -4496,8 +4496,15 @@ | |
87bc9f9d | 17 | |
2380c486 JR |
18 | static int __init slab_proc_init(void) |
19 | { | |
20 | -#if !defined(CONFIG_GRKERNSEC_PROC_ADD) | |
21 | - proc_create("slabinfo",S_IWUSR|S_IRUGO,NULL,&proc_slabinfo_operations); | |
22 | + int gr_mode = S_IWUSR|S_IRUGO; | |
23 | +#ifdef CONFIG_GRKERNSEC_PROC_USER | |
24 | + gr_mode = S_IRUSR; | |
25 | +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP) | |
26 | + gr_mode = S_IRUSR | S_IRGRP; | |
27 | +#endif | |
28 | + | |
87bc9f9d JR |
29 | +#ifdef CONFIG_GRKERNSEC_PROC_ADD |
30 | + proc_create("slabinfo",gr_mode,NULL,&proc_slabinfo_operations); | |
87bc9f9d JR |
31 | #ifdef CONFIG_DEBUG_SLAB_LEAK |
32 | proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations); | |
33 | #endif |