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

Commit 2dfe49da authored by Ben Hutchings's avatar Ben Hutchings Committed by Greg Kroah-Hartman
Browse files

staging: android: ashmem: Fix a race condition in pin ioctls 



commit ce8a3a9e76d0193e2e8d74a06d275b3c324ca652 upstream.

ashmem_pin_unpin() reads asma->file and asma->size before taking the
ashmem_mutex, so it can race with other operations that modify them.

Build-tested only.

Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fedae0f6

drivers/staging/android/ashmem.c

+11 −8
Original line number Diff line number Diff line
@@ -719,30 +719,32 @@ static int ashmem_pin_unpin(struct ashmem_area *asma, unsigned long cmd, 
	size_t pgstart, pgend;

	int ret = -EINVAL;



	mutex_lock(&ashmem_mutex);



	if (unlikely(!asma->file))

		return -EINVAL;

		goto out_unlock;



	if (unlikely(copy_from_user(&pin, p, sizeof(pin))))

		return -EFAULT;

	if (unlikely(copy_from_user(&pin, p, sizeof(pin)))) {

		ret = -EFAULT;

		goto out_unlock;

	}



	/* per custom, you can pass zero for len to mean "everything onward" */

	if (!pin.len)

		pin.len = PAGE_ALIGN(asma->size) - pin.offset;



	if (unlikely((pin.offset | pin.len) & ~PAGE_MASK))

		return -EINVAL;

		goto out_unlock;



	if (unlikely(((__u32)-1) - pin.offset < pin.len))

		return -EINVAL;

		goto out_unlock;



	if (unlikely(PAGE_ALIGN(asma->size) < pin.offset + pin.len))

		return -EINVAL;

		goto out_unlock;



	pgstart = pin.offset / PAGE_SIZE;

	pgend = pgstart + (pin.len / PAGE_SIZE) - 1;



	mutex_lock(&ashmem_mutex);



	switch (cmd) {

	case ASHMEM_PIN:

		ret = ashmem_pin(asma, pgstart, pgend);
@@ -755,6 +757,7 @@ static int ashmem_pin_unpin(struct ashmem_area *asma, unsigned long cmd, 
		break;

	}



out_unlock:

	mutex_unlock(&ashmem_mutex);



	return ret;