From nobody Wed Jul 9 08:59:03 2025 X-Original-To: dev-commits-src-main@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 4bcX2w02Fkz61N2X; Wed, 09 Jul 2025 08:59:04 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bcX2v2Yb4z3cL9; Wed, 09 Jul 2025 08:59:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752051543; 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=oCoEQHr4+pueIBjdMNV1BVCGiJd+iSJNqevsgIjFCjw=; b=H9L0N1mNfpTNVKACKS68qiaxJb4XuhhJDuCmgR61yN5Wrre838ZroEaAN24sxz2ZNX4iqb vLNwi6XfzdhrZ0HuTmLCZbOpSGysr49rjXPPPfKPokj3OYa2RddnX3CzR2GLvbTUu2AnPT TOYHFy6oV8fAUnf0laU7bZYR4BxcWuIE54bkSn9tcCfFt2pIbldARy0j8vrTD826URX/7a bXgRhMlosjiRIeeihaQe+EnDsLJn9ErJRyiq76tnysJ0zNK0XflD5d8nvhqgcC9tPtmfbX VSfu0BBVH3xZ1dyacq/GZg/RQ0+W7mEXTKJQ1FMb/P3+so3uckY58j2csEAbfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752051543; 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=oCoEQHr4+pueIBjdMNV1BVCGiJd+iSJNqevsgIjFCjw=; b=q9YqcBSllzM8EjHKlUsajU03GDdVduoWJiBtQaDqZO+ZRHsS/v2U0m9f2SURDe4PKKdQYO LeYcKU+15mMIFUky5bd3hf3KnpVwWsWkf5tN8japSMBaV4XriTcmRYMaVAJ63ppd1PuuOr cEbsZjAyyaABANV/A33scOGkorldRi/JWFLE1dsekIVpyDBF7vtiLN8Vc2EsScQYp/ln8f wsTGpPopyhClkeLdSOW4HZ5soKVRQbthb7yZQtFfGxtlPnVPpyvIz+EGQuzRFf4VVgjUvt Foarc3lL1ZSOwh5r6+RrrC8S8uZzPmuWRBKgYs/IW2RBdY4+UGWTutgyr+mW4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752051543; a=rsa-sha256; cv=none; b=X9SjEmIOfXocJFxtF9h871otkFhbtaGJzD+ru18jZjQkQtTARwoKAmpDAE3VyuXt4Yo4dN yM0pRXkrcJ6pPuRUeZqpKbyS0qjWqV3cFP8Kb+iJmybkYOyW5X1FhYKanu43rqnUqlJN7h 6nW5wUKetpH6M2WDUnXdWCCciYuW0flPbWmLvwzoUO+zxu2/tXPZH9lNuj/RCbcfxmp/PO UpcuPAxVl5uEn4N28ookmnOiVRx1OAz5tZScrrDWTMZtDKQWvC4LkKyeCQQ/FKrJj8qIXG tRc4jcHikzdRG5fBTgM9zMcJNCwfdX7dwcFPKSTviN2hypc6NjtWqwSmLOqOlw== 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 4bcX2v1clBz1GH; Wed, 09 Jul 2025 08:59:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5698x3kn044857; Wed, 9 Jul 2025 08:59:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5698x3gw044854; Wed, 9 Jul 2025 08:59:03 GMT (envelope-from git) Date: Wed, 9 Jul 2025 08:59:03 GMT Message-Id: <202507090859.5698x3gw044854@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: 4869cc8e545d - main - pf: Use proper NUL byte not zero with strings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 4869cc8e545d795fa1274b06aa3bcc43db20ef33 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4869cc8e545d795fa1274b06aa3bcc43db20ef33 commit 4869cc8e545d795fa1274b06aa3bcc43db20ef33 Author: Kristof Provost AuthorDate: 2025-07-03 12:13:08 +0000 Commit: Kristof Provost CommitDate: 2025-07-09 08:57:48 +0000 pf: Use proper NUL byte not zero with strings No object change OK sashan Obtained from: OpenBSD, kn , ad87be15a4 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_ioctl.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 357b2be194a5..9cd7cea340a6 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -2699,7 +2699,7 @@ pf_ioctl_get_addr(struct pf_nl_pooladdr *pp) PF_RULES_RLOCK_TRACKER; - pp->anchor[sizeof(pp->anchor) - 1] = 0; + pp->anchor[sizeof(pp->anchor) - 1] = '\0'; PF_RULES_RLOCK(); pool = pf_get_kpool(pp->anchor, pp->ticket, pp->r_action, @@ -2732,7 +2732,7 @@ pf_ioctl_get_rulesets(struct pfioc_ruleset *pr) PF_RULES_RLOCK_TRACKER; - pr->path[sizeof(pr->path) - 1] = 0; + pr->path[sizeof(pr->path) - 1] = '\0'; PF_RULES_RLOCK(); if ((ruleset = pf_find_kruleset(pr->path)) == NULL) { @@ -2771,7 +2771,7 @@ pf_ioctl_get_ruleset(struct pfioc_ruleset *pr) return (ENOENT); } - pr->name[0] = 0; + pr->name[0] = '\0'; if (ruleset == &pf_main_ruleset) { /* XXX kludge for pf_main_ruleset */ RB_FOREACH(anchor, pf_kanchor_global, &V_pf_anchors) @@ -3502,7 +3502,7 @@ DIOCADDRULENV_error: break; } - pr->anchor[sizeof(pr->anchor) - 1] = 0; + pr->anchor[sizeof(pr->anchor) - 1] = '\0'; /* Frees rule on error */ error = pf_ioctl_addrule(rule, pr->ticket, pr->pool_ticket, @@ -3514,7 +3514,7 @@ DIOCADDRULENV_error: case DIOCGETRULES: { struct pfioc_rule *pr = (struct pfioc_rule *)addr; - pr->anchor[sizeof(pr->anchor) - 1] = 0; + pr->anchor[sizeof(pr->anchor) - 1] = '\0'; error = pf_ioctl_getrules(pr); @@ -3653,7 +3653,7 @@ DIOCGETRULENV_error: u_int32_t nr = 0; int rs_num; - pcr->anchor[sizeof(pcr->anchor) - 1] = 0; + pcr->anchor[sizeof(pcr->anchor) - 1] = '\0'; if (pcr->action < PF_CHANGE_ADD_HEAD || pcr->action > PF_CHANGE_GET_TICKET) { @@ -4498,7 +4498,7 @@ DIOCGETSTATESV2_full: struct pf_kruleset *ruleset; struct pfi_kkif *kif = NULL; - pca->anchor[sizeof(pca->anchor) - 1] = 0; + pca->anchor[sizeof(pca->anchor) - 1] = '\0'; if (pca->action < PF_CHANGE_ADD_HEAD || pca->action > PF_CHANGE_REMOVE) { @@ -4629,7 +4629,7 @@ DIOCCHANGEADDR_error: case DIOCGETRULESETS: { struct pfioc_ruleset *pr = (struct pfioc_ruleset *)addr; - pr->path[sizeof(pr->path) - 1] = 0; + pr->path[sizeof(pr->path) - 1] = '\0'; error = pf_ioctl_get_rulesets(pr); break; @@ -4638,7 +4638,7 @@ DIOCCHANGEADDR_error: case DIOCGETRULESET: { struct pfioc_ruleset *pr = (struct pfioc_ruleset *)addr; - pr->path[sizeof(pr->path) - 1] = 0; + pr->path[sizeof(pr->path) - 1] = '\0'; error = pf_ioctl_get_ruleset(pr); break; @@ -5362,7 +5362,7 @@ DIOCCHANGEADDR_error: PF_RULES_WLOCK(); /* First makes sure everything will succeed. */ for (i = 0, ioe = ioes; i < io->size; i++, ioe++) { - ioe->anchor[sizeof(ioe->anchor) - 1] = 0; + ioe->anchor[sizeof(ioe->anchor) - 1] = '\0'; switch (ioe->rs_num) { case PF_RULESET_ETH: ers = pf_find_keth_ruleset(ioe->anchor);