Skip to contentSkip to conversation

UDP: Make use of inet_iif() when doing socket lookups.

PATCH In review Vlad Yasevich 3 participants 5 messages Oct 23, 2007 – Oct 26, 2007

Subsystems (3)
Networking Network drivers UDP
lore
Share & tools
lore

Vlad Yasevich

author
#0 lore raw

PATCH 1/1 UDP: Make use of inet_iif() when doing socket lookups.

UDP currently uses skb->dev->ifindex which may provide the wrong information when the socket bound to a specific interface. This patch makes inet_iif() accessible to UDP and makes UDP use it.

The scenario we are trying to fix is when a client is running on the same system and the server and both client and server bind to a non-loopback device.

Signed-off-by Vlad Yasevich <[email protected]>
---
 include/net/inet_hashtables.h |    6 ------
 include/net/inet_sock.h       |    7 +++++++
 net/ipv4/udp.c                |    2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)
include/net/inet_hashtables.h +0 -6
index 8228b57..4427dcd 100644
@@ -26,7 +26,6 @@
 
 #include <net/inet_connection_sock.h>
 #include <net/inet_sock.h>
-#include <net/route.h>
 #include <net/sock.h>
 #include <net/tcp_states.h>
 

@@ -266,11 +265,6 @@ out:
 		wake_up(&hashinfo->lhash_wait);
 }
 
-static inline int inet_iif(const struct sk_buff *skb)
-{
-	return ((struct rtable *)skb->dst)->rt_iif;
-}
-
 extern struct sock *__inet_lookup_listener(struct inet_hashinfo *hashinfo,
 					   const __be32 daddr,
 					   const unsigned short hnum,
include/net/inet_sock.h +7 -0
index 62daf21..70013c5 100644
@@ -24,6 +24,7 @@
 #include <net/flow.h>
 #include <net/sock.h>
 #include <net/request_sock.h>
+#include <net/route.h>
 
 /** struct ip_options - IP Options
  *

@@ -190,4 +191,10 @@ static inline int inet_sk_ehashfn(const struct sock *sk)
 	return inet_ehashfn(laddr, lport, faddr, fport);
 }
 
+
+static inline int inet_iif(const struct sk_buff *skb)
+{
+	return ((struct rtable *)skb->dst)->rt_iif;
+}
+
 #endif	/* _INET_SOCK_H */
net/ipv4/udp.c +1 -1
index 35d2b0e..4bc25b4 100644
@@ -1152,7 +1152,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct hlist_head udptable[],
 		return __udp4_lib_mcast_deliver(skb, uh, saddr, daddr, udptable);
 
 	sk = __udp4_lib_lookup(saddr, uh->source, daddr, uh->dest,
-			       skb->dev->ifindex, udptable        );
+			       inet_iif(skb), udptable);
 
 	if (sk != NULL) {
 		int ret = udp_queue_rcv_skb(sk, skb);
Signature · 1 line
1.5.2.4
maintainer
#1 lore raw

From: Vlad Yasevich <[email protected]>
Date: Tue, 23 Oct 2007 14:40:58 -0400

Quoted 9 lines

UDP currently uses skb->dev->ifindex which may provide the wrong information when the socket bound to a specific interface. This patch makes inet_iif() accessible to UDP and makes UDP use it.

The scenario we are trying to fix is when a client is running on the same system and the server and both client and server bind to a non-loopback device.

Signed-off-by Vlad Yasevich <[email protected]>

David, could you take a quick look at this one?

I have a hunch that this will have side-effects for multicast applications and I'd feel better if you went over this patch with that in mind.

Thanks!

Acked-by on v1 1/1
#2 lore raw
In reply to Vlad Yasevich

I don't see any problem with this. If you're using IP_MULTICAST_IF with a bound socket, it forces you to use that interface, anyway.

I'm not sure multicasting works as expected in some other cases with bound sockets (looks like there may be some holes to evade the binding), but that's in old code. I don't see any problems from this patch.

                                        +-DLS
Acked-by David L Stevens <[email protected]>
maintainer
#3 lore raw

From: David Stevens <[email protected]>
Date: Thu, 25 Oct 2007 14:58:29 -0700

Quoted 11 lines

I don't see any problem with this. If you're using IP_MULTICAST_IF with a bound socket, it forces you to use that interface, anyway.

I'm not sure multicasting works as expected in some other cases with bound sockets (looks like there may be some holes to evade the binding), but that's in old code. I don't see any problems from this patch.

                                        +-DLS
Acked-by David L Stevens <[email protected]>

Thanks for reviewing David.

maintainer
#4 lore raw
In reply to David Stevens

From: David Stevens <[email protected]>
Date: Thu, 25 Oct 2007 14:58:29 -0700

Quoted 11 lines

I don't see any problem with this. If you're using IP_MULTICAST_IF with a bound socket, it forces you to use that interface, anyway.

I'm not sure multicasting works as expected in some other cases with bound sockets (looks like there may be some holes to evade the binding), but that's in old code. I don't see any problems from this patch.

                                        +-DLS
Acked-by David L Stevens <[email protected]>

Patch applied, thanks everyone!