From nobody Wed Feb 19 10:41:36 2025 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 4YyXxr6qSNz5p9lM; Wed, 19 Feb 2025 10:41:36 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YyXxr1lXBz3ljB; Wed, 19 Feb 2025 10:41:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739961696; 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=Qtty+asDCdc5+RK7b6af4RamnvDLhBTPRwuwsUZMPek=; b=b4h1mBguFP9H4FC2G+Q4XshKppU3HGXCvmHNh3KPQky1c7n4FaL+KLlaOX+7QuX6xRnS8p M120tzm2FDNK8LThb4hfR3hfg6cP3yeOWtu2ceZCgOFQP/CYOoY3WfQA5sDmB3sfzy5ohn fVyeav5c7swFQ4RbNPhAUyaW4Z02VGd8WIHItyzojC+B11GYlp0hQ8+UWQ3mCEGFzA+sAZ F1TntYBegieLRuPZhIkRts8//+Y8iFZAD7VKvWZnU+A3eHrVICrUqM42kZMlpQJTVuR8QX HHAYnec3ni7mK0ANtXiUQ9fRZZsBrrSf+tYDgpMvOjTPhM51sldiTD01JcJa/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739961696; a=rsa-sha256; cv=none; b=ejRC10mgm49JBWPwfKZzIuIsdXoTQEKWJlscO270eQS8txpRJjEAlve/8pMHJad9huZVs9 AJ5Ioc7WEkwzY5+albRCst2v6Vft8Tk08hJZAht/GHGwznCQPNiE0qp8pX7TykJGMAEO4x effCXk71M7O4GVNz3y9FmTzxxkbes5uoo/N8KxBYvWxFFpnMrq/KI18AQfO15kDT/hrQW/ fBYh20KC6BSPAvqYxrxsMt4uHmQ83n8Jpxvbnae3GfWXpQK7HNS2vjqI4FCsj1Ja8sZYiB wW7x1f2h22L999z+qDetta/fAP9wMXGX0T8eDIoE5z1hs9b9VB4V+mr3O7X9Zw== 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=1739961696; 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=Qtty+asDCdc5+RK7b6af4RamnvDLhBTPRwuwsUZMPek=; b=AZtbaDxawA2K7Tu8lsnNgSvLAQ385LVDJtUcgvBPKb+mhORMMjo3KXcZG3gX6FA9qD3uqk H09sOhZ6842F3uhMg/DmctwBosdDpyVTmB3Syirf3K/ZllhcPsLN+g+7fTV/r1IXRoTQyz XkIAq2RBYFTJbIwYSIi522gEmjFzVNjn8XJforittOVynCqkUfEuD2EZYrwQ0laezW0GFL 5It/0eoTRvjULpC9J4OHypepEX2onScVyHJihEDp4eHauE8v9wLp12ccQ9qGABTcbdh/IR lTbMM9h3UkSFikvLQelWGExLAVhOar7I2ZjzgVgvwkAXBJfCRDuYsXSzBWTUuQ== 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 4YyXxr19S0z12gZ; Wed, 19 Feb 2025 10:41:36 +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 51JAfapw035263; Wed, 19 Feb 2025 10:41:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51JAfahe035259; Wed, 19 Feb 2025 10:41:36 GMT (envelope-from git) Date: Wed, 19 Feb 2025 10:41:36 GMT Message-Id: <202502191041.51JAfahe035259@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: 9a1b591a862d - main - pf: bcopy -> memcpy 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 9a1b591a862dbb65231f8c8a6900957e3f99b686 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9a1b591a862dbb65231f8c8a6900957e3f99b686 commit 9a1b591a862dbb65231f8c8a6900957e3f99b686 Author: Kristof Provost AuthorDate: 2025-02-11 13:20:46 +0000 Commit: Kristof Provost CommitDate: 2025-02-19 10:41:08 +0000 pf: bcopy -> memcpy impossibility of overlaps verified. ok benno dlg Obtained from: OpenBSD, henning , 47d085d437 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 6 +++--- sys/netpfil/pf/pf_ioctl.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 5e5bd744343c..ea5687407881 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4043,7 +4043,7 @@ pf_build_tcp(const struct pf_krule *r, sa_family_t af, opt[0] = TCPOPT_MAXSEG; opt[1] = 4; HTONS(mss); - bcopy((caddr_t)&mss, (caddr_t)(opt + 2), 2); + memcpy((opt + 2), &mss, 2); } switch (af) { @@ -4998,7 +4998,7 @@ pf_get_mss(struct pf_pdesc *pd) --hlen; break; case TCPOPT_MAXSEG: - bcopy((caddr_t)(opt + 2), (caddr_t)&mss, 2); + memcpy(&mss, (opt + 2), 2); NTOHS(mss); /* FALLTHROUGH */ default: @@ -6061,7 +6061,7 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, s->rule = r; s->nat_rule = nr; s->anchor = a; - bcopy(match_rules, &s->match_rules, sizeof(s->match_rules)); + memcpy(&s->match_rules, match_rules, sizeof(s->match_rules)); memcpy(&s->act, &pd->act, sizeof(struct pf_rule_actions)); STATE_INC_COUNTERS(s); diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 6553981a1059..c8447b4e64b8 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -5733,7 +5733,7 @@ pf_state_export(struct pf_state_export *sp, struct pf_kstate *st) strlcpy(sp->ifname, st->kif->pfik_name, sizeof(sp->ifname)); strlcpy(sp->orig_ifname, st->orig_kif->pfik_name, sizeof(sp->orig_ifname)); - bcopy(&st->act.rt_addr, &sp->rt_addr, sizeof(sp->rt_addr)); + memcpy(&sp->rt_addr, &st->act.rt_addr, sizeof(sp->rt_addr)); sp->creation = htonl(time_uptime - (st->creation / 1000)); sp->expire = pf_state_expires(st); if (sp->expire <= time_uptime)