From nobody Sun Aug 28 23:17:21 2022 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 4MG8c137Lmz4ZdYf; Sun, 28 Aug 2022 23:17:21 +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 4MG8c12fJhz43Dx; Sun, 28 Aug 2022 23:17:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661728641; 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=bDZNEYcZYb/ndQ01LHfwf4BoYsdY4q2659Pg1pNfse4=; b=rXvV7pU08AoI22lDwyBtxuY59Sl0RxHqSVfc/EsnymkYNAkbyaIb8Dbm+x/RZbU6GcJhX2 MKBTzN1pKk/kElTaqvqk1Tvrk+0FciJd2vlU0av2CghFcr4mozdncaDnXTrnu/JqLyTLM9 4QE/2kzPKuFpEHWyN7fr9CiWACh/2UdsG/JGUOO84lInzCOZBvGy6vlyWv5b+0tIh2OGDA xka3M3CNEzC9d1SzGOhFBZTwTnOz27AQFI+Wmwd0BwsPgwT2zRshNYgh5EOApH8Jn0NkWI 3kA1I5VAKGg0UJAWw4iAp5IvnibnYT0TBpUYFQrT7IK9wkKpS/AiOu78iqt3aw== 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 4MG8c11S5mzFTB; Sun, 28 Aug 2022 23:17:21 +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 27SNHLbJ083460; Sun, 28 Aug 2022 23:17:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27SNHL5b083459; Sun, 28 Aug 2022 23:17:21 GMT (envelope-from git) Date: Sun, 28 Aug 2022 23:17:21 GMT Message-Id: <202208282317.27SNHL5b083459@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 7468304f7b9f - stable/13 - pf: Reduce diffs against OpenBSD in pf_if.c 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7468304f7b9fe2112f45696258f9b0567666cfcc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661728641; 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=bDZNEYcZYb/ndQ01LHfwf4BoYsdY4q2659Pg1pNfse4=; b=Dw2/ox/sxVoW7LRwl6Fj5S6Fci1iMDm7/uz/cI0ftzRuNMbCr322Q5H9ZqzM8pQApvziw2 lKO+vyDZ9cXjWqh3flqyoLbScYyGe4PP9q0UxjlMJiepdCWeizANyFBd6sYD3Sl7ugd3DL m2dW38EPOKXEf5iyoYhESKPAmAwTufFkMDCPMXEzzlX88P0ziXJrxzatHtvIKzQrXmAvqm 68Sv7wS6o9ov6+E2/5o3ZO9rr+ebHgzamvsuwh7tDTZHJfA4JhKfMUstFmCoDKgHGPbLwA fqzS8VBK+MpxX7+f6DuWv4aaLpAfT9n3DkGYZgBRBdRg3d6ZT2irGmotqAA/vg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661728641; a=rsa-sha256; cv=none; b=YWGdNL2uk6rRwKRE74HTcrb6DYurS916bX57d7ZbJtv1QZWwc5ENANAnL2MFQcXG/QptpE r2d4BOCkrpYGWVmwfS+NSbOmOsSxwSc7MOzJYzhIs8sF8cG7wgYN++Lmgb4DlAPoAf1QP/ L34vSe0iWYkFoRibqd3cU1sbg98L/POyNqM6wqGyV3uBd3GLUVjCH68lbgHASJNgsReIdL iBL6Ae5qJ8ofemVnJpK5QgrKmVuJIaZ1RwW3tAdHjIXoYu/AvEKjt+ciB6egE6bTvblIU7 mGGHKgBS+F7HwCaWZ9uJp/s8MPnCgTB70cWCziCMxv8mZppBNV+05hPjxYaYCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7468304f7b9fe2112f45696258f9b0567666cfcc commit 7468304f7b9fe2112f45696258f9b0567666cfcc Author: Ed Maste AuthorDate: 2022-08-19 21:02:26 +0000 Commit: Ed Maste CommitDate: 2022-08-28 23:16:19 +0000 pf: Reduce diffs against OpenBSD in pf_if.c Use memset instead of bzero, memcpy instead of bcopy, and add some optional {}s. Reviewed by: kp MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D36267 (cherry picked from commit 6b598e263bebaf6664b64f80f029a6ebcfc2848d) --- sys/netpfil/pf/pf_if.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sys/netpfil/pf/pf_if.c b/sys/netpfil/pf/pf_if.c index 02c46db409b6..f572d80c219f 100644 --- a/sys/netpfil/pf/pf_if.c +++ b/sys/netpfil/pf/pf_if.c @@ -319,7 +319,7 @@ pfi_kkif_find(const char *kif_name) PF_RULES_ASSERT(); - bzero(&s, sizeof(s)); + memset(&s, 0, sizeof(s)); strlcpy(s.pfik_name, kif_name, sizeof(s.pfik_name)); return (RB_FIND(pfi_ifhead, &V_pfi_ifs, (struct pfi_kkif *)&s)); @@ -746,7 +746,7 @@ pfi_address_add(struct sockaddr *sa, int af, int net) if (af == AF_INET && net > 32) net = 128; p = V_pfi_buffer + V_pfi_buffer_cnt++; - bzero(p, sizeof(*p)); + memset(p, 0, sizeof(*p)); p->pfra_af = af; p->pfra_net = net; if (af == AF_INET) @@ -804,21 +804,22 @@ pfi_update_status(const char *name, struct pf_status *pfs) int i, j, k; if (pfs) { - bzero(pfs->pcounters, sizeof(pfs->pcounters)); - bzero(pfs->bcounters, sizeof(pfs->bcounters)); + memset(pfs->pcounters, 0, sizeof(pfs->pcounters)); + memset(pfs->bcounters, 0, sizeof(pfs->bcounters)); } strlcpy(key.pfik_name, name, sizeof(key.pfik_name)); p = RB_FIND(pfi_ifhead, &V_pfi_ifs, (struct pfi_kkif *)&key); - if (p == NULL) + if (p == NULL) { return; + } if (p->pfik_group != NULL) { - bcopy(&p->pfik_group->ifg_members, &ifg_members, + memcpy(&ifg_members, &p->pfik_group->ifg_members, sizeof(ifg_members)); } else { /* build a temporary list for p only */ - bzero(&p_member, sizeof(p_member)); + memset(&p_member, 0, sizeof(p_member)); p_member.ifgm_ifp = p->pfik_ifp; CK_STAILQ_INIT(&ifg_members); CK_STAILQ_INSERT_TAIL(&ifg_members, &p_member, ifgm_next); @@ -848,7 +849,7 @@ static void pf_kkif_to_kif(struct pfi_kkif *kkif, struct pfi_kif *kif) { - bzero(kif, sizeof(*kif)); + memset(kif, 0, sizeof(*kif)); strlcpy(kif->pfik_name, kkif->pfik_name, sizeof(kif->pfik_name)); for (int i = 0; i < 2; i++) { for (int j = 0; j < 2; j++) {