From nobody Sun Apr 9 13:34:16 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 4PvY3r3jZJz44RGs; Sun, 9 Apr 2023 13:34:16 +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 4PvY3r2pV2z43M6; Sun, 9 Apr 2023 13:34:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681047256; 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=psf9QAeIQaPgMaTuJJnojDoCoElf3dK8S/xXTz/hVvw=; b=sab+DJXzpzpP1NBychX9exgTcwSsJyhCj28zgMA8zcC2l5nxCyhn5Rjs1qiiDZDX/aqIGh NLo4xlxxXuMizDW6+GOJFI74yqMfUann733aMAhlFZ1tmIAzEs4+XKNlsg5OygUeLatFDO 1egosFq+HomzF9ahqaBygASXCrtYkl7MMTKCSdW2QmbFjDgDMnlj3tFmKM4epUNe4g94aX 4ARY9OQRYq9ijYAcxhtDDHkFPCLPm0j4l4XmSye+PGpTpl6mn0M+W6FaPFknIAlWH0gDKm Vhm1ufFQUPe1EP0VoJzSkJw1Og++wWYitPvB9/p8ZuJO598vuwcLr5wLTEYsAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681047256; 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=psf9QAeIQaPgMaTuJJnojDoCoElf3dK8S/xXTz/hVvw=; b=TFxQkDrHTkxj3g0Z1LCqIrWHGkh3qPIPlI7eEUppPJuW84zdBYhhngSlVv6Escmd0TsuDF fbRVeOH/js0rk11AQXvRmdJPac0kzj5a6Fxd+QWwqDIfirmyAOCsGjot14Sfk+LmOqekDi bMFOklaXzWR8BLe6LrQAkhWxviK7GQXPwI/A83vYiy6N3NY8OUKK8NXCUpf85MWcEQUkMV OKW5pSoFPDgsQocMyJpl/D8gr1nSx71xTofx5SF9kV9L9RcFnCR7/HtfwsZGjjHgkzF74l 9zO/oDc5dJiSybHuInGhePVcg5dtPjanUYssyZVnRwJiMqGgk13epyfqp+2N5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681047256; a=rsa-sha256; cv=none; b=mWgeEd8UqN7V/emW6w8161IOLEUGJiBhV5upMomT5ESm4loTmjQXDDwIJMA4aweEgvK9k0 zK0xKosLuIArnLcn594eqApiwkm1lUTiyHo20fWZ8TxXdYmnZsh4VhIVdi5dsxMInmI9Cd vGy3JjX+9dcYziINikLcI4iieoA8C85vE8mhvn49pLiq0QM5NjIbSTo1hMhHcAWvfeKi1J VbNzcnDzB6I9HtiKX+6OeNjBRWciURW1iCHq/Y4Cb5UfxXnD1opH6K1KWwvmPNslXNSxcm WeHxzYqX3ingFpA/EXnykqZf4U/i28gLRIkHS/c1G3uche1LvJEjSnsT/zpZYw== 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 4PvY3r1r62z19HD; Sun, 9 Apr 2023 13:34:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 339DYG4P077250; Sun, 9 Apr 2023 13:34:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 339DYGRC077249; Sun, 9 Apr 2023 13:34:16 GMT (envelope-from git) Date: Sun, 9 Apr 2023 13:34:16 GMT Message-Id: <202304091334.339DYGRC077249@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: cc3793b1c548 - main - netlink: improve source ifa selection algorithm when adding routes. 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc3793b1c54847e26001f42026778703970fa570 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=cc3793b1c54847e26001f42026778703970fa570 commit cc3793b1c54847e26001f42026778703970fa570 Author: Alexander V. Chernikov AuthorDate: 2023-04-09 13:30:45 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-09 13:33:22 +0000 netlink: improve source ifa selection algorithm when adding routes. Use route destination sockaddr when the gateway is eiter AF_LINK or has the different family (IPv4 over IPv6). This change ensures the nexthop IFA has the same family as the destination. Reported by: Dmitriy Smirnov Tested by: Dmitriy Smirnov MFC after: 3 days --- sys/netlink/route/rt.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 7e81d59d696b..db535cb676e4 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -708,7 +708,19 @@ finalize_nhop(struct nhop_object *nh, const struct sockaddr *dst, int *perror) } /* Both nh_ifp and gateway are set */ if (nh->nh_ifa == NULL) { - struct ifaddr *ifa = ifaof_ifpforaddr(&nh->gw_sa, nh->nh_ifp); + const struct sockaddr *gw_sa = &nh->gw_sa; + + if (gw_sa->sa_family != dst->sa_family) { + /* + * Use dst as the target for determining the default + * preferred ifa IF + * 1) the gateway is link-level (e.g. direct route) + * 2) the gateway family is different (e.g. IPv4 over IPv6). + */ + gw_sa = dst; + } + + struct ifaddr *ifa = ifaof_ifpforaddr(gw_sa, nh->nh_ifp); if (ifa == NULL) { NL_LOG(LOG_DEBUG, "Unable to determine ifa, skipping"); *perror = EINVAL;