From nobody Mon Feb 27 16:33:44 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 4PQQzr5XGBz3vKdh; Mon, 27 Feb 2023 16:33:44 +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 4PQQzr4b5gz3lC3; Mon, 27 Feb 2023 16:33:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677515624; 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=muUVsr6Eu7AYNlZDlittFPGtliEBYlPhkpnArn9o3vQ=; b=lbxtz4Zu4P3GRbkFOlcrYm2kiE+Hj9sSAIj4DCmApY13zG+8gMQJNezDH+Gub0Mw1ucXwB gUBJDl4GzG1l8FfZMvzTQzNT7++2DS7eeeezZUMvcjKdnnelQABPGk59TSQG5lBs0TatBc 8l8yzzWPI28S6beR1Jpmx1aYKln8wYzXOrh45jJ7ydiuyPBoGTtE6cjLXwXjUfUKT72hwe VLt4RJB9bEi9W+BGCNhmEETnfPzJlFc+rA83LGUak/sphSAhiYHIcIMzp5x8KC10zdPBQ4 0GIHc6BJ1UGgo2oRSX3GsP59POVEVCYkL87s8qgC7L3vnuXPwo6Ar43Ed7ZlBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677515624; 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=muUVsr6Eu7AYNlZDlittFPGtliEBYlPhkpnArn9o3vQ=; b=MwWKki1F39f2ro6VR7+e/gk3x3hr8ZItTo9i3ndFb8fmHbiLgLRD6Zvs1eCWdMG3p2rylu OkOXHYLUz7LWESdLyC4J9jcfnj82u+HHHykdymtjxCzzZdXO69A81IZh59OHQRtigZ9HqB nOqcB/KPL/3VNxoGvB1MbPtaoh48bqi6P/wCS4ztf9WM3N6PdQONHwhlkGqtu6UTUtLKAg TWnsXTLS2GtDosA3wLgYOEt9E/W1kaZfj2kqozLnwRxAQcfKQ1Zlv9BtUbx5E5LY+JB5o+ /UMtv+Qjgws5uUDp52sXKKNlfN1K93eAP2Fb6jYkoY3xWVALZzVbez/LFGvsgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677515624; a=rsa-sha256; cv=none; b=E8Peei+WBfitrJ7bYnIdnm7wX9ax0PHM+3fcXa67wXlGpiPgQiYN0WhQ6GpGq2KM2oy/ll ekOnZbo0Xt02uSG1PQgLcNiMrYhHeE+fTv1JEUHHc33sAzjtL00zH64VPd5WnSS/iIc3XA ncLxGEUgCMCU8GY/YGeVN2Q3FLdobY+3wRVb1zJNheyjnB3M66O4MQQDLgwQ9MJwFhZ7Ff Lvp6uHY0a0j/T0ikPkVtoYl89q7c7OBgKDOrnUeR2RkbYuJ8/dbBsyFR589jLDHxL02gI1 5tCMbbong9oulW0tNkEkbTFpA46NT9NPXgNnM+oUE56s99ZhapQs48tmaWbYNA== 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 4PQQzr3bszzYGl; Mon, 27 Feb 2023 16:33:44 +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 31RGXilI068037; Mon, 27 Feb 2023 16:33:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RGXijZ068036; Mon, 27 Feb 2023 16:33:44 GMT (envelope-from git) Date: Mon, 27 Feb 2023 16:33:44 GMT Message-Id: <202302271633.31RGXijZ068036@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 09510a1a755c - releng/13.2 - netlink: clear IPv6 embedded scope when dumping route gateways. 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 09510a1a755cf85b46b72854fb42e44cf4ba4dd4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=09510a1a755cf85b46b72854fb42e44cf4ba4dd4 commit 09510a1a755cf85b46b72854fb42e44cf4ba4dd4 Author: Alexander V. Chernikov AuthorDate: 2023-02-21 12:25:58 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-27 16:27:16 +0000 netlink: clear IPv6 embedded scope when dumping route gateways. Reported by: zarychtam@plan-b.pwste.edu.pl MFC after: 3 days Approved by: re(cperciva) (cherry picked from commit b9b2184322da85e1f4d52e3b0a6322dd214210ec) (cherry picked from commit d101991d8dcc1e056d1c06ca83b88826f4d65ae5) --- sys/netlink/route/rt.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 534186447b4d..dabdaea3e03b 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -123,7 +124,9 @@ rc_get_nhop(const struct rib_cmd_info *rc) static void dump_rc_nhop_gw(struct nl_writer *nw, const struct nhop_object *nh) { +#ifdef INET6 int upper_family; +#endif switch (nhop_get_neigh_family(nh)) { case AF_LINK: @@ -132,19 +135,27 @@ dump_rc_nhop_gw(struct nl_writer *nw, const struct nhop_object *nh) case AF_INET: nlattr_add(nw, NL_RTA_GATEWAY, 4, &nh->gw4_sa.sin_addr); break; +#ifdef INET6 case AF_INET6: upper_family = nhop_get_upper_family(nh); if (upper_family == AF_INET6) { - nlattr_add(nw, NL_RTA_GATEWAY, 16, &nh->gw6_sa.sin6_addr); + struct in6_addr gw6 = nh->gw6_sa.sin6_addr; + in6_clearscope(&gw6); + + nlattr_add(nw, NL_RTA_GATEWAY, 16, &gw6); } else if (upper_family == AF_INET) { /* IPv4 over IPv6 */ + struct in6_addr gw6 = nh->gw6_sa.sin6_addr; + in6_clearscope(&gw6); + char buf[20]; struct rtvia *via = (struct rtvia *)&buf[0]; via->rtvia_family = AF_INET6; - memcpy(via->rtvia_addr, &nh->gw6_sa.sin6_addr, 16); + memcpy(via->rtvia_addr, &gw6, 16); nlattr_add(nw, NL_RTA_VIA, 17, via); } break; +#endif } }