From nobody Tue Nov 28 21:13:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfwDK0xPBz52ZPM; Tue, 28 Nov 2023 21:13:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfwDK0CGLz3G2d; Tue, 28 Nov 2023 21:13:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701206017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tZR4dxKUfnpS1mn7PCAjg3tBdZ+LY53Oq9KNGbaQrkE=; b=vsK4fPuqmG7LD6qD1TECCsuQL/ViPmnIAnShfy6LdpHBe79GtWRHA/8XlaEjZBz62r7eC8 gux7fPqInl/ywgsUsPWHD7KFYY1Z7v4sf0JcraB46cRvxn6+yVmJhhKb95xPRepoTfwyOZ kG2Q9pkP/phu/55vsWTsEcu2bpLB1LWbH3K83t9xF0RcPhWa1XmMGXuloALZK1fHayoX5n 8aKVOBINiRsfQK2lukXD72B0cN7yZJFn5oWq5niVPrIT4Qa8P4nep22beLhGJnk7vEtHa0 SjuJvMuo+4bkj3r/PMfs1QutACAtV6ePlEvOuhlkZ89QL971LJP04eFVgr3pnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701206017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tZR4dxKUfnpS1mn7PCAjg3tBdZ+LY53Oq9KNGbaQrkE=; b=sxTQ2h3N847C3RhwpK/Z4pRCCKJvLdOZ+ZGE0dyfiYiYJJ64XD6Pz3YBnYqaviSXmXBqIu Zl3VHduY989jF1mq1uemraNjroH7iixkZkdhjNZpz8LSZ1wSQLc25ra7dFi4w7zoQ8OJIk uDoonwo8728dmE7XOlJR0WkEPCtGApB/upugrDAQpeYlaPMwZahjdLVkqXdNamkqPeJ3xG Og+OC2STYcXuUmMtrEIhq6dy/O2QvCY/Cbx4tMm87RxkqU9Y92LMOHjGr2/EFR7MZ8+kVn qh34NJS32cBJxp33T4YR6kzs0MVQo8i/FVgokghUXMvrTEuwlJ/WbisNxI5yBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701206017; a=rsa-sha256; cv=none; b=Axwqv9ZhC0cKUTmyOXuvuav+jDvaxzW9leM6ofE7hXNLmMLAvLSxZn6XeoDeYWZVf5Is5I BgwijHPoVM7Bej66HKjS3p6UsABHGVTMz/8lmvHIQtlqksTthWXpX4Rdz06qHjGgYkKnhI MWn5tWAWp2lZxDbMAmwtE92PerQHwnMLY+PYajfebPp2cOTcGOnuDPv5Qe/ioTAa7KRhzq 2ElUgkHMA1RhRKPnBjj23EB1dufiucXWACApC5L2ywwpWBffncm7PNWKkLEifJpsITzy1u 8MqygsyJcjD/XkO7DJyRXToEBk4v1BcOl3jcyAiAbw4b5xOrKmrtXriPNuzNaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfwDJ6NFxzdYq; Tue, 28 Nov 2023 21:13:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ASLDasj098639; Tue, 28 Nov 2023 21:13:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASLDahm098636; Tue, 28 Nov 2023 21:13:36 GMT (envelope-from git) Date: Tue, 28 Nov 2023 21:13:36 GMT Message-Id: <202311282113.3ASLDahm098636@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "R. Christian McDonald" Subject: git: f818559774cb - main - netlink: fix adding an interface route List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rcm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f818559774cb0c1516364c4beca361480fd68b5b Auto-Submitted: auto-generated The branch main has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=f818559774cb0c1516364c4beca361480fd68b5b commit f818559774cb0c1516364c4beca361480fd68b5b Author: KUROSAWA Takahiro AuthorDate: 2023-11-28 18:14:50 +0000 Commit: R. Christian McDonald CommitDate: 2023-11-28 21:11:55 +0000 netlink: fix adding an interface route route add -iface " for a netif without an IPv4/IPv6 address fails with EINVAL. Need to use a link-level ifaddr for gw if an ifaddr for dst is not found as the rtsock-based implementation does. PR: 275341 Reported by: Sean Cody Reviewed by: rcm Tested by: rcm Approved by: kp (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41330 --- sys/netlink/route/rt.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index cfaa2167b0d2..ed09748995dc 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -750,9 +750,14 @@ finalize_nhop(struct nhop_object *nh, const struct sockaddr *dst, int *perror) struct ifaddr *ifa = ifaof_ifpforaddr(gw_sa, nh->nh_ifp); if (ifa == NULL) { - NL_LOG(LOG_DEBUG, "Unable to determine ifa, skipping"); - *perror = EINVAL; - return (NULL); + /* Try link-level ifa. */ + gw_sa = &nh->gw_sa; + ifa = ifaof_ifpforaddr(gw_sa, nh->nh_ifp); + if (ifa == NULL) { + NL_LOG(LOG_DEBUG, "Unable to determine ifa, skipping"); + *perror = EINVAL; + return (NULL); + } } nhop_set_src(nh, ifa); }