diff options
author | Flavio Leitner <fleitner@redhat.com> | 2007-08-25 01:16:39 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-08-26 21:35:35 -0400 |
commit | a96fb49be3dd2031f722bf32af6ed7db965b60f7 (patch) | |
tree | 3c02106c65a3013990007d9bdf2708616bc9ba6e | |
parent | 36d98d3edce12c8f9ffd33f8f5d23ce728380925 (diff) |
[NET]: Fix IP_ADD/DROP_MEMBERSHIP to handle only connectionless
Fix IP[V6]_ADD_MEMBERSHIP and IP[V6]_DROP_MEMBERSHIP to
return -EPROTO for connection oriented sockets.
Signed-off-by: Flavio Leitner <fleitner@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/ipv4/ip_sockglue.c | 4 | ||||
-rw-r--r-- | net/ipv6/ipv6_sockglue.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index 4d544573f48a..6b420aedcdcf 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c | |||
@@ -625,6 +625,10 @@ static int do_ip_setsockopt(struct sock *sk, int level, | |||
625 | { | 625 | { |
626 | struct ip_mreqn mreq; | 626 | struct ip_mreqn mreq; |
627 | 627 | ||
628 | err = -EPROTO; | ||
629 | if (inet_sk(sk)->is_icsk) | ||
630 | break; | ||
631 | |||
628 | if (optlen < sizeof(struct ip_mreq)) | 632 | if (optlen < sizeof(struct ip_mreq)) |
629 | goto e_inval; | 633 | goto e_inval; |
630 | err = -EFAULT; | 634 | err = -EFAULT; |
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index 761a910f4f97..6b038aa72e88 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c | |||
@@ -554,6 +554,10 @@ done: | |||
554 | { | 554 | { |
555 | struct ipv6_mreq mreq; | 555 | struct ipv6_mreq mreq; |
556 | 556 | ||
557 | retv = -EPROTO; | ||
558 | if (inet_sk(sk)->is_icsk) | ||
559 | break; | ||
560 | |||
557 | retv = -EFAULT; | 561 | retv = -EFAULT; |
558 | if (copy_from_user(&mreq, optval, sizeof(struct ipv6_mreq))) | 562 | if (copy_from_user(&mreq, optval, sizeof(struct ipv6_mreq))) |
559 | break; | 563 | break; |