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

Commit e006043a authored by Jack Steiner's avatar Jack Steiner Committed by Linus Torvalds
Browse files

gru: check for valid vma 



Fix bug caused by failure to allocate a GRU gts structure.  The old code
failed to handle the case where the vma was invalid.

Signed-off-by: default avatarJack Steiner <steiner@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 33f36483

drivers/misc/sgi-gru/grufault.c

+12 −9
Original line number Original line Diff line number Diff line
@@ -90,19 +90,22 @@ static struct gru_thread_state *gru_alloc_locked_gts(unsigned long vaddr) 
{

{

	struct mm_struct *mm = current->mm;

	struct mm_struct *mm = current->mm;

	struct vm_area_struct *vma;

	struct vm_area_struct *vma;

	struct gru_thread_state *gts = NULL;

	struct gru_thread_state *gts = ERR_PTR(-EINVAL);





	down_write(&mm->mmap_sem);

	down_write(&mm->mmap_sem);

	vma = gru_find_vma(vaddr);

	vma = gru_find_vma(vaddr);

	if (vma)

	if (!vma)

		goto err;



	gts = gru_alloc_thread_state(vma, TSID(vaddr, vma));

	gts = gru_alloc_thread_state(vma, TSID(vaddr, vma));

	if (!IS_ERR(gts)) {

	if (IS_ERR(gts))

		goto err;

	mutex_lock(&gts->ts_ctxlock);

	mutex_lock(&gts->ts_ctxlock);

	downgrade_write(&mm->mmap_sem);

	downgrade_write(&mm->mmap_sem);

	} else {

	return gts;

		up_write(&mm->mmap_sem);

	}





err:

	up_write(&mm->mmap_sem);

	return gts;

	return gts;

}

}