Commit 71d1b2be authored Sep 24, 2014 by Mauro Carvalho Chehab

[media] dvb_frontend: Fix __user namespace

As reported by smatch:

drivers/media/dvb-core/dvb_frontend.c:1960:45: warning: incorrect type in argument 2 (different address spaces)
drivers/media/dvb-core/dvb_frontend.c:1960:45: expected void const [noderef] <asn:1>*from
drivers/media/dvb-core/dvb_frontend.c:1960:45: got struct dtv_property *[noderef] <asn:1>props
drivers/media/dvb-core/dvb_frontend.c:1992:45: warning: incorrect type in argument 2 (different address spaces)
drivers/media/dvb-core/dvb_frontend.c:1992:45: expected void const [noderef] <asn:1>*from
drivers/media/dvb-core/dvb_frontend.c:1992:45: got struct dtv_property *[noderef] <asn:1>props
drivers/media/dvb-core/dvb_frontend.c:2014:38: warning: incorrect type in argument 1 (different address spaces)
drivers/media/dvb-core/dvb_frontend.c:2014:38: expected void [noderef] <asn:1>*to
drivers/media/dvb-core/dvb_frontend.c:2014:38: got struct dtv_property *[noderef] <asn:1>props
drivers/media/dvb-core/dvb_frontend.c:1946:17: warning: dereference of noderef expression
drivers/media/dvb-core/dvb_frontend.c:1947:17: warning: dereference of noderef expression
drivers/media/dvb-core/dvb_frontend.c:1951:22: warning: dereference of noderef expression
drivers/media/dvb-core/dvb_frontend.c:1951:42: warning: dereference of noderef expression
drivers/media/dvb-core/dvb_frontend.c:1954:31: warning: dereference of noderef expression
drivers/media/dvb-core/dvb_frontend.c:1960:41: warning: dereference of noderef expression
drivers/media/dvb-core/dvb_frontend.c:1960:54: warning: dereference of noderef expression
drivers/media/dvb-core/dvb_frontend.c:1965:33: warning: dereference of noderef expression
drivers/media/dvb-core/dvb_frontend.c:1978:17: warning: dereference of noderef expression
drivers/media/dvb-core/dvb_frontend.c:1979:17: warning: dereference of noderef expression
drivers/media/dvb-core/dvb_frontend.c:1983:22: warning: dereference of noderef expression
drivers/media/dvb-core/dvb_frontend.c:1983:42: warning: dereference of noderef expression
drivers/media/dvb-core/dvb_frontend.c:1986:31: warning: dereference of noderef expression
drivers/media/dvb-core/dvb_frontend.c:1992:41: warning: dereference of noderef expression
drivers/media/dvb-core/dvb_frontend.c:1992:54: warning: dereference of noderef expression
drivers/media/dvb-core/dvb_frontend.c:2007:33: warning: dereference of noderef expression
drivers/media/dvb-core/dvb_frontend.c:2014:34: warning: dereference of noderef expression
drivers/media/dvb-core/dvb_frontend.c:2014:52: warning: dereference of noderef expression

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

parent 289297b9

drivers/media/dvb-core/dvb_frontend.c

+9 −11

Original line number	Diff line number	Diff line
		@@ -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;

		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;
		}

Admin message