From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gilberto Bertin Subject: [net-next RFC 2/4] bindtosubnet: TCP/IPv4 implementation Date: Wed, 16 Mar 2016 13:19:07 +0000 Message-ID: <1458134349-2454-3-git-send-email-gilberto.bertin@gmail.com> References: <1458134349-2454-1-git-send-email-gilberto.bertin@gmail.com> Cc: Gilberto Bertin To: netdev@vger.kernel.org Return-path: Received: from mail-wm0-f49.google.com ([74.125.82.49]:33226 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966380AbcCPNiO (ORCPT ); Wed, 16 Mar 2016 09:38:14 -0400 Received: by mail-wm0-f49.google.com with SMTP id l68so190739448wml.0 for ; Wed, 16 Mar 2016 06:38:14 -0700 (PDT) In-Reply-To: <1458134349-2454-1-git-send-email-gilberto.bertin@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: Signed-off-by: Gilberto Bertin --- net/ipv4/inet_connection_sock.c | 20 +++++++++++++++++++- net/ipv4/inet_hashtables.c | 9 +++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 6414891..0a3777c 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -15,6 +15,7 @@ #include #include +#include #include #include @@ -43,6 +44,22 @@ void inet_get_local_port_range(struct net *net, int *low, int *high) } EXPORT_SYMBOL(inet_get_local_port_range); +static inline int inet_csk_bind_subnet_conflict(const struct sock *sk, + const struct sock *sk2) +{ + __be32 mask; + + if (sk->sk_bind_to_subnet && sk2->sk_bind_to_subnet) { + mask = inet_make_mask(min(sk->sk_bind_subnet4.plen, + sk2->sk_bind_subnet4.plen)); + + return (sk->sk_bind_subnet4.net & mask) == + (sk2->sk_bind_subnet4.net & mask); + } + + return 0; +} + int inet_csk_bind_conflict(const struct sock *sk, const struct inet_bind_bucket *tb, bool relax) { @@ -63,7 +80,8 @@ int inet_csk_bind_conflict(const struct sock *sk, !inet_v6_ipv6only(sk2) && (!sk->sk_bound_dev_if || !sk2->sk_bound_dev_if || - sk->sk_bound_dev_if == sk2->sk_bound_dev_if)) { + sk->sk_bound_dev_if == sk2->sk_bound_dev_if) && + inet_csk_bind_subnet_conflict(sk, sk2)) { if ((!reuse || !sk2->sk_reuse || sk2->sk_state == TCP_LISTEN) && (!reuseport || !sk2->sk_reuseport || diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index ccc5980..1a0229c 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c @@ -13,6 +13,7 @@ * 2 of the License, or (at your option) any later version. */ +#include #include #include #include @@ -189,6 +190,14 @@ static inline int compute_score(struct sock *sk, struct net *net, return -1; score += 4; } + if (sk->sk_bind_to_subnet) { + __be32 mask = inet_make_mask(sk->sk_bind_subnet4.plen); + + if ((sk->sk_bind_subnet4.net & mask) != (daddr & mask)) + return -1; + score += 4; + } + if (sk->sk_incoming_cpu == raw_smp_processor_id()) score++; } -- 2.7.2