diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/kmod.c | 4 | ||||
-rw-r--r-- | kernel/sysctl.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/kernel/kmod.c b/kernel/kmod.c index 5c63c53014a9..f8121b95183f 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include <linux/mount.h> | 35 | #include <linux/mount.h> |
36 | #include <linux/kernel.h> | 36 | #include <linux/kernel.h> |
37 | #include <linux/init.h> | 37 | #include <linux/init.h> |
38 | #include <linux/resource.h> | ||
38 | #include <asm/uaccess.h> | 39 | #include <asm/uaccess.h> |
39 | 40 | ||
40 | extern int max_threads; | 41 | extern int max_threads; |
@@ -158,6 +159,9 @@ static int ____call_usermodehelper(void *data) | |||
158 | FD_SET(0, fdt->open_fds); | 159 | FD_SET(0, fdt->open_fds); |
159 | FD_CLR(0, fdt->close_on_exec); | 160 | FD_CLR(0, fdt->close_on_exec); |
160 | spin_unlock(&f->file_lock); | 161 | spin_unlock(&f->file_lock); |
162 | |||
163 | /* and disallow core files too */ | ||
164 | current->signal->rlim[RLIMIT_CORE] = (struct rlimit){0, 0}; | ||
161 | } | 165 | } |
162 | 166 | ||
163 | /* We can run anywhere, unlike our parent keventd(). */ | 167 | /* We can run anywhere, unlike our parent keventd(). */ |
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index c57c4532e296..ba42694f0453 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -294,7 +294,7 @@ static ctl_table kern_table[] = { | |||
294 | .ctl_name = KERN_CORE_PATTERN, | 294 | .ctl_name = KERN_CORE_PATTERN, |
295 | .procname = "core_pattern", | 295 | .procname = "core_pattern", |
296 | .data = core_pattern, | 296 | .data = core_pattern, |
297 | .maxlen = 64, | 297 | .maxlen = 128, |
298 | .mode = 0644, | 298 | .mode = 0644, |
299 | .proc_handler = &proc_dostring, | 299 | .proc_handler = &proc_dostring, |
300 | .strategy = &sysctl_string, | 300 | .strategy = &sysctl_string, |