Commit cf55902b authored Oct 13, 2016 by Dan Carpenter Committed by Greg Kroah-Hartman Oct 24, 2016

staging: android: ion: Fix error handling in ion_query_heaps()



If the copy_to_user() fails we should unlock and return directly without
updating "cnt".  Also the return value should be -EFAULT instead of the
number of bytes remaining.

Fixes: 02b23803 ("staging: android: ion: Add ioctl to query available heaps")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 8b77eb97

drivers/staging/android/ion/ion.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1187,8 +1187,10 @@ int ion_query_heaps(struct ion_client client, struct ion_heap_query query)
		hdata.type = heap->type;
		hdata.heap_id = heap->id;

		ret = copy_to_user(&buffer[cnt],
		&hdata, sizeof(hdata));
		if (copy_to_user(&buffer[cnt], &hdata, sizeof(hdata))) {
		ret = -EFAULT;
		goto out;
		}

		cnt++;
		if (cnt >= max_cnt)