Merge "msm: camera: Lack of copy_from_user in camera driver."

	struct msm_camera_private_ioctl_arg *k_ioctl,

	void __user **tmp_compat_ioctl_ptr)

{

	struct msm_camera_private_ioctl_arg *up_ioctl_ptr =

		(struct msm_camera_private_ioctl_arg *)arg;

	struct msm_camera_private_ioctl_arg up_ioctl;

	if (WARN_ON(!arg || !k_ioctl || !tmp_compat_ioctl_ptr))

		return -EIO;

	k_ioctl->id = up_ioctl_ptr->id;

	k_ioctl->size = up_ioctl_ptr->size;

	k_ioctl->result = up_ioctl_ptr->result;

	k_ioctl->reserved = up_ioctl_ptr->reserved;

	*tmp_compat_ioctl_ptr = compat_ptr(up_ioctl_ptr->ioctl_ptr);

	if (copy_from_user(&up_ioctl,

		(struct msm_camera_private_ioctl_arg *)arg,

		sizeof(struct msm_camera_private_ioctl_arg)))

		return -EFAULT;

	k_ioctl->id = up_ioctl.id;

	k_ioctl->size = up_ioctl.size;

	k_ioctl->result = up_ioctl.result;

	k_ioctl->reserved = up_ioctl.reserved;

	*tmp_compat_ioctl_ptr = compat_ptr(up_ioctl.ioctl_ptr);

	return 0;

}