|
@@ -1934,15 +1934,13 @@ static int dvb_frontend_ioctl_properties(struct file *file,
|
|
|
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
|
|
|
int err = 0;
|
|
|
|
|
|
- struct dtv_properties *tvps = NULL;
|
|
|
+ struct dtv_properties *tvps = parg;
|
|
|
struct dtv_property *tvp = NULL;
|
|
|
int i;
|
|
|
|
|
|
dev_dbg(fe->dvb->device, "%s:\n", __func__);
|
|
|
|
|
|
- if(cmd == FE_SET_PROPERTY) {
|
|
|
- tvps = (struct dtv_properties __user *)parg;
|
|
|
-
|
|
|
+ if (cmd == FE_SET_PROPERTY) {
|
|
|
dev_dbg(fe->dvb->device, "%s: properties.num = %d\n", __func__, tvps->num);
|
|
|
dev_dbg(fe->dvb->device, "%s: properties.props = %p\n", __func__, tvps->props);
|
|
|
|
|
@@ -1957,7 +1955,8 @@ static int dvb_frontend_ioctl_properties(struct file *file,
|
|
|
goto out;
|
|
|
}
|
|
|
|
|
|
- if (copy_from_user(tvp, tvps->props, tvps->num * sizeof(struct dtv_property))) {
|
|
|
+ if (copy_from_user(tvp, (void __user *)tvps->props,
|
|
|
+ tvps->num * sizeof(struct dtv_property))) {
|
|
|
err = -EFAULT;
|
|
|
goto out;
|
|
|
}
|
|
@@ -1972,10 +1971,7 @@ static int dvb_frontend_ioctl_properties(struct file *file,
|
|
|
if (c->state == DTV_TUNE)
|
|
|
dev_dbg(fe->dvb->device, "%s: Property cache is full, tuning\n", __func__);
|
|
|
|
|
|
- } else
|
|
|
- if(cmd == FE_GET_PROPERTY) {
|
|
|
- tvps = (struct dtv_properties __user *)parg;
|
|
|
-
|
|
|
+ } else if (cmd == FE_GET_PROPERTY) {
|
|
|
dev_dbg(fe->dvb->device, "%s: properties.num = %d\n", __func__, tvps->num);
|
|
|
dev_dbg(fe->dvb->device, "%s: properties.props = %p\n", __func__, tvps->props);
|
|
|
|
|
@@ -1990,7 +1986,8 @@ static int dvb_frontend_ioctl_properties(struct file *file,
|
|
|
goto out;
|
|
|
}
|
|
|
|
|
|
- if (copy_from_user(tvp, tvps->props, tvps->num * sizeof(struct dtv_property))) {
|
|
|
+ if (copy_from_user(tvp, (void __user *)tvps->props,
|
|
|
+ tvps->num * sizeof(struct dtv_property))) {
|
|
|
err = -EFAULT;
|
|
|
goto out;
|
|
|
}
|
|
@@ -2012,7 +2009,8 @@ static int dvb_frontend_ioctl_properties(struct file *file,
|
|
|
(tvp + i)->result = err;
|
|
|
}
|
|
|
|
|
|
- if (copy_to_user(tvps->props, tvp, tvps->num * sizeof(struct dtv_property))) {
|
|
|
+ if (copy_to_user((void __user *)tvps->props, tvp,
|
|
|
+ tvps->num * sizeof(struct dtv_property))) {
|
|
|
err = -EFAULT;
|
|
|
goto out;
|
|
|
}
|