From nobody Mon Jan 23 22:11:55 2023 X-Original-To: dev-commits-src-branches@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 4P148D0q7gz2t0hK; Mon, 23 Jan 2023 22:11:56 +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 4P148D0GtLz3KsH; Mon, 23 Jan 2023 22:11:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674511916; 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=HJzKbqnfwx1lM3CuGkS4CD++mL4shFNcGUSxRFONDz0=; b=O70nJFFuHcNyl1cFY/m+dv5DYkTpCfZdESm3dgRICNlh9jbL02crdD1BgrtJ+5ACkH+f1f O2DkSoiFLOhIV/pYQThewK1eaPqfPaFNV5rh2lCvP/IfI5jrv9K49feohean6a5GEBLc9q myqbhfv8dkDt83/Ou5rmR+x7UjkDafmFV1sJdQp3Un4e061jXuZBL6rt5Scv/gKuoXBoAP e1W57lZ7WGS2OUEJt1W8d/g7iaFIDJuAcqa1zNMfnGALIFRenfxDMZy+dp8YxkXzWfJ976 dEhRokLyUdQ5buAcr1ztoxUyvQW/94rSij4DBRacZsd9Cnnc0QZymyfs/8/ihg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674511916; 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=HJzKbqnfwx1lM3CuGkS4CD++mL4shFNcGUSxRFONDz0=; b=nXa0BTve94OQ20+U/lAHneoGNAg85WLd8VyXUG9zJbylJZ7PL3auWcsTKVIEukBoChVnUY uK07uMT1yoFIi28IAefmROzMuTN3vp4q6e4q0wEYfV/AL2n2Fa0ajsmMLr+NLeMrDESoe+ tCRzdZB8l4eqRg5JJNY4mb8fKVi+pSmdpe/xYG0K3OKWyl4108bDq+leIa0O85uhyBg5lL 8DqdlU2DCZy9tDjRxagAQJiFCOQpW6GqPP1ckR/JvoXfe+jeY7FmhFCLumFnJBd1QPwXyK 9lw0AzV/dk/Ukz7mev1b4Ie7IniRW0w3iQ8NeZqG+2gp9RDAQTI2GMrDQcrSRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674511916; a=rsa-sha256; cv=none; b=gdpDWWpUQPlhPvJUhWncqW1JBV7h5fnwYnrMqE0J/yPGSR4hVgqfRGJIanmfLZp/SVz9Ap uA9TnzBYSXLwA2w2RoKJ3PpCnTCqerM+0ncwWuTTL2M9y2s1e8GF36q1YaiSb/IyOrcJvL Kr0HEEfnor831WxE23EKs3S+DwITLQVt28weJJvQs1cQwKsYM0egS/zACIa7gznhfftPeD EaKXqGaLGemk/UgNTDkHPNYJ3tc+P9J2tXg6O4FUezhJe9sCUUizBdcRbZOUEUJrR6Sbdp 59wHGTvI5McO8Xd686mG4wbJUtf/VTkm+07lXnKixG2PFiTe7OcrheTNEIvViw== 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 4P148C6SLpzlnd; Mon, 23 Jan 2023 22:11:55 +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 30NMBtIX012742; Mon, 23 Jan 2023 22:11:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NMBtFV012741; Mon, 23 Jan 2023 22:11:55 GMT (envelope-from git) Date: Mon, 23 Jan 2023 22:11:55 GMT Message-Id: <202301232211.30NMBtFV012741@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: d9211c8c7846 - stable/13 - netlink: fix CTRL_CMD_GETFAMILY lookup/dumps. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: d9211c8c7846381059c7bc73bf10489a2fc49ed1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=d9211c8c7846381059c7bc73bf10489a2fc49ed1 commit d9211c8c7846381059c7bc73bf10489a2fc49ed1 Author: Alexander V. Chernikov AuthorDate: 2022-10-31 17:11:53 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-23 22:04:02 +0000 netlink: fix CTRL_CMD_GETFAMILY lookup/dumps. Reported by: bapt (cherry picked from commit 728ca8506dff0f27e32a5994b68e9eea5c345e04) --- sys/netlink/netlink_generic.c | 48 +++++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/sys/netlink/netlink_generic.c b/sys/netlink/netlink_generic.c index 94baf12c874e..ffb9f8bcfb86 100644 --- a/sys/netlink/netlink_generic.c +++ b/sys/netlink/netlink_generic.c @@ -378,13 +378,25 @@ static const struct nlfield_parser nlf_p_generic[] = { }; static struct nlattr_parser nla_p_generic[] = { - { .type = CTRL_ATTR_FAMILY_ID , .off = _OUT(family_id), .cb = nlattr_get_uint32 }, - { .type = CTRL_ATTR_FAMILY_NAME , .off = _OUT(family_id), .cb = nlattr_get_string }, + { .type = CTRL_ATTR_FAMILY_ID , .off = _OUT(family_id), .cb = nlattr_get_uint16 }, + { .type = CTRL_ATTR_FAMILY_NAME , .off = _OUT(family_name), .cb = nlattr_get_string }, }; #undef _IN #undef _OUT NL_DECLARE_PARSER(genl_parser, struct genlmsghdr, nlf_p_generic, nla_p_generic); +static bool +match_family(const struct genl_family *gf, const struct nl_parsed_family *attrs) +{ + if (gf->family_name == NULL) + return (false); + if (attrs->family_id != 0 && attrs->family_id != gf->family_id) + return (false); + if (attrs->family_name != NULL && strcmp(attrs->family_name, gf->family_name)) + return (false); + return (true); +} + static int nlctrl_handle_getfamily(struct nlmsghdr *hdr, struct nl_pstate *npt) { @@ -399,19 +411,33 @@ nlctrl_handle_getfamily(struct nlmsghdr *hdr, struct nl_pstate *npt) .cmd = CTRL_CMD_NEWFAMILY, }; + if (attrs.family_id != 0 || attrs.family_name != NULL) { + /* Resolve request */ + for (int i = 0; i < MAX_FAMILIES; i++) { + struct genl_family *gf = &families[i]; + if (match_family(gf, &attrs)) { + error = dump_family(hdr, &ghdr, gf, npt->nw); + return (error); + } + } + return (ENOENT); + } + + hdr->nlmsg_flags = hdr->nlmsg_flags | NLM_F_MULTI; for (int i = 0; i < MAX_FAMILIES; i++) { struct genl_family *gf = &families[i]; - if (gf->family_name == NULL) - continue; - if (attrs.family_id != 0 && attrs.family_id != gf->family_id) - continue; - if (attrs.family_name != NULL && strcmp(attrs.family_name, gf->family_name)) - continue; - error = dump_family(hdr, &ghdr, &families[i], npt->nw); - if (error != 0) - break; + if (match_family(gf, &attrs)) { + error = dump_family(hdr, &ghdr, gf, npt->nw); + if (error != 0) + break; + } } + if (!nlmsg_end_dump(npt->nw, error, hdr)) { + NL_LOG(LOG_DEBUG, "Unable to finalize the dump"); + return (ENOMEM); + } + return (error); }