From patchwork Sat Mar 30 18:47:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Suryaputra X-Patchwork-Id: 1071016 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="i4Em08Ww"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44WnfT1GKxz9sQs for ; Sun, 31 Mar 2019 05:47:44 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730833AbfC3Srn (ORCPT ); Sat, 30 Mar 2019 14:47:43 -0400 Received: from mail-qt1-f196.google.com ([209.85.160.196]:34872 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730542AbfC3Srm (ORCPT ); Sat, 30 Mar 2019 14:47:42 -0400 Received: by mail-qt1-f196.google.com with SMTP id h39so6425544qte.2 for ; Sat, 30 Mar 2019 11:47:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Cluhb4jbTUI/vyTaEh0XCCfBqKjLTBBfrXqGXmY5sQU=; b=i4Em08Wwh+ByDiSSo9xFpYjpiezZLjBJrhZv/n1qZ0mIafWqAJls5LmQlsxXMoECHs RBfvR9VTvcThpQtkgR/WucSlZgiVdlIvjTxRhE5CQPCjNUPzb3Kt/NiRZQZkGhyIaZUW w86cvARfNd7+HLXvRFw51+dtHKAknE5c+sLqRifl6iS9kYtABDXOd1Rx+j1Jm99/s5AW wELIl7OzdaLBLd1PqTo2cEMR7k8g/nLTHBbhhgh7VdJtYEsrijJPK1OKFsflh3yc2FOl jkKmHhQp2lkKfUb7Y2vWXSLBS4t6uDccjl3fiadLgSlih5if5yuRtYBlpORnzf2i2TM0 cQgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Cluhb4jbTUI/vyTaEh0XCCfBqKjLTBBfrXqGXmY5sQU=; b=LsnQ1EXBbFqUd7AyjYHEAqekEgzHuGdsgEx4CxjtcUjY3DmFAdQqGuek5+hpbX6t+h Hy0B23gFyXw0PFgtRcZxawPTde+ZKrbjNpUXlQl+HKnfBdEQg1OqbhUfBhdu9xs/b/Ft G0PBKUpnklJORHhdv0puK+MCew0JZ3mdOZWEw1SkJ8OAt534a6F8qhYe9+9afl5ALtHo IUoetGAzrqRPVgj+B501QZyd6VIgCIf6jhemj1qGmDq3bbhc19Lq4g7U6lcfBK6+bbnp LopZtYMTop/nJKKIeP5XYBvplhsjZPUObnTqlY1J14sqOlSYTaMG7C/BDhsCkJpJHoOs YHAw== X-Gm-Message-State: APjAAAXUMVcLzh5ZYUM41Ky9+tzn1CcsVWC+dXQp2rlnqWys6RWrWHmU Mx9YQQZCF+CEZzrBehAoJSD5elE= X-Google-Smtp-Source: APXvYqzRyPxV1LgbkIXLeB/vMckQdkUXwl6hPd49+hC5bXgt7BNts1N0YrmtKR1O+5T9fmK0BDSIag== X-Received: by 2002:a0c:afa2:: with SMTP id s31mr8269180qvc.118.1553971660711; Sat, 30 Mar 2019 11:47:40 -0700 (PDT) Received: from localhost.localdomain (99-149-127-125.lightspeed.rlghnc.sbcglobal.net. [99.149.127.125]) by smtp.gmail.com with ESMTPSA id 10sm3359130qtx.40.2019.03.30.11.47.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 30 Mar 2019 11:47:40 -0700 (PDT) From: Stephen Suryaputra To: netdev@vger.kernel.org Cc: Stephen Suryaputra Subject: [PATCH net-next] ipv4: Add ability to filter LSRR or SSRR Date: Sat, 30 Mar 2019 14:47:26 -0400 Message-Id: <20190330184726.3672-1-ssuryaextr@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Support use cases where source routing is allowed but only loose or strict. Add source_router_filter netdev configuration to be used when allow_source_router is set to control which types can be processed. Signed-off-by: Stephen Suryaputra --- Documentation/networking/ip-sysctl.txt | 7 +++++++ include/linux/inetdevice.h | 6 ++++++ include/uapi/linux/ip.h | 1 + net/ipv4/devinet.c | 2 ++ net/ipv4/ip_input.c | 3 +++ 5 files changed, 19 insertions(+) diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index 5eedc6941ce5..a6a7f4660f78 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt @@ -1164,6 +1164,13 @@ accept_source_route - BOOLEAN default TRUE (router) FALSE (host) +source_route_filter - INTEGER + 0 - No filter. + 1 - Drop packets with Strict SRR option. + 2 - Drop packets with Loose SRR option. + Default value is 0. The values from conf/{all,interface} are used when + checking whether to drop or not on the {interface}. + accept_local - BOOLEAN Accept packets with local source addresses. In combination with suitable routing, this can be used to direct packets between two diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h index a64f21a97369..8ee2d3d507db 100644 --- a/include/linux/inetdevice.h +++ b/include/linux/inetdevice.h @@ -100,6 +100,12 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev) #define IN_DEV_SRC_VMARK(in_dev) IN_DEV_ORCONF((in_dev), SRC_VMARK) #define IN_DEV_SOURCE_ROUTE(in_dev) IN_DEV_ANDCONF((in_dev), \ ACCEPT_SOURCE_ROUTE) +#define IN_DEV_FILTER_SSRR(in_dev) \ + ((IPV4_DEVCONF_ALL(dev_net(in_dev->dev), SOURCE_ROUTE_FILTER) == 1) || \ + (IN_DEV_CONF_GET(in_dev, SOURCE_ROUTE_FILTER) == 1)) +#define IN_DEV_FILTER_LSRR(in_dev) \ + ((IPV4_DEVCONF_ALL(dev_net(in_dev->dev), SOURCE_ROUTE_FILTER) == 2) || \ + (IN_DEV_CONF_GET(in_dev, SOURCE_ROUTE_FILTER) == 2)) #define IN_DEV_ACCEPT_LOCAL(in_dev) IN_DEV_ORCONF((in_dev), ACCEPT_LOCAL) #define IN_DEV_BOOTP_RELAY(in_dev) IN_DEV_ANDCONF((in_dev), BOOTP_RELAY) diff --git a/include/uapi/linux/ip.h b/include/uapi/linux/ip.h index e42d13b55cf3..b256ca8cef60 100644 --- a/include/uapi/linux/ip.h +++ b/include/uapi/linux/ip.h @@ -169,6 +169,7 @@ enum IPV4_DEVCONF_DROP_UNICAST_IN_L2_MULTICAST, IPV4_DEVCONF_DROP_GRATUITOUS_ARP, IPV4_DEVCONF_BC_FORWARDING, + IPV4_DEVCONF_SOURCE_ROUTE_FILTER, __IPV4_DEVCONF_MAX }; diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index eb514f312e6f..25dd87acd61a 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -2462,6 +2462,8 @@ static struct devinet_sysctl_table { DEVINET_SYSCTL_RW_ENTRY(SEND_REDIRECTS, "send_redirects"), DEVINET_SYSCTL_RW_ENTRY(ACCEPT_SOURCE_ROUTE, "accept_source_route"), + DEVINET_SYSCTL_RW_ENTRY(SOURCE_ROUTE_FILTER, + "source_route_filter"), DEVINET_SYSCTL_RW_ENTRY(ACCEPT_LOCAL, "accept_local"), DEVINET_SYSCTL_RW_ENTRY(SRC_VMARK, "src_valid_mark"), DEVINET_SYSCTL_RW_ENTRY(PROXY_ARP, "proxy_arp"), diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c index ecce2dc78f17..f2cac23218be 100644 --- a/net/ipv4/ip_input.c +++ b/net/ipv4/ip_input.c @@ -295,6 +295,9 @@ static inline bool ip_rcv_options(struct sk_buff *skb) &iph->daddr); goto drop; } + if ((opt->is_strictroute && IN_DEV_FILTER_SSRR(in_dev)) || + (!opt->is_strictroute && IN_DEV_FILTER_LSRR(in_dev))) + goto drop; } if (ip_options_rcv_srr(skb))