From nobody Tue Oct 17 07:37:59 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 4S8m6c0mG6z4xC8Y; Tue, 17 Oct 2023 07:38:00 +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 4S8m6b6ZBVz4QJ5; Tue, 17 Oct 2023 07:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697528279; 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=LbJU/ng56S26ltxys9XUrRwMDoUq5pSTCqlJEDA4VvI=; b=FjYXxiujGou4BvVwwQiFxBmxOTcdcbFb4ryOsNtjrgtUUli7OQZM80UcLxRBs2z4+UFSnD 795wFAJdiRb30EP4nS6G8glVeojvnw3/4PHCWdZ4EaGIE3dnSTD0dkpTCuhQ+M12CUGdTS yf2hPLTvXq0KZ/9owlrrEO4eeXag1hn1HCUh9+3/xrq/6PCXBpNcQ9Je/ZvM37Te7/cq41 jdsMq2craJNmiH9eHZqqSVOSFkFRH9QfwLDv1u6o6ao3AS6ozLGlBpF7suGZh9rKnksC7F GGE/iUMoAGoRG5tfGnZknkQk6+zWqtyYmdWTuVjR8q4wpmbw09XpLRgnGdHTJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697528279; a=rsa-sha256; cv=none; b=nTogSR49mvhdDSID9QfJbY1TJ4bEB8nCpkm9HgLk7W4H0vY1wmITAjWpZHz6Am00A1P1KU AHO0YtLUhfyVa+nrcdTD3Tmew0Za5ozr6OpdK27N/5r/CkkJObEjxYl4j0lWfI7Ec+2In3 jSibqPmRuDgPNhL9eljcbBJHwCTEI4hkDyntLZgB6X8IDKffTjQT2NhVunZlnKFnDJv0ZC NxEoMeY+LhEMIYFkPYVk5Y0AGand9ZihhKSifmTITWlfZEXANTCcS36AQUPY1edrwtM1xr PXeOodrurBh+jZsGVnAtvn8tWS3O1nwQiYIPqvSebAUJj8yT0Zle3tQHW3b/TA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697528279; 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=LbJU/ng56S26ltxys9XUrRwMDoUq5pSTCqlJEDA4VvI=; b=cHJMv5bES7/MgJHOkTfKXFFn0/Yl+3itkQJxGlmXj8Nic9zSB7LzBbJqk8dDBzqayiHRiV vYzZ3Qhnhj8fGXkLvVbEQYZK2w0h2EkG7vvThGtXivdODfwQUPInJnWh2JSBXWOqbYNfgF 1g988RIqYQtYkch6t1DJ51CRJURX70wp6ZKHIySxCentXrlAvGuPuenw9ZbZ6Lz80t0r+o QwWVTibdBMzf4Fo6qMYW+MvKz0NTTN+Q2uzlJc/HFhOg953pHRQa7kzO8BKJvGzZQupOj/ TSDz7rGGpaxY1lS/JjrZRAeG4Y4VOslk2+O2bm9pBj2CxH/FS/lLwrGC+tsVaQ== 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 4S8m6b4xXlzS2; Tue, 17 Oct 2023 07:37:59 +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 39H7bxLi095265; Tue, 17 Oct 2023 07:37:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39H7bxoQ095262; Tue, 17 Oct 2023 07:37:59 GMT (envelope-from git) Date: Tue, 17 Oct 2023 07:37:59 GMT Message-Id: <202310170737.39H7bxoQ095262@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: fad5734995e3 - main - netlink: descend into nested parsers when verifying 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fad5734995e3fba428ce5e4131389c4fff0610ab Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=fad5734995e3fba428ce5e4131389c4fff0610ab commit fad5734995e3fba428ce5e4131389c4fff0610ab Author: Kristof Provost AuthorDate: 2023-10-14 12:47:35 +0000 Commit: Kristof Provost CommitDate: 2023-10-17 06:47:48 +0000 netlink: descend into nested parsers when verifying When we verify that the attributes are correctly sorted we should also try to verify the nested attribute parsers. Reviewed by: melifaro Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42222 --- sys/netlink/netlink_message_parser.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/netlink/netlink_message_parser.h b/sys/netlink/netlink_message_parser.h index 517f3ebd49f2..c682973d3e33 100644 --- a/sys/netlink/netlink_message_parser.h +++ b/sys/netlink/netlink_message_parser.h @@ -289,6 +289,14 @@ nl_verify_parsers(const struct nlhdr_parser **parser, int count) for (int j = 0; j < p->np_size; j++) { MPASS(p->np[j].type > attr_type); attr_type = p->np[j].type; + + /* Recurse into nested objects. */ + if (p->np[j].cb == nlattr_get_nested || + p->np[j].cb == nlattr_get_nested_ptr) { + const struct nlhdr_parser *np = + (const struct nlhdr_parser *)p->np[j].arg; + nl_verify_parsers(&np, 1); + } } } #endif