From nobody Mon Apr 17 12:05:25 2023 X-Original-To: dev-commits-src-main@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 4Q0Qjf1hp8z45p79; Mon, 17 Apr 2023 12:05:26 +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 4Q0Qjf1C15z47YB; Mon, 17 Apr 2023 12:05:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681733126; 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=Oisgp8yitI44nRaxF5ZcqSPT8QkOtW/U45IUTOtnCiQ=; b=nU7XJpIkXAC7ITSA9fGRmQnPXbfv3bb4PxFS/aOxgLp/xb6QEgLnWaRzRWVhyZ0nWZVEuP nKySde5/7M+q8CGrH3DAkcq/XARdJmYYD/qc8AUvFUMY7+hIXlHIFWgkJB/Iq0yPPJZe2z 6lZ4smnDrL9D6FCvAoEBnpXDoTb4W8XiBxQ0huv/Fcw1WV9QbSyRmq0wGTemodZ1DzGsK6 RoEcLRxDoLlFIKEWJqFfl7+MPA9xTLLHfQvdCrlHvUrk3deRgSuSDhHR24QVQFCDO/ebYa vYGL3AIH02mSLoEYgCFaEJ2TlsRcrJLdvyzOkHJFwIDq31ODyfT95zYzH+Ga4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681733126; 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=Oisgp8yitI44nRaxF5ZcqSPT8QkOtW/U45IUTOtnCiQ=; b=O4InTCEmtqT7e9hy5+gQ5f+1E1aku6UnYGtQvye9R17cNYQRyU29tP+g1r4wKFUmmNU9s/ OjtfSfyJnYDrUoNlWRFxBWtn1GNko5mTkErSjDbfwfTNhSkaqeRvKHsI5EbOsk8efq9bTK QiszWIhTIM5ENzUs5SF4g+c4HYz1gBIVu1m1kLaQHs69A7aZ72ZUOaD+9R2JrDbg11HP4D uXQrnjFWQwFeIzBFM7/UdyHRG7STLiMmV/jMM/UJq6jeB/MtRAm/8F59TEa4j75jMpHS7Q MnTMmr+CnXvIN31osK3ioPrUCLkUKgLjpvlKhokk+UrMP+AbhkWBxvF4wnzIhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681733126; a=rsa-sha256; cv=none; b=cDYznrcbtLZnT8zZxUxjbpIkE3+y95XrhlKGOxS1M62LxmiXi4hzBWHfdpC0DXuFNWzEWK QX+tdssj5rez/50shUQtvf4BvwoHKvP+dRUACzgugagddvGfL1ObEDiwMNav2qhAMNP1rr ql8LUwiDjfko49cczOG3ow1vWqlBtmFcxPV+7DgAp+dFzv+QyeO+oTmVn6jfjrKycDHIxx jd3V+/m1FI/Uwir7eh5jCSCh3Mi8nPGatg9Ht8Kogkpnh7g0zYx6VLPgQB39sM/qeOzFEy fpTzo0DB/GCN/6zbQJ88EW5EO1kJ30N1OX+93b/4TnW+wQB/nJwOnWqZQlruhQ== 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 4Q0Qjf0FRPzSwY; Mon, 17 Apr 2023 12:05:26 +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 33HC5PsF007280; Mon, 17 Apr 2023 12:05:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33HC5Pub007279; Mon, 17 Apr 2023 12:05:25 GMT (envelope-from git) Date: Mon, 17 Apr 2023 12:05:25 GMT Message-Id: <202304171205.33HC5Pub007279@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: 9742519b2229 - main - netlink: fix operations with link-local routes/gateways. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 9742519b2229c1035f5c81f478e558c951ddd1ea Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=9742519b2229c1035f5c81f478e558c951ddd1ea commit 9742519b2229c1035f5c81f478e558c951ddd1ea Author: Alexander V. Chernikov AuthorDate: 2023-04-17 12:04:43 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-17 12:04:43 +0000 netlink: fix operations with link-local routes/gateways. MFC after: 3 days --- sys/netlink/route/rt.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index db535cb676e4..cbe9ee001dfd 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -406,6 +406,25 @@ const static struct nlfield_parser nlf_p_rtnh[] = { #undef _OUT NL_DECLARE_PARSER(mpath_parser, struct rtnexthop, nlf_p_rtnh, nla_p_rtnh); +static void +set_scope6(struct sockaddr *sa, struct ifnet *ifp) +{ +#ifdef INET6 + if (sa != NULL && sa->sa_family == AF_INET6 && ifp != NULL) { + struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)sa; + + if (IN6_IS_ADDR_LINKLOCAL(&sa6->sin6_addr)) + in6_set_unicast_scopeid(&sa6->sin6_addr, ifp->if_index); + } +#endif +} + +static void +post_p_mpath(struct rta_mpath_nh *mpnh) +{ + set_scope6(mpnh->gw, mpnh->ifp); +} + struct rta_mpath { int num_nhops; struct rta_mpath_nh nhops[0]; @@ -432,6 +451,7 @@ nlattr_get_multipath(struct nlattr *nla, struct nl_pstate *npt, const void *arg, mp->num_nhops - 1); return (error); } + post_p_mpath(mpnh); int len = NL_ITEM_ALIGN(rtnh->rtnh_len); data_len -= len; @@ -495,6 +515,13 @@ static const struct nlfield_parser nlf_p_rtmsg[] = { #undef _OUT NL_DECLARE_PARSER(rtm_parser, struct rtmsg, nlf_p_rtmsg, nla_p_rtmsg); +static void +post_p_rtmsg(struct nl_parsed_route *r) +{ + set_scope6(r->rta_dst, r->rta_oif); + set_scope6(r->rta_gw, r->rta_oif); +} + struct netlink_walkargs { struct nl_writer *nw; struct route_nhop_data rnd; @@ -899,6 +926,7 @@ rtnl_handle_newroute(struct nlmsghdr *hdr, struct nlpcb *nlp, error = nl_parse_nlmsg(hdr, &rtm_parser, npt, &attrs); if (error != 0) return (error); + post_p_rtmsg(&attrs); /* Check if we have enough data */ if (attrs.rta_dst == NULL) { @@ -963,6 +991,7 @@ rtnl_handle_delroute(struct nlmsghdr *hdr, struct nlpcb *nlp, error = nl_parse_nlmsg(hdr, &rtm_parser, npt, &attrs); if (error != 0) return (error); + post_p_rtmsg(&attrs); if (attrs.rta_dst == NULL) { NLMSG_REPORT_ERR_MSG(npt, "RTA_DST is not set"); @@ -990,6 +1019,7 @@ rtnl_handle_getroute(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_pstate * error = nl_parse_nlmsg(hdr, &rtm_parser, npt, &attrs); if (error != 0) return (error); + post_p_rtmsg(&attrs); if (attrs.rta_table >= V_rt_numfibs) { NLMSG_REPORT_ERR_MSG(npt, "invalid fib");