]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
media: dvb_frontend: add proper __user annotations
authorMauro Carvalho Chehab <mchehab@s-opensource.com>
Thu, 22 Mar 2018 15:40:15 +0000 (11:40 -0400)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Thu, 22 Mar 2018 15:40:15 +0000 (11:40 -0400)
Solves those warnings:
drivers/media/dvb-core/dvb_frontend.c:2297:39: warning: incorrect type in argument 1 (different address spaces)
drivers/media/dvb-core/dvb_frontend.c:2297:39:    expected void const [noderef] <asn:1>*<noident>
drivers/media/dvb-core/dvb_frontend.c:2297:39:    got struct dtv_property *props
drivers/media/dvb-core/dvb_frontend.c:2331:39: warning: incorrect type in argument 1 (different address spaces)
drivers/media/dvb-core/dvb_frontend.c:2331:39:    expected void const [noderef] <asn:1>*<noident>
drivers/media/dvb-core/dvb_frontend.c:2331:39:    got struct dtv_property *props

No functional changes.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/dvb-core/dvb_frontend.c

index a7ed16e0841d5001174cc19c78a98b510290fac5..21a7d4b47e1a48bb65498df0dfb5b3b175f66302 100644 (file)
@@ -2294,7 +2294,7 @@ static int dvb_frontend_handle_ioctl(struct file *file,
                if (!tvps->num || (tvps->num > DTV_IOCTL_MAX_MSGS))
                        return -EINVAL;
 
-               tvp = memdup_user(tvps->props, tvps->num * sizeof(*tvp));
+               tvp = memdup_user((void __user *)tvps->props, tvps->num * sizeof(*tvp));
                if (IS_ERR(tvp))
                        return PTR_ERR(tvp);
 
@@ -2328,7 +2328,7 @@ static int dvb_frontend_handle_ioctl(struct file *file,
                if (!tvps->num || (tvps->num > DTV_IOCTL_MAX_MSGS))
                        return -EINVAL;
 
-               tvp = memdup_user(tvps->props, tvps->num * sizeof(*tvp));
+               tvp = memdup_user((void __user *)tvps->props, tvps->num * sizeof(*tvp));
                if (IS_ERR(tvp))
                        return PTR_ERR(tvp);