diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-31 08:17:34 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-31 08:17:34 +0100 |
| commit | a1744d3bee19d3b9cbfb825ab316a101b9c9f109 (patch) | |
| tree | c0e2324c09beca0eb5782eb5abf241ea2b7a4a11 /security | |
| parent | pci: use pci_ioremap_bar() in drivers/net (diff) | |
| parent | xfrm: do not leak ESRCH to user space (diff) | |
| download | linux-a1744d3bee19d3b9cbfb825ab316a101b9c9f109.tar.xz linux-a1744d3bee19d3b9cbfb825ab316a101b9c9f109.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/p54/p54common.c
Diffstat (limited to 'security')
| -rw-r--r-- | security/security.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/security/security.c b/security/security.c index 255b08559b2b..c0acfa7177e5 100644 --- a/security/security.c +++ b/security/security.c @@ -198,14 +198,23 @@ int security_settime(struct timespec *ts, struct timezone *tz) int security_vm_enough_memory(long pages) { + WARN_ON(current->mm == NULL); return security_ops->vm_enough_memory(current->mm, pages); } int security_vm_enough_memory_mm(struct mm_struct *mm, long pages) { + WARN_ON(mm == NULL); return security_ops->vm_enough_memory(mm, pages); } +int security_vm_enough_memory_kern(long pages) +{ + /* If current->mm is a kernel thread then we will pass NULL, + for this specific case that is fine */ + return security_ops->vm_enough_memory(current->mm, pages); +} + int security_bprm_alloc(struct linux_binprm *bprm) { return security_ops->bprm_alloc_security(bprm); |