From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033633AbdDTR4F (ORCPT ); Thu, 20 Apr 2017 13:56:05 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:53856 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1032311AbdDTR4D (ORCPT ); Thu, 20 Apr 2017 13:56:03 -0400 From: Arnd Bergmann To: "James E.J. Bottomley" , "Martin K. Petersen" Cc: Arnd Bergmann , Alexander Viro , Johannes Berg , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] scsi: pmcraid: use __iomem pointers for ioctl argument Date: Thu, 20 Apr 2017 19:54:45 +0200 Message-Id: <20170420175549.3435196-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:GGcFD4FVh254KPenEjzW5i8N3tnD+oYJjqCcKlv5uUhTX8bfduT RjV06CX8DgJ8v7cc57sTCjBcw65u83Z0HBbHN+rAMEtjOlZaZWuwEkWZ7JKpOU/exp+zDX9 re7Dw6qpkCdOL7uyVVpCGplGosG6k526YXy0scVGSy8rKIynur+9tCT+uT38r4oE7ioPpZB lloinuvl5OBJrQsxUa8IA== X-UI-Out-Filterresults: notjunk:1;V01:K0:mN75phU3yA0=:g4vGoKaj56w7RVaS1j6Lkr mct52FQSx58rJjaDeT/1y46Qlwxp4SYUd9iyQ0EXLP5+1xcb7CjVZpPLyp9Gyglz36uViv8iI MeOrGlzMtyPyxlz/SFlnIdf51K9unY4181JGNDJkmRFOwvDJwMbSK34e1TMF84sfFK9kOTPya TnN1YEJmdk0f7p/soPftbIABGDaXiAfK5bv+R4WeXEdLrEPg32dFt6YaNA65OAtY2o/oiKbM7 Q/VP4WvzX/jsW+Z7UID7o0m03jpknU7DJwE+2fMo1G8mMWleC2ytsPg/zOLSGU96RBFrJdcb6 mephTWImEhJR4gwdxAF51XiAxsXfwHLZEaBTM/LAcNZ0dGhH4RTrYAmNFvofHrKGoJu3TorHh 3mWuRh18h1nt2O+rjKk5vLjoSPs5qUNJTrj+rk/aPmfwiIY0DnLm7okkHZWZNJUwSjxVBlFbZ W12wo/Z5+LRrPN+XOPuhEeDH7Pmtw/+MC+qN3SYmQHChGbj+hhD821Qv81/PCb3i8oF0qBc84 +maoQed4U5sT7hPVivwnr5i7L9llAR7LqhqggSODpFCEIxy63CQrYlp5B7Pn3wtaKb5CDLpvy eUI2oDrzW8wJS65AkvOuDHQHhITASFplXDH2wTj41Cj6bgVcmPBgBbHAQgCVnJuDzomuVH87D m3cAj7/cn8bh+/tD0jCx7IyxzVGapnXJ7EzuQEHAIM4yLYItF2o4FegrCWgiW5supJH8= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org kernelci.org reports a new compile warning for old code in the pmcraid driver: arch/mips/include/asm/uaccess.h:138:21: warning: passing argument 1 of '__access_ok' makes pointer from integer without a cast [-Wint-conversion] The warning got introduced by a cleanup to the access_ok() helper that requires the argument to be a pointer, where the old version silently accepts 'unsigned long' arguments as it still does on most other architectures. The new behavior in MIPS however seems absolutely sensible, and so far I could only find one other file with the same issue, so the best solution seems to be to clean up the pmcraid driver. This makes the driver consistently use 'void __iomem *' pointers for passing around the address of the user space ioctl arguments, which gets rid of the kernelci warning as well as several sparse warnings. Fixes: f0a955f4eeec ("mips: sanitize __access_ok()") Cc: Alexander Viro Signed-off-by: Arnd Bergmann --- I wanted to be sure that I get all the __iomem annotations right, so I ended up fixing all other sparse warnings as well, see the three follow-up patches. --- drivers/scsi/pmcraid.c | 44 ++++++++++++++++---------------------------- 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c index 49e70a383afa..096c704ca39a 100644 --- a/drivers/scsi/pmcraid.c +++ b/drivers/scsi/pmcraid.c @@ -3325,7 +3325,7 @@ static struct pmcraid_sglist *pmcraid_alloc_sglist(int buflen) */ static int pmcraid_copy_sglist( struct pmcraid_sglist *sglist, - unsigned long buffer, + void __user *buffer, u32 len, int direction ) @@ -3346,11 +3346,9 @@ static int pmcraid_copy_sglist( kaddr = kmap(page); if (direction == DMA_TO_DEVICE) - rc = __copy_from_user(kaddr, - (void *)buffer, - bsize_elem); + rc = __copy_from_user(kaddr, buffer, bsize_elem); else - rc = __copy_to_user((void *)buffer, kaddr, bsize_elem); + rc = __copy_to_user(buffer, kaddr, bsize_elem); kunmap(page); @@ -3368,13 +3366,9 @@ static int pmcraid_copy_sglist( kaddr = kmap(page); if (direction == DMA_TO_DEVICE) - rc = __copy_from_user(kaddr, - (void *)buffer, - len % bsize_elem); + rc = __copy_from_user(kaddr, buffer, len % bsize_elem); else - rc = __copy_to_user((void *)buffer, - kaddr, - len % bsize_elem); + rc = __copy_to_user(buffer, kaddr, len % bsize_elem); kunmap(page); @@ -3652,17 +3646,17 @@ static long pmcraid_ioctl_passthrough( struct pmcraid_instance *pinstance, unsigned int ioctl_cmd, unsigned int buflen, - unsigned long arg + void __user *arg ) { struct pmcraid_passthrough_ioctl_buffer *buffer; struct pmcraid_ioarcb *ioarcb; struct pmcraid_cmd *cmd; struct pmcraid_cmd *cancel_cmd; - unsigned long request_buffer; + void __user *request_buffer; unsigned long request_offset; unsigned long lock_flags; - void *ioasa; + void __user *ioasa; u32 ioasc; int request_size; int buffer_size; @@ -3701,13 +3695,10 @@ static long pmcraid_ioctl_passthrough( request_buffer = arg + request_offset; - rc = __copy_from_user(buffer, - (struct pmcraid_passthrough_ioctl_buffer *) arg, + rc = __copy_from_user(buffer, arg, sizeof(struct pmcraid_passthrough_ioctl_buffer)); - ioasa = - (void *)(arg + - offsetof(struct pmcraid_passthrough_ioctl_buffer, ioasa)); + ioasa = arg + offsetof(struct pmcraid_passthrough_ioctl_buffer, ioasa); if (rc) { pmcraid_err("ioctl: can't copy passthrough buffer\n"); @@ -4021,6 +4012,7 @@ static long pmcraid_chr_ioctl( { struct pmcraid_instance *pinstance = NULL; struct pmcraid_ioctl_header *hdr = NULL; + void __user *argp = (void __user *)arg; int retval = -ENOTTY; hdr = kmalloc(sizeof(struct pmcraid_ioctl_header), GFP_KERNEL); @@ -4030,7 +4022,7 @@ static long pmcraid_chr_ioctl( return -ENOMEM; } - retval = pmcraid_check_ioctl_buffer(cmd, (void *)arg, hdr); + retval = pmcraid_check_ioctl_buffer(cmd, argp, hdr); if (retval) { pmcraid_info("chr_ioctl: header check failed\n"); @@ -4055,10 +4047,8 @@ static long pmcraid_chr_ioctl( if (cmd == PMCRAID_IOCTL_DOWNLOAD_MICROCODE) scsi_block_requests(pinstance->host); - retval = pmcraid_ioctl_passthrough(pinstance, - cmd, - hdr->buffer_length, - arg); + retval = pmcraid_ioctl_passthrough(pinstance, cmd, + hdr->buffer_length, argp); if (cmd == PMCRAID_IOCTL_DOWNLOAD_MICROCODE) scsi_unblock_requests(pinstance->host); @@ -4066,10 +4056,8 @@ static long pmcraid_chr_ioctl( case PMCRAID_DRIVER_IOCTL: arg += sizeof(struct pmcraid_ioctl_header); - retval = pmcraid_ioctl_driver(pinstance, - cmd, - hdr->buffer_length, - (void __user *)arg); + retval = pmcraid_ioctl_driver(pinstance, cmd, + hdr->buffer_length, argp); break; default: -- 2.9.0