Commit 98121d66 authored Apr 12, 2018 by Mauro Carvalho Chehab Committed by Greg Kroah-Hartman Aug 03, 2018

media: atomisp: compat32: fix __user annotations

[ Upstream commit ad4222a0e29664666a71685a6e732923ca7c7e45 ]

The __user annotations at the compat32 code is not right:

drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:81:18: warning: incorrect type in assignment (different address spaces)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:81:18: expected void *base
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:81:18: got void [noderef] <asn:1>*
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:232:23: warning: incorrect type in assignment (different address spaces)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:232:23: expected unsigned int [usertype] *xcoords_y
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:232:23: got void [noderef] <asn:1>*
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:233:23: warning: incorrect type in assignment (different address spaces)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:233:23: expected unsigned int [usertype] *ycoords_y
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:233:23: got void [noderef] <asn:1>*
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:234:24: warning: incorrect type in assignment (different address spaces)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:234:24: expected unsigned int [usertype] *xcoords_uv
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:234:24: got void [noderef] <asn:1>*
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:235:24: warning: incorrect type in assignment (different address spaces)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:235:24: expected unsigned int [usertype] *ycoords_uv
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:235:24: got void [noderef] <asn:1>*
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:296:29: warning: incorrect type in assignment (different address spaces)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:296:29: expected unsigned int [usertype] *effective_width
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:296:29: got void [noderef] <asn:1>*
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:360:29: warning: incorrect type in assignment (different address spaces)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:360:29: expected unsigned int [usertype] *effective_width
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:360:29: got void [noderef] <asn:1>*
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:437:19: warning: incorrect type in assignment (different address spaces)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:437:19: expected struct v4l2_framebuffer *frame
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:437:19: got void [noderef] <asn:1>*
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:481:29: warning: incorrect type in assignment (different address spaces)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:481:29: expected unsigned short *calb_grp_values
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:481:29: got void [noderef] <asn:1>*
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:701:39: warning: cast removes address space of expression
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:704:21: warning: incorrect type in argument 1 (different address spaces)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:704:21: expected void const volatile [noderef] <asn:1>*<noident>
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:704:21: got unsigned int [usertype] *src
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:737:43: warning: incorrect type in assignment (different address spaces)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:737:43: expected struct atomisp_shading_table *shading_table
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:737:43: got void [noderef] <asn:1>*
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:742:44: warning: incorrect type in argument 1 (different address spaces)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:742:44: expected void [noderef] <asn:1>*to
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:742:44: got struct atomisp_shading_table *shading_table
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:755:41: warning: incorrect type in assignment (different address spaces)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:755:41: expected struct atomisp_morph_table *morph_table
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:755:41: got void [noderef] <asn:1>*
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:760:44: warning: incorrect type in argument 1 (different address spaces)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:760:44: expected void [noderef] <asn:1>*to
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:760:44: got struct atomisp_morph_table *morph_table
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:772:40: warning: incorrect type in assignment (different address spaces)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:772:40: expected struct atomisp_dvs2_coefficients *dvs2_coefs
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:772:40: got void [noderef] <asn:1>*
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:777:44: warning: incorrect type in argument 1 (different address spaces)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:777:44: expected void [noderef] <asn:1>*to
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:777:44: got struct atomisp_dvs2_coefficients *dvs2_coefs
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:788:46: warning: incorrect type in assignment (different address spaces)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:788:46: expected struct atomisp_dvs_6axis_config *dvs_6axis_config
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:788:46: got void [noderef] <asn:1>*
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:793:44: warning: incorrect type in argument 1 (different address spaces)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:793:44: expected void [noderef] <asn:1>*to
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:793:44: got struct atomisp_dvs_6axis_config *dvs_6axis_config
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:853:17: warning: incorrect type in assignment (different address spaces)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:853:17: expected struct atomisp_sensor_ae_bracketing_lut_entry *lut
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c:853:17: got void [noderef] <asn:1>*

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent a5ed99bc

drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c

