From nobody Mon Oct 31 17:13:07 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 4N1KVD0YQ3z4gjwN; Mon, 31 Oct 2022 17:13:08 +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 4N1KVC6yZYz3h40; Mon, 31 Oct 2022 17:13:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667236388; 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=Pg2/50fcg0K/GV0FOC0dLYFWVgPpzHGE2AqHWLX7hpg=; b=pG1IqA0LCkY9kC2cHJcWpF8mWo52dg9365oAfMBg8j3XiCzNzTHel0nSYzbuWjBj8FOGfQ 4gb8a4q1q9XQk85g8gxP8Xzllvv/zLvlVeCxu71d+kZMEloMtnlFr+4YlMKy5aEOcSejJz Sg4ctTDSSomNR96rhd3AQS/k1/5qy65M3IfUMYwClOYk+k9mikZU04LVuEAJpW/3ngG306 mXIPMH9R/krrqcazwc90mcb9W20uOhm/fcckCj/q0smGHi6wOUG9BzsEv8t5BDTMGYvTAO 3qjIKClc+OLShdIAmklsSJDx9U5hdjC9sEmtzuVcsXl10dRFb8WSs3/NAM0sxQ== 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 4N1KVC624gzkdG; Mon, 31 Oct 2022 17:13:07 +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 29VHD7Xq002976; Mon, 31 Oct 2022 17:13:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29VHD7c4002975; Mon, 31 Oct 2022 17:13:07 GMT (envelope-from git) Date: Mon, 31 Oct 2022 17:13:07 GMT Message-Id: <202210311713.29VHD7c4002975@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: 728ca8506dff - main - netlink: fix CTRL_CMD_GETFAMILY lookup/dumps. 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/main X-Git-Reftype: branch X-Git-Commit: 728ca8506dff0f27e32a5994b68e9eea5c345e04 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667236388; 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=Pg2/50fcg0K/GV0FOC0dLYFWVgPpzHGE2AqHWLX7hpg=; b=g7ImNc2O16ncR3nkKWZK6pPo11bmPrzpUM8wZ7IwYM3A9kk8XTisCBFaCH1XxsPCzf0U2P kpogcTevwg3QsM8eWIxGwRLCMFR5NgLji6LXUe6NXFDaC6K+7l9d5PpzVvpjbmgBl6iYLT hXlm177xtcpVlkn89vlPaQ8AkCDR8KPsek+MTZe6R1TNCsxBl2YNLWvf2vwP3RCNaTDCoY Kpe8RMhXfh+mx44n5kLADvVPwOgIlwqZpBqD2YuEtpPwjwouFHNRO1CyZaSINkiSfg0Ata L5swr3vuMtkvVIvZZezT28tMLmfY69deelAp30fmCtlwwzm1LnRKa6I3ctxiyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667236388; a=rsa-sha256; cv=none; b=pEqpeo1E5qPUPgHYjJqdesbVc4drIO3LVLjm2S/vdXJwnX9/DhsvJ1pAeb3t+qI2MSqog7 ruOc+1GQwSXJt+E5z86PMb2q9nOp6pUwdv82C1/mG/54TbwftI+u4MggZ88bmxwWOuA2Xg i0uTsOfiMSfDYhhb3PAAHMWzOznZG5/psetjZj+xmJtUzljhCxnT2C4R9nILTXO56/oYUc fkirFDcg5AdByLWRhw92B9hcTV015MgnGpX9J0Hy1rNVunTTDfxEDerkVQa/gcsglNb+xF w+Hya/DAu+XUEJskzrtW8pGN02e8AV/lSN2cNHWhz4fHMhQue7NZowEEgUvVpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=728ca8506dff0f27e32a5994b68e9eea5c345e04 commit 728ca8506dff0f27e32a5994b68e9eea5c345e04 Author: Alexander V. Chernikov AuthorDate: 2022-10-31 17:11:53 +0000 Commit: Alexander V. Chernikov CommitDate: 2022-10-31 17:12:42 +0000 netlink: fix CTRL_CMD_GETFAMILY lookup/dumps. Reported by: bapt --- 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); }