Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b79cd04 authored by Junjiro R. Okajima's avatar Junjiro R. Okajima Committed by Linus Torvalds
Browse files

nfsd: fix vm overcommit crash fix #2 



The previous patch from Alan Cox ("nfsd: fix vm overcommit crash",
commit 731572d3) 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: default avatarJames Morris <jmorris@namei.org>
Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarJunjiro R. Okajima <hooanon05@yahoo.co.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 061e41fd

include/linux/security.h

+8 −4
Original line number Diff line number Diff line
@@ -1818,17 +1818,21 @@ static inline int security_settime(struct timespec *ts, struct timezone *tz) 


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_alloc(struct linux_binprm *bprm)