From patchwork Thu Sep 27 17:58:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brauner X-Patchwork-Id: 975844 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=none (p=none dis=none) header.from=brauner.io Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=brauner.io header.i=@brauner.io header.b="UjTu3nIc"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42LjJs6t76z9s1x for ; Fri, 28 Sep 2018 04:00:29 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728582AbeI1ATC (ORCPT ); Thu, 27 Sep 2018 20:19:02 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:46874 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728493AbeI1ATB (ORCPT ); Thu, 27 Sep 2018 20:19:01 -0400 Received: by mail-ed1-f65.google.com with SMTP id k14-v6so5827948edr.13 for ; Thu, 27 Sep 2018 10:59:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brauner.io; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=r8s+hMtRCFiHF8UTr+Vfz9PSgRGWsmuR5zLQAqOls3M=; b=UjTu3nIc/7btaPWoHETV7jAM4+Uf6QRJurgajGDJkcYnekW0HQ7bhbjMa+EDmQGrwr 9dJJiGce3sIHDxpy5iTT2reo39X6Yw5LkzdGnDhsHnJ5Mxe13VoT7kWl74z6xZvvPw+C 4fn8qEQNkVTC1GPVfC8BlwFI5EThz0JHtjZsDciHR4lf+FtN19+WmjvlwB5cbAOvTQ7i XRY88LVB6NSdyWrfEswkKfeLbPk56zY5LHgjgtzM8tUgLwqkLYsS8x+5D27JJXF7Smi5 H6Xt9HOaj3FPwmyk3T1znbVvhQE7cA+mpGtdqlxvxdZ9y9INUByuNVYdu3IvbBuv7yrj U8LA== 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:in-reply-to :references; bh=r8s+hMtRCFiHF8UTr+Vfz9PSgRGWsmuR5zLQAqOls3M=; b=j8r1nlU3qf1KsrhBwVC8NEA8p/6SpBVBSID1eCgJIHwNMwGv9IJkyhdNWF0Z2TdrVE P1OB8tYxoyIUx7ycFZ+leYuaKEzGx294QkfN6xFnkul7A52JnrZKgxLyACBYsaErahCR k47ufYxoQy2KCT5IgQAJbKNAKVlW648wywsmW5PFBEWgbs+vXo/9IlWm0GuDhgf8tj0h ICA53EKlV8TjVboeREeElWV/WdpuCklzCLcpMmmOTBMnSvLYnmwK9+qXzJ+9GwiJXHnj 9GO55I7tX6IKhqi/rtyXZk1Iv3GeMeBW0GL4cEOYYZKjXxkf7n8psXf7QcnRwIf1t5EZ 4HHQ== X-Gm-Message-State: ABuFfog58/PwBxYI+hndbAFggBx3z4rCz1z3XHUBymrlnYRvnadRChqD AWuY6KGd89vdxsEPVv2dZ1a1mw== X-Google-Smtp-Source: ACcGV62pR3/e85N26b+4kx2e3ciZbnG3iU7m33B0rFESKuqclNcRq+fuXoihUkIU+tVsqNW/zrTxCA== X-Received: by 2002:a50:ac76:: with SMTP id w51-v6mr19421250edc.211.1538071173722; Thu, 27 Sep 2018 10:59:33 -0700 (PDT) Received: from localhost.localdomain (fa-padur-binz.ediscom.de. [212.204.40.18]) by smtp.gmail.com with ESMTPSA id a9-v6sm1532606edi.26.2018.09.27.10.59.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Sep 2018 10:59:32 -0700 (PDT) From: Christian Brauner To: jbenc@redhat.com, davem@davemloft.net, dsahern@gmail.com, stephen@networkplumber.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Christian Brauner Subject: [PATCH net-next 2/7] ipv4: add RTM_GETADDR2 Date: Thu, 27 Sep 2018 19:58:52 +0200 Message-Id: <20180927175857.3511-3-christian@brauner.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180927175857.3511-1-christian@brauner.io> References: <20180927175857.3511-1-christian@brauner.io> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Various userspace programs (e.g. iproute2) have sent RTM_GETADDR requests with struct ifinfomsg. This is wrong and should have been struct ifaddrmsg all along as mandated by the manpages. However, dump requests so far didn't parse the netlink message that was sent and succeeded even when a wrong struct was passed along. Currently, the message is parsed under the assumption that the correct struct ifaddrmsg is sent down. If the parsing fails the kernel will still fulfill the request to preserve backwards compatability but a rate-limited message that there were leftover bytes after parsing the message is recorded in dmesg. It has been argued that this is unacceptable [1]. But various new features that got and will get added to RTM_GETADDR make it necessary to definitely know what header was passed along. This is currently not possible without resorting to (likely unreliable) hacks such as introducing a nested attribute that ensures that RTM_GETADDR which pass along properties such as IFA_TARGET_NETNSID always exceed RTM_GETADDR requests that send down the wrong struct ifinfomsg [2]. Basically, multiple approaches to solve this have been shut down. Furthermore, the API expressed via RTM_GETADDR is apparently frozen [3] so the wiggle room at this point seems very much zero. The correct solution at this point seems to me to introduce a new RTM_GETADDR2 request. This way we can parse the message and fail hard if the struct is not struct ifaddrmsg and can safely extend it in the future. Userspace tools that rely on the buggy RTM_GETADDR API will still keep working without even having to see any log messages and new userspace tools that want to make user of new features can make use of the new RTM_GETADDR2 requests. [1]: https://lists.openwall.net/netdev/2018/09/25/59 [2]: https://lists.openwall.net/netdev/2018/09/25/75 [3]: https://lists.openwall.net/netdev/2018/09/26/166 Signed-off-by: Christian Brauner Cc: David Ahern Cc: Jiri Benc Cc: Stephen Hemminger --- net/ipv4/devinet.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 44d931a3cd50..3ac004ba67b0 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -1659,7 +1659,8 @@ static int inet_fill_ifaddr(struct sk_buff *skb, struct in_ifaddr *ifa, return -EMSGSIZE; } -static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb) +static int inet_dump_ifaddr_common(struct sk_buff *skb, + struct netlink_callback *cb, int rtm_type) { struct inet_fill_args fillargs = { .portid = NETLINK_CB(cb->skb).portid, @@ -1683,8 +1684,14 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb) s_idx = idx = cb->args[1]; s_ip_idx = ip_idx = cb->args[2]; - if (nlmsg_parse(cb->nlh, sizeof(struct ifaddrmsg), tb, IFA_MAX, - ifa_ipv4_policy, NULL) >= 0) { + if (rtm_type == RTM_GETADDR2) { + int err; + + err = nlmsg_parse(cb->nlh, sizeof(struct ifaddrmsg), tb, + IFA_MAX, ifa_ipv4_policy, NULL); + if (err < 0) + return err; + if (tb[IFA_TARGET_NETNSID]) { fillargs.netnsid = nla_get_s32(tb[IFA_TARGET_NETNSID]); @@ -1736,6 +1743,16 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb) return skb->len; } +static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb) +{ + return inet_dump_ifaddr_common(skb, cb, RTM_GETADDR); +} + +static int inet_dump_ifaddr2(struct sk_buff *skb, struct netlink_callback *cb) +{ + return inet_dump_ifaddr_common(skb, cb, RTM_GETADDR2); +} + static void rtmsg_ifa(int event, struct in_ifaddr *ifa, struct nlmsghdr *nlh, u32 portid) { @@ -2564,6 +2581,7 @@ void __init devinet_init(void) rtnl_register(PF_INET, RTM_NEWADDR, inet_rtm_newaddr, NULL, 0); rtnl_register(PF_INET, RTM_DELADDR, inet_rtm_deladdr, NULL, 0); rtnl_register(PF_INET, RTM_GETADDR, NULL, inet_dump_ifaddr, 0); + rtnl_register(PF_INET, RTM_GETADDR2, NULL, inet_dump_ifaddr2, 0); rtnl_register(PF_INET, RTM_GETNETCONF, inet_netconf_get_devconf, inet_netconf_dump_devconf, 0); }