+26 −23

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp,
		get_user(kp->flags, &up->flags))
		return -EFAULT;

		kp->base = compat_ptr(tmp);
		kp->base = (void __force *)compat_ptr(tmp);
		get_v4l2_pix_format((struct v4l2_pix_format *)&kp->fmt, &up->fmt);
		return 0;
		}
		@@ -232,10 +232,10 @@ static int get_atomisp_dvs_6axis_config32(struct atomisp_dvs_6axis_config *kp,
		get_user(ycoords_uv, &up->ycoords_uv))
		return -EFAULT;

		kp->xcoords_y = compat_ptr(xcoords_y);
		kp->ycoords_y = compat_ptr(ycoords_y);
		kp->xcoords_uv = compat_ptr(xcoords_uv);
		kp->ycoords_uv = compat_ptr(ycoords_uv);
		kp->xcoords_y = (void __force *)compat_ptr(xcoords_y);
		kp->ycoords_y = (void __force *)compat_ptr(ycoords_y);
		kp->xcoords_uv = (void __force *)compat_ptr(xcoords_uv);
		kp->ycoords_uv = (void __force *)compat_ptr(ycoords_uv);
		return 0;
		}

		@@ -296,7 +296,7 @@ static int get_atomisp_metadata_stat32(struct atomisp_metadata *kp,
		return -EFAULT;

		kp->data = compat_ptr(data);
		kp->effective_width = compat_ptr(effective_width);
		kp->effective_width = (void __force *)compat_ptr(effective_width);
		return 0;
		}

		@@ -360,7 +360,7 @@ static int get_atomisp_metadata_by_type_stat32(
		return -EFAULT;

		kp->data = compat_ptr(data);
		kp->effective_width = compat_ptr(effective_width);
		kp->effective_width = (void __force *)compat_ptr(effective_width);
		return 0;
		}

		@@ -437,7 +437,7 @@ static int get_atomisp_overlay32(struct atomisp_overlay *kp,
		get_user(kp->overlay_start_x, &up->overlay_start_y))
		return -EFAULT;

		kp->frame = compat_ptr(frame);
		kp->frame = (void __force *)compat_ptr(frame);
		return 0;
		}

		@@ -481,7 +481,7 @@ static int get_atomisp_calibration_group32(
		get_user(calb_grp_values, &up->calb_grp_values))
		return -EFAULT;

		kp->calb_grp_values = compat_ptr(calb_grp_values);
		kp->calb_grp_values = (void __force *)compat_ptr(calb_grp_values);
		return 0;
		}

		@@ -703,8 +703,8 @@ static int get_atomisp_parameters32(struct atomisp_parameters *kp,
		return -EFAULT;

		while (n >= 0) {
		compat_uptr_t src = (compat_uptr_t )up + n;
		uintptr_t dst = (uintptr_t )kp + n;
		compat_uptr_t __user src = ((compat_uptr_t __user )up) + n;
		uintptr_t dst = ((uintptr_t )kp) + n;

		if (get_user((*dst), src))
		return -EFAULT;
		@@ -751,12 +751,12 @@ static int get_atomisp_parameters32(struct atomisp_parameters *kp,
		#endif
		return -EFAULT;

		kp->shading_table = user_ptr + offset;
		kp->shading_table = (void __force *)user_ptr + offset;
		offset = sizeof(struct atomisp_shading_table);
		if (!kp->shading_table)
		return -EFAULT;

		if (copy_to_user(kp->shading_table,
		if (copy_to_user((void __user *)kp->shading_table,
		&karg.shading_table,
		sizeof(struct atomisp_shading_table)))
		return -EFAULT;
		@@ -777,12 +777,13 @@ static int get_atomisp_parameters32(struct atomisp_parameters *kp,
		#endif
		return -EFAULT;

		kp->morph_table = user_ptr + offset;
		kp->morph_table = (void __force *)user_ptr + offset;
		offset += sizeof(struct atomisp_morph_table);
		if (!kp->morph_table)
		return -EFAULT;

		if (copy_to_user(kp->morph_table, &karg.morph_table,
		if (copy_to_user((void __user *)kp->morph_table,
		&karg.morph_table,
		sizeof(struct atomisp_morph_table)))
		return -EFAULT;
		}
		@@ -802,12 +803,13 @@ static int get_atomisp_parameters32(struct atomisp_parameters *kp,
		#endif
		return -EFAULT;

		kp->dvs2_coefs = user_ptr + offset;
		kp->dvs2_coefs = (void __force *)user_ptr + offset;
		offset += sizeof(struct atomisp_dis_coefficients);
		if (!kp->dvs2_coefs)
		return -EFAULT;

		if (copy_to_user(kp->dvs2_coefs, &karg.dvs2_coefs,
		if (copy_to_user((void __user *)kp->dvs2_coefs,
		&karg.dvs2_coefs,
		sizeof(struct atomisp_dis_coefficients)))
		return -EFAULT;
		}
		@@ -826,12 +828,13 @@ static int get_atomisp_parameters32(struct atomisp_parameters *kp,
		#endif
		return -EFAULT;

		kp->dvs_6axis_config = user_ptr + offset;
		kp->dvs_6axis_config = (void __force *)user_ptr + offset;
		offset += sizeof(struct atomisp_dvs_6axis_config);
		if (!kp->dvs_6axis_config)
		return -EFAULT;

		if (copy_to_user(kp->dvs_6axis_config, &karg.dvs_6axis_config,
		if (copy_to_user((void __user *)kp->dvs_6axis_config,
		&karg.dvs_6axis_config,
		sizeof(struct atomisp_dvs_6axis_config)))
		return -EFAULT;
		}
		@@ -891,7 +894,7 @@ static int get_atomisp_sensor_ae_bracketing_lut(
		get_user(lut, &up->lut))
		return -EFAULT;

		kp->lut = compat_ptr(lut);
		kp->lut = (void __force *)compat_ptr(lut);
		return 0;
		}