From: Jonathan Gonzalez V <z...@gnu.org>
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 in order to avoid races while iterating through
the vmacache and/or rbtree.
This patch is completely *untested*.
Signed-off-by: Jonathan Gonzalez V <z...@gnu.org>
Signed-off-by: Davidlohr Bueso <davidl...@hp.com>
Cc: Dimitri Sivanich <sivan...@sgi.com
---
drivers/misc/sgi-gru/grufault.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/misc/sgi-gru/grufault.c b/drivers/misc/sgi-gru/grufault.c
index f74fc0c..15adc84 100644
--- a/drivers/misc/sgi-gru/grufault.c
+++ b/drivers/misc/sgi-gru/grufault.c
@@ -266,6 +266,7 @@ static int gru_vtop(struct gru_thread_state *gts, unsigned
long vaddr,
unsigned long paddr;
int ret, ps;
+ down_write(&mm->mmap_sem);
vma = find_vma(mm, vaddr);
if (!vma)
goto inval;
@@ -277,22 +278,26 @@ static int gru_vtop(struct gru_thread_state *gts,
unsigned long vaddr,
rmb(); /* Must/check ms_range_active before loading PTEs */
ret = atomic_pte_lookup(vma, vaddr, write, &paddr, &ps);
if (ret) {
- if (atomic)
- goto upm;
+ if (atomic) {
+ up_write(&mm->mmap_sem);
+ return VTOP_RETRY;
+ }
if (non_atomic_pte_lookup(vma, vaddr, write, &paddr, &ps))
goto inval;
}
if (is_gru_paddr(paddr))
goto inval;
+
+ up_write(&mm->mmap_sem);
+
paddr = paddr & ~((1UL << ps) - 1);
*gpa = uv_soc_phys_ram_to_gpa(paddr);
*pageshift = ps;
return VTOP_SUCCESS;
inval:
+ up_write(&mm->mmap_sem);
return VTOP_INVALID;
-upm:
- return VTOP_RETRY;
}
--
1.8.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
