Commit 644ddbe1 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: davinci_vpfe: fix __user annotations 



The __user annotations on this driver are wrong, causing lots
of warnings:

    drivers/staging/media/davinci_vpfe/dm365_ipipe.c:1269:22: warning: incorrect type in assignment (different address spaces)
    drivers/staging/media/davinci_vpfe/dm365_ipipe.c:1269:22:    expected void [noderef] <asn:1>*from
    drivers/staging/media/davinci_vpfe/dm365_ipipe.c:1269:22:    got void *[noderef] <asn:1><noident>
    drivers/staging/media/davinci_vpfe/dm365_ipipe.c:1313:20: warning: incorrect type in assignment (different address spaces)
    drivers/staging/media/davinci_vpfe/dm365_ipipe.c:1313:20:    expected void [noderef] <asn:1>*to
    drivers/staging/media/davinci_vpfe/dm365_ipipe.c:1313:20:    got void *[noderef] <asn:1><noident>
    drivers/staging/media/davinci_vpfe/dm365_ipipeif.c:424:41: warning: incorrect type in initializer (different address spaces)
    drivers/staging/media/davinci_vpfe/dm365_ipipeif.c:424:41:    expected struct ipipeif_params *config
    drivers/staging/media/davinci_vpfe/dm365_ipipeif.c:424:41:    got void [noderef] <asn:1>*arg
    drivers/staging/media/davinci_vpfe/dm365_ipipeif.c:474:46: warning: incorrect type in argument 2 (different address spaces)
    drivers/staging/media/davinci_vpfe/dm365_ipipeif.c:474:46:    expected void [noderef] <asn:1>*arg
    drivers/staging/media/davinci_vpfe/dm365_ipipeif.c:474:46:    got void *arg
    drivers/staging/media/davinci_vpfe/dm365_resizer.c:922:32: warning: incorrect type in argument 2 (different address spaces)
    drivers/staging/media/davinci_vpfe/dm365_resizer.c:922:32:    expected void const [noderef] <asn:1>*from
    drivers/staging/media/davinci_vpfe/dm365_resizer.c:922:32:    got struct vpfe_rsz_config_params *config
    drivers/staging/media/davinci_vpfe/dm365_resizer.c:945:27: warning: incorrect type in argument 1 (different address spaces)
    drivers/staging/media/davinci_vpfe/dm365_resizer.c:945:27:    expected void [noderef] <asn:1>*to
    drivers/staging/media/davinci_vpfe/dm365_resizer.c:945:27:    got void *<noident>

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent aa8485d6

drivers/staging/media/davinci_vpfe/dm365_ipipe.c

+6 −9
Original line number Diff line number Diff line
@@ -1258,16 +1258,14 @@ static int ipipe_s_config(struct v4l2_subdev *sd, struct vpfe_ipipe_config *cfg) 
	for (i = 0; i < ARRAY_SIZE(ipipe_modules); i++) {

		const struct ipipe_module_if *module_if;

		struct ipipe_module_params *params;

		void __user *from;

		void *from, *to;

		size_t size;

		void *to;



		if (!(cfg->flag & BIT(i)))

			continue;



		module_if = &ipipe_modules[i];

		from = *(void * __user *)

			((void *)cfg + module_if->config_offset);

		from = *(void **)((void *)cfg + module_if->config_offset);



		params = kmalloc(sizeof(struct ipipe_module_params),

				 GFP_KERNEL);
@@ -1275,7 +1273,7 @@ static int ipipe_s_config(struct v4l2_subdev *sd, struct vpfe_ipipe_config *cfg) 
		size = module_if->param_size;



		if (to && from && size) {

			if (copy_from_user(to, from, size)) {

			if (copy_from_user(to, (void __user *)from, size)) {

				rval = -EFAULT;

				break;

			}
@@ -1302,15 +1300,14 @@ static int ipipe_g_config(struct v4l2_subdev *sd, struct vpfe_ipipe_config *cfg) 
	for (i = 1; i < ARRAY_SIZE(ipipe_modules); i++) {

		const struct ipipe_module_if *module_if;

		struct ipipe_module_params *params;

		void __user *to;

		void *from, *to;

		size_t size;

		void *from;



		if (!(cfg->flag & BIT(i)))

			continue;



		module_if = &ipipe_modules[i];

		to = *(void * __user *)((void *)cfg + module_if->config_offset);

		to = *(void **)((void *)cfg + module_if->config_offset);



		params = kmalloc(sizeof(struct ipipe_module_params),

				 GFP_KERNEL);
@@ -1321,7 +1318,7 @@ static int ipipe_g_config(struct v4l2_subdev *sd, struct vpfe_ipipe_config *cfg) 
			rval = module_if->get(ipipe, from);

			if (rval)

				goto error;

			if (copy_to_user(to, from, size)) {

			if (copy_to_user((void __user *)to, from, size)) {

				rval = -EFAULT;

				break;

			}

drivers/staging/media/davinci_vpfe/dm365_ipipeif.c

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ ipipeif_set_config(struct v4l2_subdev *sd, struct ipipeif_params *config) 
}



static int

ipipeif_get_config(struct v4l2_subdev *sd, void __user *arg)

ipipeif_get_config(struct v4l2_subdev *sd, void *arg)

{

	struct vpfe_ipipeif_device *ipipeif = v4l2_get_subdevdata(sd);

	struct ipipeif_params *config = arg;

drivers/staging/media/davinci_vpfe/dm365_resizer.c

+5 −4
Original line number Diff line number Diff line
@@ -919,7 +919,8 @@ resizer_set_configuration(struct vpfe_resizer_device *resizer, 
		resizer_set_default_configuration(resizer);

	else

		if (copy_from_user(&resizer->config.user_config,

		    chan_config->config, sizeof(struct vpfe_rsz_config_params)))

				   (void __user *)chan_config->config,

				   sizeof(struct vpfe_rsz_config_params)))

			return -EFAULT;



	return 0;
@@ -942,7 +943,7 @@ resizer_get_configuration(struct vpfe_resizer_device *resizer, 
		return -EINVAL;

	}



	if (copy_to_user((void *)chan_config->config,

	if (copy_to_user((void __user *)chan_config->config,

			 (void *)&resizer->config.user_config,

			 sizeof(struct vpfe_rsz_config_params))) {

		dev_err(dev, "resizer_get_configuration: Error in copy to user\n");