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

Commit 40265bbe authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] v4l2-ctrl: fix error return of copy_to/from_user 



copy_to/from_user returns the number of bytes not copied, it does not
return a 'normal' linux error code.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent c336f75e

drivers/media/v4l2-core/v4l2-ctrls.c

+6 −5
Original line number Diff line number Diff line
@@ -1326,7 +1326,8 @@ static int ptr_to_user(struct v4l2_ext_control *c, 
	u32 len;



	if (ctrl->is_ptr && !ctrl->is_string)

		return copy_to_user(c->ptr, ptr.p, c->size);

		return copy_to_user(c->ptr, ptr.p, c->size) ?

		       -EFAULT : 0;



	switch (ctrl->type) {

	case V4L2_CTRL_TYPE_STRING:
@@ -1373,7 +1374,7 @@ static int user_to_ptr(struct v4l2_ext_control *c, 
	if (ctrl->is_ptr && !ctrl->is_string) {

		unsigned idx;



		ret = copy_from_user(ptr.p, c->ptr, c->size);

		ret = copy_from_user(ptr.p, c->ptr, c->size) ? -EFAULT : 0;

		if (ret || !ctrl->is_array)

			return ret;

		for (idx = c->size / ctrl->elem_size; idx < ctrl->elems; idx++)
@@ -1391,7 +1392,7 @@ static int user_to_ptr(struct v4l2_ext_control *c, 
			return -ERANGE;

		if (size > ctrl->maximum + 1)

			size = ctrl->maximum + 1;

		ret = copy_from_user(ptr.p_char, c->string, size);

		ret = copy_from_user(ptr.p_char, c->string, size) ? -EFAULT : 0;

		if (!ret) {

			char last = ptr.p_char[size - 1];
@@ -1401,7 +1402,7 @@ static int user_to_ptr(struct v4l2_ext_control *c, 
			if (strlen(ptr.p_char) == ctrl->maximum && last)

				return -ERANGE;

		}

		return ret ? -EFAULT : 0;

		return ret;

	default:

		*ptr.p_s32 = c->value;

		break;