From nobody Tue Mar 22 12:41:15 2022 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 273371A3A79E; Tue, 22 Mar 2022 12:41: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 4KNB1R6frpz3qhy; Tue, 22 Mar 2022 12:41:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647952876; 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=hwv0D34vX0IsrcopxvJBwB11t+gW0hIocDp7NkcNUW8=; b=GHxyApr/YG8uEmcseFX/8KYPqWj6GMbHszEE3r9tzbOR//kt2sv1EYoGlWw8gCUmz6F/Wu cIn8tOaxK4Um0Z4DEWRjDn9YECZ6tnkxbCWmEEskdx/nAz1BlMxVqgmD+zzKFVT5zGNRNi wp/7msj2AYAG77luz/CYlcX2NEjFrSEMP7c/mkV2uyRNXLWVKV3cNAwePunihwL2umlaDg 1RjRCSNhJUArIFB9JqUYlrOhZ9hiYgcpLVhaHYMyH/YAHTtiQfXTPyWtudZtep2LvTfeD/ DraRS52dzP7wXVwZMPL7c+7agwgGX2hoeLLb73a5brfsdj2VuNTJkJ9JIAJG4A== 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 C41D57877; Tue, 22 Mar 2022 12:41:15 +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 22MCfF1w096632; Tue, 22 Mar 2022 12:41:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22MCfFXT096631; Tue, 22 Mar 2022 12:41:15 GMT (envelope-from git) Date: Tue, 22 Mar 2022 12:41:15 GMT Message-Id: <202203221241.22MCfFXT096631@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mike Karels Subject: git: 04cd74b4cdb1 - main - IPv4 multicast: fix netstat -g 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: karels X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 04cd74b4cdb1203bc0fbfb85d8490a5b45eadf64 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647952876; 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=hwv0D34vX0IsrcopxvJBwB11t+gW0hIocDp7NkcNUW8=; b=cyRNf4eDBB8U6HFRSWRouRPFOZrDviNFS5qv27wGuWp18zeukQ7C2kovc0l0CvuTqAyu5Z g7DFC5SMg3m9THtrPRadikwu2hI6YEGtb5z3TWABRX8zJ/6MjfT09Wt1GhtYiNfg6BC4Ro /b9x6906EWgDCIq7royjp4e/5RC7ESxaOsjdb3Yp27x7RfgFygG2pAoNALe5qTGK5/GYYb Iqn+ZadL9mXAJMxihD5ybwDv74fmHD9F114FswfQaeBvY3WjXT/4K8cg6mGzy/VOxQFEDp d2OTbJIyRdTt0d74U9fppLv8dGPbv3Fd/NE91l1ELiZ2XLEh46UchwPhFcA7cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647952876; a=rsa-sha256; cv=none; b=m7A+LNweZqMFBSBPADlTWomInWhVTExTs+vXnBlkl5M6+MteI1I50txKWfzZoiPTGtCbN/ Ap+Hq0+djT3LEdV7pyrGjGSlqX20m8iJ+iSsRAFL+x2aTGPxGVDJwyoi4ItPmCr32VGCsO 3MRNF2nxqnDgp2Nx0c3HO4ATD5wWJsDhGkZ0la4LbXrHZdYTg1gS5oIl3gicxZkrcCfUg+ fr/kVoDGgtSsINoeX139dLNLsF+Sk+ZTC9JakNwqUZ+ZFROn06ONWm2Rz9wRJyyWIoHj1g glNFtASjC1juPfXwN3kOz/t0LdwMhHhvPSvW/jUZ9PXKCf86v7sfH0X5PTI4bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=04cd74b4cdb1203bc0fbfb85d8490a5b45eadf64 commit 04cd74b4cdb1203bc0fbfb85d8490a5b45eadf64 Author: Mike Karels AuthorDate: 2022-03-21 19:59:13 +0000 Commit: Mike Karels CommitDate: 2022-03-22 12:38:01 +0000 IPv4 multicast: fix netstat -g The vif structure includes fields at the end which are #ifdef KERNEL, causing a mismatch between the structure sizes between kernel and user level. netstat -g failed with an ENOMEM on the sysctl to fetch the vif table. Change the vif sysctl code in ip_mroute to copy out only the user-level-visible portion of each table entry. Reviewed by: bz, wma Differential Revision: https://reviews.freebsd.org/D34627 --- sys/netinet/ip_mroute.c | 11 ++++++++--- sys/netinet/ip_mroute.h | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index e6acfd4dcfc7..cc356e3678f3 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -2727,18 +2727,23 @@ static SYSCTL_NODE(_net_inet_ip, OID_AUTO, mfctable, static int sysctl_viflist(SYSCTL_HANDLER_ARGS) { - int error; + int error, i; if (req->newptr) return (EPERM); if (V_viftable == NULL) /* XXX unlocked */ return (0); - error = sysctl_wire_old_buffer(req, sizeof(*V_viftable) * MAXVIFS); + error = sysctl_wire_old_buffer(req, MROUTE_VIF_SYSCTL_LEN * MAXVIFS); if (error) return (error); MRW_RLOCK(); - error = SYSCTL_OUT(req, V_viftable, sizeof(*V_viftable) * MAXVIFS); + /* Copy out user-visible portion of vif entry. */ + for (i = 0; i < MAXVIFS; i++) { + error = SYSCTL_OUT(req, &V_viftable[i], MROUTE_VIF_SYSCTL_LEN); + if (error) + break; + } MRW_RUNLOCK(); return (error); } diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h index 5ad25b485dfc..aaf87770001e 100644 --- a/sys/netinet/ip_mroute.h +++ b/sys/netinet/ip_mroute.h @@ -265,6 +265,7 @@ struct vif { u_long v_bytes_in; /* # bytes in on interface */ u_long v_bytes_out; /* # bytes out on interface */ #ifdef _KERNEL +#define MROUTE_VIF_SYSCTL_LEN __offsetof(struct vif, v_spin) struct mtx v_spin; /* Spin mutex for pkt stats */ char v_spin_name[32]; #endif