From nobody Fri Aug 25 17:33:21 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 4RXRr13s6yz4qZS8; Fri, 25 Aug 2023 17:33:21 +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 4RXRr139mrz3D8k; Fri, 25 Aug 2023 17:33:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692984801; 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=wn7ZuNPSxBCIrL8HbFXzUnHGndI+cJeyVuqytfqD9iY=; b=LYHhZmePfKlPE+dzNovN6R14Q6YYGnQA25OCQWM8frTSYM6DD4Nh+aYQ0bxkx3DccifZOe mmly0yYmCYdqAe8A5Jjo8zAFXvUTqg/yfLGjvPBQMgb22A4CTud9wDz0e8Gl0L2iF9pkPt JwiG0MOvbySJHEIc7LsqqU6oRuwZRNrJ8ahEYGINqdkqP7BB0UFhxIRhGiGV64NqeRq7q2 ZBqWlkIPRngi1VMe0idAJ+dJTVPNXbDyEAgqy+hJE0jaUPDST+dxkJhwqibLyPwZXsQPRr 0D/jIc7bMZY0mK3mn1D4hWUTHg04oXPJE0L9U1GDiCXgynPzppCzlPcJ5f+NOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692984801; 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=wn7ZuNPSxBCIrL8HbFXzUnHGndI+cJeyVuqytfqD9iY=; b=Ob1iQuR4U0MW5wjjDYUhB09FmVe2e31YmbC0fBdBiSeAB+KQbWYV8GuTkNjVr90uR/v0cI kyZxF6EPECxYTpRQpitk8HZX+hwn+D15veNyv32MobHo7qXL8dFehAli4JwSuGrqTFtoDq B4ZbyctZgZkUQh6z8QkPHbPkxDA65yifhf/KR0IOYWTZFkLWYsVWWyPkDweQLEdQHqnhfe ghE4W79nhwIGXUdtohcb3k6USsBtxR1XtEQRq5dczIRcoWQvPXg7OuCnJHQzkbd/lfriCK zaODknvoHxMmgQYVWVW4YaOIe/P3vCyAWan5V4mBq1hyvybVwU0E1GcHy0+wRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692984801; a=rsa-sha256; cv=none; b=Xkujt2lv57rrTKfQ96RcBRQqlP1Vgx6T07tCtL5nv0tPTg8NJ8fRmCjulK8vh/QxyNSy8F 8KLX6SkDp8m5YVe8c981wmCExc/xn8QQBUK6ixFJwvnWY99+OgWcP/Qz70WXmmPLgqTLwR U7cdCeNebMH5V+BwPjNKGn01PFoc/1x7khr7coAJ7CctMir4AbydZnl7Ti+ooT8BA9RsXs NxWfJZ85ktTJ7r4+5QCM7i8IDN4DJydpOmHZUum/RqHbFffnk+w+mZuuudgOWi0ia6kjef p5bxWmF/YghUbAixz2vgWRTjJLieJS7rwWcPu9FLggOQwiY3D5jEjMXrn9HLdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RXRr11rzdz1GtR; Fri, 25 Aug 2023 17:33:21 +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 37PHXLpl099432; Fri, 25 Aug 2023 17:33:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PHXLco099429; Fri, 25 Aug 2023 17:33:21 GMT (envelope-from git) Date: Fri, 25 Aug 2023 17:33:21 GMT Message-Id: <202308251733.37PHXLco099429@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 6f3947be2aff - main - ifconfig: fix 'ifconfig -l link' 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f3947be2aff9350514b5a414104d0afaeb53cdf Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=6f3947be2aff9350514b5a414104d0afaeb53cdf commit 6f3947be2aff9350514b5a414104d0afaeb53cdf Author: Gleb Smirnoff AuthorDate: 2023-08-25 17:31:55 +0000 Commit: Gleb Smirnoff CommitDate: 2023-08-25 17:31:55 +0000 ifconfig: fix 'ifconfig -l link' The rtnetlink(4) RTM_GETADDR does not list link level addresses, thus the correct match for interfaces that have a link level address should be based on what was returned by RTM_GETLINK. Reviewed by: melifaro Differential Revision: https://reviews.freebsd.org/D41586 --- sbin/ifconfig/ifconfig_netlink.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sbin/ifconfig/ifconfig_netlink.c b/sbin/ifconfig/ifconfig_netlink.c index c3e8cd413409..a6f52ea2a7f0 100644 --- a/sbin/ifconfig/ifconfig_netlink.c +++ b/sbin/ifconfig/ifconfig_netlink.c @@ -299,7 +299,13 @@ match_iface(struct ifconfig_args *args, struct iface *iface) .sdl_alen = NLA_DATA_LEN(link->ifla_address), }; return (match_ether(&sdl)); - } + } else if (args->afp->af_af == AF_LINK) + /* + * The rtnetlink(4) RTM_GETADDR does not list link level + * addresses, so latter cycle won't match anything. Short + * circuit on RTM_GETLINK has provided us an address. + */ + return (link->ifla_address != NULL); for (struct ifa *ifa = iface->ifa; ifa != NULL; ifa = ifa->next) { if (args->afp->af_af == ifa->addr.ifa_family)