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

Commit e77414e0 authored Dec 05, 2009 by Al Viro

fix broken aliasing checks for MAP_FIXED on sparc32, mips, arm and sh



We want addr - (pgoff << PAGE_SHIFT) consistently coloured...

Acked-by: Paul Mundt <lethal@linux-sh.org>
Acked-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

parent bb52d669

arch/arm/mm/mmap.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -54,7 +54,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
	* We enforce the MAP_FIXED case.		* We enforce the MAP_FIXED case.
	*/		*/
	if (flags & MAP_FIXED) {		if (flags & MAP_FIXED) {
	if (aliasing && flags & MAP_SHARED && addr & (SHMLBA - 1))		if (aliasing && flags & MAP_SHARED &&
			(addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1))
	return -EINVAL;		return -EINVAL;
	return addr;		return addr;
	}		}

arch/mips/kernel/syscall.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -93,7 +93,8 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
	* We do not accept a shared mapping if it would violate		* We do not accept a shared mapping if it would violate
	* cache aliasing constraints.		* cache aliasing constraints.
	*/		*/
	if ((flags & MAP_SHARED) && (addr & shm_align_mask))		if ((flags & MAP_SHARED) &&
			((addr - (pgoff << PAGE_SHIFT)) & shm_align_mask))
	return -EINVAL;		return -EINVAL;
	return addr;		return addr;
	}		}

arch/sh/mm/mmap.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -54,7 +54,8 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
	/* We do not accept a shared mapping if it would violate		/* We do not accept a shared mapping if it would violate
	* cache aliasing constraints.		* cache aliasing constraints.
	*/		*/
	if ((flags & MAP_SHARED) && (addr & shm_align_mask))		if ((flags & MAP_SHARED) &&
			((addr - (pgoff << PAGE_SHIFT)) & shm_align_mask))
	return -EINVAL;		return -EINVAL;
	return addr;		return addr;
	}		}

arch/sparc/kernel/sys_sparc_32.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -45,7 +45,8 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
	/* We do not accept a shared mapping if it would violate		/* We do not accept a shared mapping if it would violate
	* cache aliasing constraints.		* cache aliasing constraints.
	*/		*/
	if ((flags & MAP_SHARED) && (addr & (SHMLBA - 1)))		if ((flags & MAP_SHARED) &&
			((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
	return -EINVAL;		return -EINVAL;
	return addr;		return addr;
	}		}