net: IP_MULTICAST_IF setsockopt now recognizes struct mreq
Until now, struct mreq has not been recognized and it was worked with as with struct in_addr. That means imr_multiaddr was copied to imr_address. So do recognize struct mreq here and copy that correctly. Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
416912a129
commit
3a084ddb4b
1 changed files with 9 additions and 4 deletions
|
@ -673,10 +673,15 @@ static int do_ip_setsockopt(struct sock *sk, int level,
|
||||||
break;
|
break;
|
||||||
} else {
|
} else {
|
||||||
memset(&mreq, 0, sizeof(mreq));
|
memset(&mreq, 0, sizeof(mreq));
|
||||||
if (optlen >= sizeof(struct in_addr) &&
|
if (optlen >= sizeof(struct ip_mreq)) {
|
||||||
copy_from_user(&mreq.imr_address, optval,
|
if (copy_from_user(&mreq, optval,
|
||||||
sizeof(struct in_addr)))
|
sizeof(struct ip_mreq)))
|
||||||
break;
|
break;
|
||||||
|
} else if (optlen >= sizeof(struct in_addr)) {
|
||||||
|
if (copy_from_user(&mreq.imr_address, optval,
|
||||||
|
sizeof(struct in_addr)))
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!mreq.imr_ifindex) {
|
if (!mreq.imr_ifindex) {
|
||||||
|
|
Loading…
Reference in a new issue