ieee1394: raw1394: add sparse annotations to raw1394_compat_write
PATCH 1/1 ieee1394: raw1394: add sparse annotations to raw1394_compat_write
Eliminate the following warnings in raw1394_compat_write()'s error return path, seen on x86-64 with CONFIG_COMPAT=y:
drivers/ieee1394/raw1394.c:381:17: warning: incorrect type in return expression (different address spaces)drivers/ieee1394/raw1394.c:381:17: expected char const [noderef] <asn:1>*drivers/ieee1394/raw1394.c:381:17: got void *drivers/ieee1394/raw1394.c:2252:14: warning: incorrect type in argument 1 (different address spaces)drivers/ieee1394/raw1394.c:2252:14: expected void const *ptrdrivers/ieee1394/raw1394.c:2252:14: got char const [noderef] <asn:1>*[assigned] bufferdrivers/ieee1394/raw1394.c:2253:19: warning: incorrect type in argument 1 (different address spaces)drivers/ieee1394/raw1394.c:2253:19: expected void const *ptrdrivers/ieee1394/raw1394.c:2253:19: got char const [noderef] <asn:1>*[assigned] buffer
--- drivers/ieee1394/raw1394.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/ieee1394/raw1394.c +7 -3
@@ -369,6 +369,7 @@ static const char __user *raw1394_compat {struct compat_raw1394_req __user *cr = (typeof (cr )) buf;struct raw1394_request __user *r; + r =compat_alloc_user_space (sizeof (struct raw1394_request ));#define C (x) __copy_in_user(&r->x, &cr->x, sizeof(r->x))
@@ -378,7 +379,8 @@ static const char __user *raw1394_compat C(tag) || C(sendb) || C(recvb)) -return ERR_PTR (-EFAULT ); +return (__force const char __user *)ERR_PTR (-EFAULT ); +return (const char __user *)r; }#undef C
@@ -389,6 +391,7 @@ static int raw1394_compat_read(const char __user *buf, struct raw1394_request *r) { struct compat_raw1394_req __user *cr = (typeof(cr)) buf; + if (!access_ok(VERIFY_WRITE, cr, sizeof(struct compat_raw1394_req)) || P(type) || P(error) ||
@@ -400,6 +403,7 @@ raw1394_compat_read(const char __user *bP (sendb) || P(recvb)) return -EFAULT; +return sizeof (struct compat_raw1394_req ); }#undef P
@@ -2249,8 +2253,8 @@ static ssize_t raw1394_write(struct file sizeof(struct compat_raw1394_req) != sizeof(struct raw1394_request)) { buffer = raw1394_compat_write(buffer); - if (IS_ERR(buffer)) - return PTR_ERR(buffer); + if (IS_ERR((__force void *)buffer)) + return PTR_ERR((__force void *)buffer); } else#endif if (count !=sizeof (struct raw1394_request )) {
Signature · 3 lines
Stefan Richter -=====-==--= --=- -==== http://arcgraph.de/sr/