From patchwork Wed Mar 16 13:19:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilberto Bertin X-Patchwork-Id: 598361 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3qQCHJ1BKhz9sD6 for ; Thu, 17 Mar 2016 00:38:20 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=09+T/ewx; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966581AbcCPNiS (ORCPT ); Wed, 16 Mar 2016 09:38:18 -0400 Received: from mail-wm0-f48.google.com ([74.125.82.48]:36388 "EHLO mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934227AbcCPNiQ (ORCPT ); Wed, 16 Mar 2016 09:38:16 -0400 Received: by mail-wm0-f48.google.com with SMTP id l124so49069746wmf.1 for ; Wed, 16 Mar 2016 06:38:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tH2DNpPXCFQ6pIrIuABtHZ0QdNljIxCLIgJ2b00AHwc=; b=09+T/ewxjviNMsIovUqr32sV0WFmvxyfboKq7XBgKdIoBdB0S88as1yg9oBW3qYttW q6GAAuzZKiRIt8toa4XLb1pSNEnCJeIrN0p73guB/4lwCG/fPFbPhVHTLfD7cVhbZQeW iCIwPWnUoTZwHI3o8C/c7BQ3HejAZsWDHuLrZUXGhMGQcG1XRp42zPNOFRBjUWDC8b6Z BQuBOZ8+hr1pGLGcoRMOKs1k/ECjWw69DuefGCOHVRHEQeH9A6PFyzczWhVNL9krdmTv Ja3d9cUCR6qm7T8FOrWLNj0O8D+MEWgni8BIiLyc4yY54xCM+F36pTcMl/NtBPVIZ0B0 IFJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tH2DNpPXCFQ6pIrIuABtHZ0QdNljIxCLIgJ2b00AHwc=; b=dClhZQI6kMj7ZR9jDcoHGg7m/17CoMSqOsxjEJEoc2wgRvYGjhdDLLQsOrBOgQZg8Z yw2h+77Ewnhw2NHglxvwQwGVe2azCrNKHp46V6UTOKt7Gxi6z7KFnf8WBSEhuQAjPeXt NH8ZQnWdy4I5wLuZyQOOyJeD+qcOOmsFj6uLlZXZG3YssearzqUqU/h7w+fasY2nAnve OLIDkipdkQT8VyOn+RMSg4/cEpt/YPa8XjG96nsScNOsWBcwdfHocd19fJKalTeJe7pT wsXH6I+ZmzFKMkmP8gtIJ3DDWAx1UtZXba+EnQI/RIr1ZmjNRNUCB13ESA2G55Z2HZe1 5QcA== X-Gm-Message-State: AD7BkJKGsdIYZb0pERC1BNoLvtk0ZVs4m1+3c3h/d9b1CHQ52cDdJza/bnM1V9weJ8JCiA== X-Received: by 10.194.77.15 with SMTP id o15mr4340547wjw.41.1458135495144; Wed, 16 Mar 2016 06:38:15 -0700 (PDT) Received: from arch.cfops.it ([185.122.0.240]) by smtp.gmail.com with ESMTPSA id y62sm3569771wmg.12.2016.03.16.06.38.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Mar 2016 06:38:14 -0700 (PDT) From: Gilberto Bertin To: netdev@vger.kernel.org Cc: Gilberto Bertin Subject: [net-next RFC 4/4] bindtosubnet: UPD implementation Date: Wed, 16 Mar 2016 13:19:09 +0000 Message-Id: <1458134349-2454-5-git-send-email-gilberto.bertin@gmail.com> X-Mailer: git-send-email 2.7.2 In-Reply-To: <1458134349-2454-1-git-send-email-gilberto.bertin@gmail.com> References: <1458134349-2454-1-git-send-email-gilberto.bertin@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Gilberto Bertin --- net/ipv4/udp.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 95d2f19..1ecffa8 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -133,6 +133,23 @@ EXPORT_SYMBOL(udp_memory_allocated); #define MAX_UDP_PORTS 65536 #define PORTS_PER_CHAIN (MAX_UDP_PORTS / UDP_HTABLE_SIZE_MIN) +static inline int udp_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; +} + + static int udp_lib_lport_inuse(struct net *net, __u16 num, const struct udp_hslot *hslot, unsigned long *bitmap, @@ -153,6 +170,7 @@ static int udp_lib_lport_inuse(struct net *net, __u16 num, (!sk2->sk_reuse || !sk->sk_reuse) && (!sk2->sk_bound_dev_if || !sk->sk_bound_dev_if || sk2->sk_bound_dev_if == sk->sk_bound_dev_if) && + udp_csk_bind_subnet_conflict(sk, sk2) && (!sk2->sk_reuseport || !sk->sk_reuseport || rcu_access_pointer(sk->sk_reuseport_cb) || !uid_eq(uid, sock_i_uid(sk2))) && @@ -189,6 +207,7 @@ static int udp_lib_lport_inuse2(struct net *net, __u16 num, (!sk2->sk_reuse || !sk->sk_reuse) && (!sk2->sk_bound_dev_if || !sk->sk_bound_dev_if || sk2->sk_bound_dev_if == sk->sk_bound_dev_if) && + udp_csk_bind_subnet_conflict(sk, sk2) && (!sk2->sk_reuseport || !sk->sk_reuseport || rcu_access_pointer(sk->sk_reuseport_cb) || !uid_eq(uid, sock_i_uid(sk2))) && @@ -426,6 +445,15 @@ 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++; return score; @@ -471,6 +499,14 @@ static inline int compute_score2(struct sock *sk, struct net *net, 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++;