From patchwork Fri Jun 17 02:02:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Carlos Llamas X-Patchwork-Id: 12885039 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 691E0C43334 for ; Fri, 17 Jun 2022 02:02:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379509AbiFQCCV (ORCPT ); Thu, 16 Jun 2022 22:02:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230220AbiFQCCT (ORCPT ); Thu, 16 Jun 2022 22:02:19 -0400 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83EEA61617 for ; Thu, 16 Jun 2022 19:02:18 -0700 (PDT) Received: by mail-pj1-x1049.google.com with SMTP id x24-20020a17090ab01800b001ea7efd1e45so1518509pjq.5 for ; Thu, 16 Jun 2022 19:02:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc :content-transfer-encoding; bh=H3ch/skPh6OWdU3ZVapoiPf5KZK/QNqeESV3G0ohIf4=; b=TM8dvv8PAusNRsHX7JT7RoJzYQTc2K2Fj42aMjHDjEQDjZS+8V9H/udQmC0QADcPZU xOVk2MucjbnCuP/EavRFEyW8mTSlskH0SxvWksL6W6g6s6rJEz8Q9JdDqyy6/Eb72kfd K78HNsE2n6nSFlW7bYKMhGJ/OlS4X1gWifLR9bUGWr2jkqOx5dG1OOVmdbHngLWBnfKY DLTukrwmhcxvgImBimTtgy9By9TKTrgdoTUYTkjVGBvR/2ynkQ+QOkgVTqAwoGOuM5H3 FZw5OXnp/gIkwnEPE21DNoP5CZX+NgqlJ9Z3+mrNTf3dPzhdMv/z/WaFRu6OXMmJNYlZ 3vKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc :content-transfer-encoding; bh=H3ch/skPh6OWdU3ZVapoiPf5KZK/QNqeESV3G0ohIf4=; b=kIb5SSL9v7kO21xQ9js9RQJDb4ZxfZM7yXdpxElbnKLXAl02rwCstSQ2pbhVmLF95c cNFtNEz72lZZRauOTDg4paewxi9+J6mL2D5Hvv/zufyfe5/9VbxYvClvVijHZbt6RXBF 2r0Ace/uDcwXyECTjxQrCgj1zKCBg7ppI6qDoqNCP/JhXDKs82O/mqeI5iwDXXaDeXnS XdcaaQe/7XfRE3IO9YIuxvNG+4vP6ImHxKuXHY6sfhRzpGTW4/2DbF9CHFNHqmq/4fwW PNQpIYQEQg/ymhArZusCb52Dt62aHjFmD97B5CLihiRAYcz52c1zeUIc92gl2/D12+4y 6TNQ== X-Gm-Message-State: AJIora97Bn1uSKKO5YP7LbfulEgB4RWAIIeId4WL/x1+UJwUG4hfZXDR t6rC0B+IVRSm76T3FTbozWhAdQF2kUMndg== X-Google-Smtp-Source: AGRyM1shuBG8YdgFYn+WRFakGWM0o05iu9Qupw/A5WgGLHcuw/AKAOQjLpdfXOnUOblsTmkp0Vnq0wxr1DuxVA== X-Received: from zllamas.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:4c]) (user=cmllamas job=sendgmr) by 2002:a17:90b:4a0a:b0:1e8:5078:b573 with SMTP id kk10-20020a17090b4a0a00b001e85078b573mr7994165pjb.213.1655431338029; Thu, 16 Jun 2022 19:02:18 -0700 (PDT) Date: Fri, 17 Jun 2022 02:02:13 +0000 Message-Id: <20220617020213.1881452-1-cmllamas@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.36.1.476.g0c4daa206d-goog Subject: [PATCH net] ipv4: ping: fix bind address validity check From: Carlos Llamas To: "David S . Miller" , Hideaki YOSHIFUJI , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Riccardo Paolo Bestetti Cc: kernel-team@android.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Carlos Llamas , Miaohe Lin , " =?utf-8?q?Maciej_=C5=BBenczykowski?= " Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Commit 8ff978b8b222 ("ipv4/raw: support binding to nonlocal addresses") introduced a helper function to fold duplicated validity checks of bind addresses into inet_addr_valid_or_nonlocal(). However, this caused an unintended regression in ping_check_bind_addr(), which previously would reject binding to multicast and broadcast addresses, but now these are both incorrectly allowed as reported in [1]. This patch restores the original check. A simple reordering is done to improve readability and make it evident that multicast and broadcast addresses should not be allowed. Also, add an early exit for INADDR_ANY which replaces lost behavior added by commit 0ce779a9f501 ("net: Avoid unnecessary inet_addr_type() call when addr is INADDR_ANY"). [1] https://lore.kernel.org/netdev/CANP3RGdkAcDyAZoT1h8Gtuu0saq+eOrrTiWbxnOs+5zn+cpyKg@mail.gmail.com/ Fixes: 8ff978b8b222 ("ipv4/raw: support binding to nonlocal addresses") Cc: Miaohe Lin Cc: Riccardo Paolo Bestetti Reported-by: Maciej Żenczykowski Signed-off-by: Carlos Llamas Reviewed-by: Maciej Żenczykowski --- net/ipv4/ping.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index 1a43ca73f94d..3c6101def7d6 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -319,12 +319,16 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk, pr_debug("ping_check_bind_addr(sk=%p,addr=%pI4,port=%d)\n", sk, &addr->sin_addr.s_addr, ntohs(addr->sin_port)); + if (addr->sin_addr.s_addr == htonl(INADDR_ANY)) + return 0; + tb_id = l3mdev_fib_table_by_index(net, sk->sk_bound_dev_if) ? : tb_id; chk_addr_ret = inet_addr_type_table(net, addr->sin_addr.s_addr, tb_id); - if (!inet_addr_valid_or_nonlocal(net, inet_sk(sk), - addr->sin_addr.s_addr, - chk_addr_ret)) + if (chk_addr_ret == RTN_MULTICAST || + chk_addr_ret == RTN_BROADCAST || + (chk_addr_ret != RTN_LOCAL && + !inet_can_nonlocal_bind(net, isk))) return -EADDRNOTAVAIL; #if IS_ENABLED(CONFIG_IPV6)