Skip to content

Commit 400490a

Browse files
bulwahnkuba-moo
authored andcommitted
ipv6: mcast: make annotations for ip6_mc_msfget() consistent
Commit 931ca7a ("ip*_mc_gsfget(): lift copyout of struct group_filter into callers") adjusted the type annotations for ip6_mc_msfget() at its declaration, but missed the type annotations at its definition. Hence, sparse complains on ./net/ipv6/mcast.c: mcast.c:550:5: error: symbol 'ip6_mc_msfget' redeclared with different type \ (incompatible argument 3 (different address spaces)) Make ip6_mc_msfget() annotations consistent, which also resolves this warning from sparse: mcast.c:607:34: warning: incorrect type in argument 1 (different address spaces) mcast.c:607:34: expected void [noderef] __user *to mcast.c:607:34: got struct __kernel_sockaddr_storage *p No functional change. No change in object code. Signed-off-by: Lukas Bulwahn <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 09b5678 commit 400490a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/ipv6/mcast.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ int ip6_mc_msfilter(struct sock *sk, struct group_filter *gsf,
548548
}
549549

550550
int ip6_mc_msfget(struct sock *sk, struct group_filter *gsf,
551-
struct sockaddr_storage *p)
551+
struct sockaddr_storage __user *p)
552552
{
553553
int err, i, count, copycount;
554554
const struct in6_addr *group;

0 commit comments

Comments
 (0)