split cap_mmap_addr() out of cap_file_mmap() (d007794a) · Commits · e / devices / android_kernel_oneplus_sm7250

include/linux/security.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -86,6 +86,7 @@ extern int cap_inode_setxattr(struct dentry dentry, const char name,
	extern int cap_inode_removexattr(struct dentry dentry, const char name);		extern int cap_inode_removexattr(struct dentry dentry, const char name);
	extern int cap_inode_need_killpriv(struct dentry *dentry);		extern int cap_inode_need_killpriv(struct dentry *dentry);
	extern int cap_inode_killpriv(struct dentry *dentry);		extern int cap_inode_killpriv(struct dentry *dentry);
			extern int cap_mmap_addr(unsigned long addr);
	extern int cap_file_mmap(struct file *file, unsigned long reqprot,		extern int cap_file_mmap(struct file *file, unsigned long reqprot,
	unsigned long prot, unsigned long flags,		unsigned long prot, unsigned long flags,
	unsigned long addr, unsigned long addr_only);		unsigned long addr, unsigned long addr_only);
	@@ -2187,7 +2188,7 @@ static inline int security_file_mmap(struct file *file, unsigned long reqprot,
	unsigned long addr,		unsigned long addr,
	unsigned long addr_only)		unsigned long addr_only)
	{		{
	return cap_file_mmap(file, reqprot, prot, flags, addr, addr_only);		return cap_mmap_addr(addr);
	}		}

	static inline int security_file_mprotect(struct vm_area_struct *vma,		static inline int security_file_mprotect(struct vm_area_struct *vma,

security/apparmor/lsm.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -497,7 +497,7 @@ static int apparmor_file_mmap(struct file *file, unsigned long reqprot,
	int rc = 0;		int rc = 0;

	/* do DAC check */		/* do DAC check */
	rc = cap_file_mmap(file, reqprot, prot, flags, addr, addr_only);		rc = cap_mmap_addr(addr);
	if (rc \|\| addr_only)		if (rc \|\| addr_only)
	return rc;		return rc;

security/commoncap.c

+23 −9

Original line number	Original line	Diff line number	Diff line
	@@ -958,22 +958,15 @@ int cap_vm_enough_memory(struct mm_struct *mm, long pages)
	}		}

	/*		/*
	* cap_file_mmap - check if able to map given addr		* cap_mmap_addr - check if able to map given addr
	* @file: unused
	* @reqprot: unused
	* @prot: unused
	* @flags: unused
	* @addr: address attempting to be mapped		* @addr: address attempting to be mapped
	* @addr_only: unused
	*		*
	* If the process is attempting to map memory below dac_mmap_min_addr they need		* If the process is attempting to map memory below dac_mmap_min_addr they need
	* CAP_SYS_RAWIO. The other parameters to this function are unused by the		* CAP_SYS_RAWIO. The other parameters to this function are unused by the
	* capability security module. Returns 0 if this mapping should be allowed		* capability security module. Returns 0 if this mapping should be allowed
	* -EPERM if not.		* -EPERM if not.
	*/		*/
	int cap_file_mmap(struct file *file, unsigned long reqprot,		int cap_mmap_addr(unsigned long addr)
	unsigned long prot, unsigned long flags,
	unsigned long addr, unsigned long addr_only)
	{		{
	int ret = 0;		int ret = 0;

	@@ -986,3 +979,24 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
	}		}
	return ret;		return ret;
	}		}

			/*
			* cap_file_mmap - check if able to map given addr
			* @file: unused
			* @reqprot: unused
			* @prot: unused
			* @flags: unused
			* @addr: address attempting to be mapped
			* @addr_only: unused
			*
			* If the process is attempting to map memory below dac_mmap_min_addr they need
			* CAP_SYS_RAWIO. The other parameters to this function are unused by the
			* capability security module. Returns 0 if this mapping should be allowed
			* -EPERM if not.
			*/
			int cap_file_mmap(struct file *file, unsigned long reqprot,
			unsigned long prot, unsigned long flags,
			unsigned long addr, unsigned long addr_only)
			{
			return cap_mmap_addr(addr);
			}

security/selinux/hooks.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3104,7 +3104,7 @@ static int selinux_file_mmap(struct file *file, unsigned long reqprot,
	}		}

	/* do DAC check on address space usage */		/* do DAC check on address space usage */
	rc = cap_file_mmap(file, reqprot, prot, flags, addr, addr_only);		rc = cap_mmap_addr(addr);
	if (rc \|\| addr_only)		if (rc \|\| addr_only)
	return rc;		return rc;

security/smack/smack_lsm.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1199,7 +1199,7 @@ static int smack_file_mmap(struct file *file,
	int rc;		int rc;

	/* do DAC check on address space usage */		/* do DAC check on address space usage */
	rc = cap_file_mmap(file, reqprot, prot, flags, addr, addr_only);		rc = cap_mmap_addr(addr);
	if (rc \|\| addr_only)		if (rc \|\| addr_only)
	return rc;		return rc;