diff options
author | Ben Dooks <ben.dooks@codethink.co.uk> | 2019-03-01 13:39:44 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-03-03 23:58:25 -0500 |
commit | 46d841105d791b0ab51a1a7ebf48cb4d5416c957 (patch) | |
tree | 7cb4ec51635da1b40c70dfeb071a4166525e3e5b /net/compat.c | |
parent | d6af21a4fb5fff2f6640feb011902212e658414d (diff) |
net: fixup address-space warnings in compat_mc_{get,set}sockopt()
Add __user attributes in some of the casts in this function to avoid
the following sparse warnings:
net/compat.c:592:57: warning: cast removes address space of expression
net/compat.c:592:57: warning: incorrect type in initializer (different address spaces)
net/compat.c:592:57: expected struct compat_group_req [noderef] <asn:1>*gr32
net/compat.c:592:57: got void *<noident>
net/compat.c:613:65: warning: cast removes address space of expression
net/compat.c:613:65: warning: incorrect type in initializer (different address spaces)
net/compat.c:613:65: expected struct compat_group_source_req [noderef] <asn:1>*gsr32
net/compat.c:613:65: got void *<noident>
net/compat.c:634:60: warning: cast removes address space of expression
net/compat.c:634:60: warning: incorrect type in initializer (different address spaces)
net/compat.c:634:60: expected struct compat_group_filter [noderef] <asn:1>*gf32
net/compat.c:634:60: got void *<noident>
net/compat.c:672:52: warning: cast removes address space of expression
net/compat.c:672:52: warning: incorrect type in initializer (different address spaces)
net/compat.c:672:52: expected struct compat_group_filter [noderef] <asn:1>*gf32
net/compat.c:672:52: got void *<noident>
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/compat.c')
-rw-r--r-- | net/compat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/compat.c b/net/compat.c index 319f30637a86..0a234d33acad 100644 --- a/net/compat.c +++ b/net/compat.c | |||
@@ -525,7 +525,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname, | |||
525 | case MCAST_JOIN_GROUP: | 525 | case MCAST_JOIN_GROUP: |
526 | case MCAST_LEAVE_GROUP: | 526 | case MCAST_LEAVE_GROUP: |
527 | { | 527 | { |
528 | struct compat_group_req __user *gr32 = (void *)optval; | 528 | struct compat_group_req __user *gr32 = (void __user *)optval; |
529 | struct group_req __user *kgr = | 529 | struct group_req __user *kgr = |
530 | compat_alloc_user_space(sizeof(struct group_req)); | 530 | compat_alloc_user_space(sizeof(struct group_req)); |
531 | u32 interface; | 531 | u32 interface; |
@@ -546,7 +546,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname, | |||
546 | case MCAST_BLOCK_SOURCE: | 546 | case MCAST_BLOCK_SOURCE: |
547 | case MCAST_UNBLOCK_SOURCE: | 547 | case MCAST_UNBLOCK_SOURCE: |
548 | { | 548 | { |
549 | struct compat_group_source_req __user *gsr32 = (void *)optval; | 549 | struct compat_group_source_req __user *gsr32 = (void __user *)optval; |
550 | struct group_source_req __user *kgsr = compat_alloc_user_space( | 550 | struct group_source_req __user *kgsr = compat_alloc_user_space( |
551 | sizeof(struct group_source_req)); | 551 | sizeof(struct group_source_req)); |
552 | u32 interface; | 552 | u32 interface; |
@@ -567,7 +567,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname, | |||
567 | } | 567 | } |
568 | case MCAST_MSFILTER: | 568 | case MCAST_MSFILTER: |
569 | { | 569 | { |
570 | struct compat_group_filter __user *gf32 = (void *)optval; | 570 | struct compat_group_filter __user *gf32 = (void __user *)optval; |
571 | struct group_filter __user *kgf; | 571 | struct group_filter __user *kgf; |
572 | u32 interface, fmode, numsrc; | 572 | u32 interface, fmode, numsrc; |
573 | 573 | ||
@@ -605,7 +605,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname, | |||
605 | char __user *optval, int __user *optlen, | 605 | char __user *optval, int __user *optlen, |
606 | int (*getsockopt)(struct sock *, int, int, char __user *, int __user *)) | 606 | int (*getsockopt)(struct sock *, int, int, char __user *, int __user *)) |
607 | { | 607 | { |
608 | struct compat_group_filter __user *gf32 = (void *)optval; | 608 | struct compat_group_filter __user *gf32 = (void __user *)optval; |
609 | struct group_filter __user *kgf; | 609 | struct group_filter __user *kgf; |
610 | int __user *koptlen; | 610 | int __user *koptlen; |
611 | u32 interface, fmode, numsrc; | 611 | u32 interface, fmode, numsrc; |