The patch titled
nfsd: fix vm overcommit crash fix #2
has been added to the -mm tree. Its filename is
nfsd-fix-vm-overcommit-crash-fix-2.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: nfsd: fix vm overcommit crash fix #2
From: Junjiro R. Okajima <hooanon05@xxxxxxxxxxx>
The previous patch from Alan Cox (Subject: nfsd: fix vm overcommit
crash) fixed the problem where knfsd crashes on exported shmemfs
objects and strict overcommit is set. But the patch forgot supporting
the case when CONFIG_SECURITY is disabled.
This patch copies a part of his fix which is mainly for detecting a bug
earlier.
Acked-by: James Morris <jmorris@xxxxxxxxx>
Signed-off-by: Alan Cox <alan@xxxxxxxxxx>
Signed-off-by: Junjiro R. Okajima <hooanon05@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/security.h | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff -puN include/linux/security.h~nfsd-fix-vm-overcommit-crash-fix-2 include/linux/security.h
--- a/include/linux/security.h~nfsd-fix-vm-overcommit-crash-fix-2
+++ a/include/linux/security.h
@@ -1860,17 +1860,21 @@ static inline int security_settime(struc
static inline int security_vm_enough_memory(long pages)
{
+ WARN_ON(current->mm == NULL);
return cap_vm_enough_memory(current->mm, pages);
}
-static inline int security_vm_enough_memory_kern(long pages)
+static inline int security_vm_enough_memory_mm(struct mm_struct *mm, long pages)
{
- return cap_vm_enough_memory(current->mm, pages);
+ WARN_ON(mm == NULL);
+ return cap_vm_enough_memory(mm, pages);
}
-static inline int security_vm_enough_memory_mm(struct mm_struct *mm, long pages)
+static inline int security_vm_enough_memory_kern(long pages)
{
- return cap_vm_enough_memory(mm, pages);
+ /* If current->mm is a kernel thread then we will pass NULL,
+ for this specific case that is fine */
+ return cap_vm_enough_memory(current->mm, pages);
}
static inline int security_bprm_set_creds(struct linux_binprm *bprm)
_
Patches currently in -mm which might be from hooanon05@xxxxxxxxxxx are
nfsd-fix-vm-overcommit-crash-fix-2.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
