Commit 34b4e4aa authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

fix NULL pointer dereference in __vm_enough_memory() 



The new exec code inserts an accounted vma into an mm struct which is not
current->mm.  The existing memory check code has a hard coded assumption
that this does not happen as does the security code.

As the correct mm is known we pass the mm to the security method and the
helper function.  A new security test is added for the case where we need
to pass the mm and the existing one is modified to pass current->mm to
avoid the need to change large amounts of code.

(Thanks to Tobias for fixing rejects and testing)

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Cc: WU Fengguang <wfg@mail.ustc.edu.cn>
Cc: James Morris <jmorris@redhat.com>
Cc: Tobias Diedrich <ranma+kernel@tdiedrich.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent afe1ab4d

include/linux/mm.h

+1 −1
Original line number Diff line number Diff line
@@ -1042,7 +1042,7 @@ static inline void vma_nonlinear_insert(struct vm_area_struct *vma, 
}



/* mmap.c */

extern int __vm_enough_memory(long pages, int cap_sys_admin);

extern int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admin);

extern void vma_adjust(struct vm_area_struct *vma, unsigned long start,

	unsigned long end, pgoff_t pgoff, struct vm_area_struct *insert);

extern struct vm_area_struct *vma_merge(struct mm_struct *,

include/linux/security.h

+15 −5
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ extern int cap_inode_removexattr(struct dentry *dentry, char *name); 
extern int cap_task_post_setuid (uid_t old_ruid, uid_t old_euid, uid_t old_suid, int flags);

extern void cap_task_reparent_to_init (struct task_struct *p);

extern int cap_syslog (int type);

extern int cap_vm_enough_memory (long pages);

extern int cap_vm_enough_memory (struct mm_struct *mm, long pages);



struct msghdr;

struct sk_buff;
@@ -1125,6 +1125,7 @@ struct request_sock; 
 *	Return 0 if permission is granted.

 * @vm_enough_memory:

 *	Check permissions for allocating a new virtual mapping.

 *	@mm contains the mm struct it is being added to.

 *      @pages contains the number of pages.

 *	Return 0 if permission is granted.

 *
@@ -1169,7 +1170,7 @@ struct security_operations { 
	int (*quota_on) (struct dentry * dentry);

	int (*syslog) (int type);

	int (*settime) (struct timespec *ts, struct timezone *tz);

	int (*vm_enough_memory) (long pages);

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



	int (*bprm_alloc_security) (struct linux_binprm * bprm);

	void (*bprm_free_security) (struct linux_binprm * bprm);
@@ -1469,10 +1470,14 @@ static inline int security_settime(struct timespec *ts, struct timezone *tz) 
	return security_ops->settime(ts, tz);

}





static inline int security_vm_enough_memory(long pages)

{

	return security_ops->vm_enough_memory(pages);

	return security_ops->vm_enough_memory(current->mm, pages);

}



static inline int security_vm_enough_memory_mm(struct mm_struct *mm, long pages)

{

	return security_ops->vm_enough_memory(mm, pages);

}



static inline int security_bprm_alloc (struct linux_binprm *bprm)
@@ -2219,7 +2224,12 @@ static inline int security_settime(struct timespec *ts, struct timezone *tz) 


static inline int security_vm_enough_memory(long pages)

{

	return cap_vm_enough_memory(pages);

	return cap_vm_enough_memory(current->mm, pages);

}



static inline int security_vm_enough_memory_mm(struct mm_struct *mm, long pages)

{

	return cap_vm_enough_memory(mm, pages);

}



static inline int security_bprm_alloc (struct linux_binprm *bprm)

mm/mmap.c

+3 −3
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ atomic_t vm_committed_space = ATOMIC_INIT(0); 
 * Note this is a helper function intended to be used by LSMs which

 * wish to use this logic.

 */

int __vm_enough_memory(long pages, int cap_sys_admin)

int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admin)

{

	unsigned long free, allowed;
@@ -166,7 +166,7 @@ int __vm_enough_memory(long pages, int cap_sys_admin) 


	/* Don't let a single process grow too big:

	   leave 3% of the size of this process for other processes */

	allowed -= current->mm->total_vm / 32;

	allowed -= mm->total_vm / 32;



	/*

	 * cast `allowed' as a signed long because vm_committed_space
@@ -2077,7 +2077,7 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma) 
	if (__vma && __vma->vm_start < vma->vm_end)

		return -ENOMEM;

	if ((vma->vm_flags & VM_ACCOUNT) &&

	     security_vm_enough_memory(vma_pages(vma)))

	     security_vm_enough_memory_mm(mm, vma_pages(vma)))

		return -ENOMEM;

	vma_link(mm, vma, prev, rb_link, rb_parent);

	return 0;

mm/nommu.c

+1 −1
Original line number Diff line number Diff line
@@ -1270,7 +1270,7 @@ EXPORT_SYMBOL(get_unmapped_area); 
 * Note this is a helper function intended to be used by LSMs which

 * wish to use this logic.

 */

int __vm_enough_memory(long pages, int cap_sys_admin)

int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admin)

{

	unsigned long free, allowed;

security/commoncap.c

+2 −2
Original line number Diff line number Diff line
@@ -315,13 +315,13 @@ int cap_syslog (int type) 
	return 0;

}



int cap_vm_enough_memory(long pages)

int cap_vm_enough_memory(struct mm_struct *mm, long pages)

{

	int cap_sys_admin = 0;



	if (cap_capable(current, CAP_SYS_ADMIN) == 0)

		cap_sys_admin = 1;

	return __vm_enough_memory(pages, cap_sys_admin);

	return __vm_enough_memory(mm, pages, cap_sys_admin);

}



EXPORT_SYMBOL(cap_capable);

CRA Git | Maintained and supported by SUSTech CRA and CCSE