From nobody Wed Nov 1 09:06:07 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 4SL1MN091Qz503lZ; Wed, 1 Nov 2023 09:06: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 4SL1MM6JfDz3KVY; Wed, 1 Nov 2023 09:06:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698829567; 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=HZFvrvRm1dS7oAq++GjOIORBwEffM8euT3KH4SYL/E4=; b=ZWdKP5jo9gv7J47LbKJ9gazYb5yH1V/Kq0E36RGX+KLzkzLpPgK+pPGwFTsbjxdXFTxeEI JKsG1poFi+Ap5TFxC9hss6j3n2VFurcgwnMdLml7bzJzLRJHYY/OZihwB0MljjkAvMVwNc JseWPKSxd1HRU5mm+WO5b1IUh89aZfnJ0u2nkDEVqnyiQqoW69Q4hjxQz1Ojm1UX8yx+Jk kKGlnp8Uo4rtZno9y2sQ347oWfm+t8wUAabQGvaXzgKTf75oJJogIEj4vmR3DpjzVlqeaZ Qb9tJ/PlAZ/rKMWFLL+bG+3y0VK2dSzYOzV7cRPCkWt4obkmYk/mB8xAJJYZxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698829567; 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=HZFvrvRm1dS7oAq++GjOIORBwEffM8euT3KH4SYL/E4=; b=c3hkLCuQInSsrB9GbC04YLdfAsCQT9vI3CZqU0c+EZx+fBDt3lIeaEMJro8co5cBgoTFyG ybiw5HUpLDlLfxOUwQXXkTpSklzYf/Ow/DbXRmg+fSFXAtOWMsIyv2N7BiS3H6s9hXOlnH owvkTyMroUecAIQEMukSgqhKs8HlcBEMSw0Hn7lVJ0dYGQLORHeKG6zYZX0/mkCRym1SLk 9/+CMTvBlIUYLrFd6Z4B2KHsgwjWP4wldruToqeZmHs+wrQWBDKn/LnD84bftys9DyGlkE ysjRMLYQmSwLPOH0acCDemwoBaeR+VLbdD+L3qUEiohwR0NjiCHgDm0U44xSaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698829567; a=rsa-sha256; cv=none; b=RbjDyNqY5pf0z4TAIKB1t5p9VPDxxtYJ1I8Ahgp2j40zQXKeMTceAnJsRCq2y8SeqdD7Lt f2Le2NeMv7ZQd8WRlPLVA52hJWFlTz8Lk74DkVdCPjK3DTh9iyFQc+RQUdSX/nrEX+IM19 zJAbAv3hQIrTKPZohESd/upvVgXe36AG7/kBYzuggrya2U2wMWCIgHqLhjQU0vk5hrT7VW 3OHxyb+SVarrN0zV6M0voJ5F1DffCWF5zrKdPuySivc5veIw+x87aCnU6Ft1szH4i2N89P 7XV0fKlyyvYegx3d117ya40HXeb3YsCqXmpiKhT8vCdFHrDtCa1UefTK3hYeQw== 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 4SL1MM5NctzgRf; Wed, 1 Nov 2023 09:06:07 +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 3A19678K065173; Wed, 1 Nov 2023 09:06:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A1967lB065170; Wed, 1 Nov 2023 09:06:07 GMT (envelope-from git) Date: Wed, 1 Nov 2023 09:06:07 GMT Message-Id: <202311010906.3A1967lB065170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 275078f17251 - stable/14 - libpfctl: fix Coverity issues 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 275078f1725179371dd53c7abac1850b98dac1a0 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=275078f1725179371dd53c7abac1850b98dac1a0 commit 275078f1725179371dd53c7abac1850b98dac1a0 Author: Kristof Provost AuthorDate: 2023-10-23 11:46:11 +0000 Commit: Kristof Provost CommitDate: 2023-11-01 09:05:49 +0000 libpfctl: fix Coverity issues - handle snl_finalize_msg() returning NULL - insert the correct data into the states list - add missing nvlist_destroy() - incorrect order for array bounds Coverity: 1522929, 1522925, 1522923, 1522921, 1522780, 1522770, 1522764, 1487785, 1471250 Reviewed by: emaste MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42330 (cherry picked from commit 4abc3b482e0d246cd3518622223795c8de102130) --- lib/libpfctl/libpfctl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index d5347a7f8a84..2bdc14e8868a 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -758,6 +758,8 @@ pfctl_get_eth_ruleset(int dev, const char *path, int nr, strlcpy(ri->name, nvlist_get_string(nvl, "name"), PF_ANCHOR_NAME_SIZE); + nvlist_destroy(nvl); + return (0); } @@ -856,8 +858,8 @@ pfctl_add_eth_rule(int dev, const struct pfctl_eth_rule *r, const char *anchor, pfctl_nv_add_rule_addr(nvl, "ipdst", &r->ipdst); labelcount = 0; - while (r->label[labelcount][0] != 0 && - labelcount < PF_RULE_MAX_LABEL_COUNT) { + while (labelcount < PF_RULE_MAX_LABEL_COUNT && + r->label[labelcount][0] != 0) { nvlist_append_string_array(nvl, "labels", r->label[labelcount]); labelcount++;