staging: vchiq_arm: cast with __force as needed

In several cases where a pointer marked as __user is
(intentionally) assigned or passed to a non-marked target,
cast to the target pointer type with a __force directive
to quiet warnings from sparse.

Signed-off-by: Mitchell Tasman <tasman@leaflabs.com>
Link: https://lore.kernel.org/r/20200519004531.33158-1-tasman@leaflabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
index c18c6ca0b6c0d8cbe709f0cedf85d9adb32b2aa8..38a13e4618a851c83ea1ce48db1e28cbf02b4eb0 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
@@ -371,14 +371,15 @@ create_pagelist(char __user *buf, size_t count, unsigned short type)
        pagelistinfo->scatterlist = scatterlist;
        pagelistinfo->scatterlist_mapped = 0;
 
-       if (is_vmalloc_addr(buf)) {
+       if (is_vmalloc_addr((void __force *)buf)) {
                unsigned long length = count;
                unsigned int off = offset;
 
                for (actual_pages = 0; actual_pages < num_pages;
                     actual_pages++) {
-                       struct page *pg = vmalloc_to_page(buf + (actual_pages *
-                                                                PAGE_SIZE));
+                       struct page *pg =
+                               vmalloc_to_page((void __force *)(buf +
+                                                (actual_pages * PAGE_SIZE)));
                        size_t bytes = PAGE_SIZE - off;
 
                        if (!pg) {

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index 2d3e114f4a66cb3faf9709b94bda99741b089adf..28ea8c3a4cba9dcd0465cfe0447c59da2add7b67 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -1209,7 +1209,9 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
                                        /* The completion must point to the
                                        ** msgbuf. */
-                                       completion->header = msgbuf;
+                                       completion->header =
+                                               (struct vchiq_header __force *)
+                                               msgbuf;
                                }
 
                                if ((completion->reason ==