Commit 191c5424 authored by Al Viro's avatar Al Viro Committed by James Morris
Browse files

mm: collapse security_vm_enough_memory() variants into a single function 



Collapse security_vm_enough_memory() variants into a single function.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent bbd36568

include/linux/security.h

+0 −16
Original line number Diff line number Diff line
@@ -1679,9 +1679,7 @@ int security_quotactl(int cmds, int type, int id, struct super_block *sb); 
int security_quota_on(struct dentry *dentry);

int security_syslog(int type);

int security_settime(const struct timespec *ts, const struct timezone *tz);

int security_vm_enough_memory(long pages);

int security_vm_enough_memory_mm(struct mm_struct *mm, long pages);

int security_vm_enough_memory_kern(long pages);

int security_bprm_set_creds(struct linux_binprm *bprm);

int security_bprm_check(struct linux_binprm *bprm);

void security_bprm_committing_creds(struct linux_binprm *bprm);
@@ -1902,25 +1900,11 @@ static inline int security_settime(const struct timespec *ts, 
	return cap_settime(ts, 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_mm(struct mm_struct *mm, long pages)

{

	WARN_ON(mm == NULL);

	return cap_vm_enough_memory(mm, pages);

}



static inline 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 cap_vm_enough_memory(current->mm, pages);

}



static inline int security_bprm_set_creds(struct linux_binprm *bprm)

{

	return cap_bprm_set_creds(bprm);

kernel/fork.c

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) 
		charge = 0;

		if (mpnt->vm_flags & VM_ACCOUNT) {

			unsigned int len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;

			if (security_vm_enough_memory(len))

			if (security_vm_enough_memory_mm(oldmm, len)) /* sic */

				goto fail_nomem;

			charge = len;

		}

mm/mmap.c

+2 −2
Original line number Diff line number Diff line
@@ -1235,7 +1235,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, 
	 */

	if (accountable_mapping(file, vm_flags)) {

		charged = len >> PAGE_SHIFT;

		if (security_vm_enough_memory(charged))

		if (security_vm_enough_memory_mm(mm, charged))

			return -ENOMEM;

		vm_flags |= VM_ACCOUNT;

	}
@@ -2169,7 +2169,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len) 
	if (mm->map_count > sysctl_max_map_count)

		return -ENOMEM;



	if (security_vm_enough_memory(len >> PAGE_SHIFT))

	if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))

		return -ENOMEM;



	/* Can we just expand an old private anonymous mapping? */

mm/mprotect.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev, 
		if (!(oldflags & (VM_ACCOUNT|VM_WRITE|VM_HUGETLB|

						VM_SHARED|VM_NORESERVE))) {

			charged = nrpages;

			if (security_vm_enough_memory(charged))

			if (security_vm_enough_memory_mm(mm, charged))

				return -ENOMEM;

			newflags |= VM_ACCOUNT;

		}

mm/mremap.c

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr, 


	if (vma->vm_flags & VM_ACCOUNT) {

		unsigned long charged = (new_len - old_len) >> PAGE_SHIFT;

		if (security_vm_enough_memory(charged))

		if (security_vm_enough_memory_mm(mm, charged))

			goto Efault;

		*p = charged;

	}