sh: fix put_user sparse errors
authorMichael S. Tsirkin <mst@redhat.com>
Tue, 6 Jan 2015 12:37:22 +0000 (14:37 +0200)
committerMichael S. Tsirkin <mst@redhat.com>
Tue, 13 Jan 2015 13:23:38 +0000 (15:23 +0200)
virtio wants to write bitwise types to userspace using put_user.
At the moment this triggers sparse errors, since the value is passed
through an integer.

For example:

__le32 __user *p;
__le32 x;
put_user(x, p);

is safe, but currently triggers a sparse warning.

Fix that up using __force.

Note: this does not suppress any useful sparse checks since caller
assigns x to typeof(*p), which in turn forces all the necessary type
checks.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
arch/sh/include/asm/uaccess_64.h

index 2e07e0f..c01376c 100644 (file)
@@ -59,19 +59,19 @@ do {                                                                \
        switch (size) {                                         \
        case 1:                                                 \
                retval = __put_user_asm_b((void *)&x,           \
-                                         (long)ptr);           \
+                                         (__force long)ptr);   \
                break;                                          \
        case 2:                                                 \
                retval = __put_user_asm_w((void *)&x,           \
-                                         (long)ptr);           \
+                                         (__force long)ptr);   \
                break;                                          \
        case 4:                                                 \
                retval = __put_user_asm_l((void *)&x,           \
-                                         (long)ptr);           \
+                                         (__force long)ptr);   \
                break;                                          \
        case 8:                                                 \
                retval = __put_user_asm_q((void *)&x,           \
-                                         (long)ptr);           \
+                                         (__force long)ptr);   \
                break;                                          \
        default:                                                \
                __put_user_unknown();                           \