diff options
| author | James Morris <jmorris@namei.org> | 2009-09-11 00:04:49 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-09-11 00:04:49 +0200 |
| commit | a3c8b97396ef42edfb845788ba6f53b2a93ce980 (patch) | |
| tree | 530c5bdbc534618311dab3e0af245835af56db0f /kernel/kmod.c | |
| parent | Linux 2.6.31 (diff) | |
| parent | binfmt_elf: fix PT_INTERP bss handling (diff) | |
| download | linux-a3c8b97396ef42edfb845788ba6f53b2a93ce980.tar.xz linux-a3c8b97396ef42edfb845788ba6f53b2a93ce980.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'kernel/kmod.c')
| -rw-r--r-- | kernel/kmod.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/kmod.c b/kernel/kmod.c index 385c31a1bdbf..4e8cae2e9148 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c @@ -78,6 +78,10 @@ int __request_module(bool wait, const char *fmt, ...) #define MAX_KMOD_CONCURRENT 50 /* Completely arbitrary value - KAO */ static int kmod_loop_msg; + ret = security_kernel_module_request(); + if (ret) + return ret; + va_start(args, fmt); ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args); va_end(args); @@ -462,6 +466,7 @@ int call_usermodehelper_exec(struct subprocess_info *sub_info, int retval = 0; BUG_ON(atomic_read(&sub_info->cred->usage) != 1); + validate_creds(sub_info->cred); helper_lock(); if (sub_info->path[0] == '\0') |