* [patch net-next] net: IP_MULTICAST_IF setsockopt now recognizes struct mreq
@ 2012-05-04 8:37 Jiri Pirko
2012-05-08 3:03 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Jiri Pirko @ 2012-05-04 8:37 UTC (permalink / raw)
To: netdev; +Cc: davem, eric.dumazet, kuznet, jmorris, yoshfuji, kaber
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>
---
net/ipv4/ip_sockglue.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 51c6c67..0d11f23 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -673,10 +673,15 @@ static int do_ip_setsockopt(struct sock *sk, int level,
break;
} else {
memset(&mreq, 0, sizeof(mreq));
- if (optlen >= sizeof(struct in_addr) &&
- copy_from_user(&mreq.imr_address, optval,
- sizeof(struct in_addr)))
- break;
+ if (optlen >= sizeof(struct ip_mreq)) {
+ if (copy_from_user(&mreq, optval,
+ sizeof(struct ip_mreq)))
+ 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) {
--
1.7.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-05-08 3:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-04 8:37 [patch net-next] net: IP_MULTICAST_IF setsockopt now recognizes struct mreq Jiri Pirko
2012-05-08 3:03 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).