]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
s390/pkey: add missing __user annotations
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Tue, 9 May 2017 10:42:26 +0000 (12:42 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Mon, 12 Jun 2017 14:25:56 +0000 (16:25 +0200)
Add missing __user annotations to get rid of a couple of sparse
warnings. All callers actually pass kernel pointers instead of user
space pointers, however the pointers are being used within
KERNEL_DS. So everything is fine.

Corresponding sparse warnings:

drivers/s390/crypto/pkey_api.c:181:41:
 warning: incorrect type in assignment (different address spaces)
    expected char [noderef] <asn:1>*request_control_blk_addr
    got void *<noident>

Cc: Harald Freudenberger <freude@linux.vnet.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
drivers/s390/crypto/pkey_api.c

index 8f466facf15eba7949292f3f5b3a7684c24e7f0b..f61fa47135a6c17dbf3660722c7a1ed959fba5dc 100644 (file)
@@ -178,9 +178,9 @@ static inline void prep_xcrb(struct ica_xcRB *pxcrb,
        pxcrb->user_defined = (cardnr == 0xFFFF ? AUTOSELECT : cardnr);
        pxcrb->request_control_blk_length =
                preqcblk->cprb_len + preqcblk->req_parml;
-       pxcrb->request_control_blk_addr = (void *) preqcblk;
+       pxcrb->request_control_blk_addr = (void __user *) preqcblk;
        pxcrb->reply_control_blk_length = preqcblk->rpl_msgbl;
-       pxcrb->reply_control_blk_addr = (void *) prepcblk;
+       pxcrb->reply_control_blk_addr = (void __user *) prepcblk;
 }
 
 /*