Commit cd2567b6 authored by Davidlohr Bueso's avatar Davidlohr Bueso Committed by Linus Torvalds
Browse files

m68k: call find_vma with the mmap_sem held in sys_cacheflush() 



Performing vma lookups without taking the mm->mmap_sem is asking for
trouble.  While doing the search, the vma in question can be modified or
even removed before returning to the caller.  Take the lock (shared) in
order to avoid races while iterating through the vmacache and/or rbtree.
In addition, this guarantees that the address space will remain intact
during the CPU flushing.

Signed-off-by: default avatarDavidlohr Bueso <davidlohr@hp.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7cc36bbd

arch/m68k/kernel/sys_m68k.c

+13 −8
Original line number Diff line number Diff line
@@ -376,7 +376,6 @@ cache_flush_060 (unsigned long addr, int scope, int cache, unsigned long len) 
asmlinkage int

sys_cacheflush (unsigned long addr, int scope, int cache, unsigned long len)

{

	struct vm_area_struct *vma;

	int ret = -EINVAL;



	if (scope < FLUSH_SCOPE_LINE || scope > FLUSH_SCOPE_ALL ||
@@ -389,17 +388,21 @@ sys_cacheflush (unsigned long addr, int scope, int cache, unsigned long len) 
		if (!capable(CAP_SYS_ADMIN))

			goto out;

	} else {

		struct vm_area_struct *vma;



		/* Check for overflow.  */

		if (addr + len < addr)

			goto out;



		/*

		 * Verify that the specified address region actually belongs

		 * to this process.

		 */

		vma = find_vma (current->mm, addr);

		ret = -EINVAL;

		/* Check for overflow.  */

		if (addr + len < addr)

			goto out;

		if (vma == NULL || addr < vma->vm_start || addr + len > vma->vm_end)

			goto out;

		down_read(&current->mm->mmap_sem);

		vma = find_vma(current->mm, addr);

		if (!vma || addr < vma->vm_start || addr + len > vma->vm_end)

			goto out_unlock;

	}



	if (CPU_IS_020_OR_030) {
@@ -429,7 +432,7 @@ sys_cacheflush (unsigned long addr, int scope, int cache, unsigned long len) 
			__asm__ __volatile__ ("movec %0, %%cacr" : : "r" (cacr));

		}

		ret = 0;

		goto out;

		goto out_unlock;

	} else {

	    /*

	     * 040 or 060: don't blindly trust 'scope', someone could
@@ -446,6 +449,8 @@ sys_cacheflush (unsigned long addr, int scope, int cache, unsigned long len) 
		ret = cache_flush_060 (addr, scope, cache, len);

	    }

	}

out_unlock:

	up_read(&current->mm->mmap_sem);

out:

	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE