netfilter: ipset: add missing break statemtns in ip_set_get_ip_port()

netfilter: ipset: add missing break statemtns in ip_set_get_ip_port()

[Patrick McHardy]

[-- Attachment #1: Type: text/plain, Size: 261 bytes --]

Add missing break statements.

I assume the second switch statement which handles only TCP and UDP
is intended to indicate whether a real port number instead of ICMP
port and code were parsed? Otherwise we should add IPPROTO_ICMP and
IPPROTO_ICMPV6 there too.


[-- Attachment #2: 04.diff --]
[-- Type: text/x-patch, Size: 940 bytes --]

commit 316ed388802533bcfd3dffb38d2ba29ac5428456
Author: Patrick McHardy <kaber@trash.net>
Date:   Wed Feb 2 09:31:37 2011 +0100

    netfilter: ipset: add missing break statemtns in ip_set_get_ip_port()
    
    Don't fall through in the switch statement, otherwise IPv4 headers
    are incorrectly parsed again as IPv6 and the return value will always
    be 'false'.
    
    Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/net/netfilter/ipset/ip_set_getport.c b/net/netfilter/ipset/ip_set_getport.c
index 76737bb..4dd2785 100644
--- a/net/netfilter/ipset/ip_set_getport.c
+++ b/net/netfilter/ipset/ip_set_getport.c
@@ -118,8 +118,10 @@ ip_set_get_ip_port(const struct sk_buff *skb, u8 pf, bool src, __be16 *port)
 	switch (pf) {
 	case AF_INET:
 		ret = ip_set_get_ip4_port(skb, src, port, &proto);
+		break;
 	case AF_INET6:
 		ret = ip_set_get_ip6_port(skb, src, port, &proto);
+		break;
 	default:
 		return false;
 	}

Re: netfilter: ipset: add missing break statemtns in ip_set_get_ip_port()

[Jozsef Kadlecsik]

On Wed, 2 Feb 2011, Patrick McHardy wrote:

> Add missing break statements.

Thanks! It's a clear bugfix, I applied your patch.
 
> I assume the second switch statement which handles only TCP and UDP
> is intended to indicate whether a real port number instead of ICMP
> port and code were parsed? Otherwise we should add IPPROTO_ICMP and
> IPPROTO_ICMPV6 there too.

Yes, excatly. The function is called from the bitmap:port type which 
can handle TCP/UDP ports only.

Best regards,
Jozsef
-
E-mail  : kadlec@blackhole.kfki.hu, kadlec@mail.kfki.hu
PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : KFKI Research Institute for Particle and Nuclear Physics
          H-1525 Budapest 114, POB. 49, Hungary