From nobody Sat Nov 23 12:57:26 2024 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 4XwX7C4nCKz5fSt4; Sat, 23 Nov 2024 12:57:27 +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 4XwX7C2v3Fz3xhs; Sat, 23 Nov 2024 12:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732366647; 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=1vnpEJEYIJSmd2deJNDjUX9Zo9PtnKKBfjAp9lqTkMc=; b=pMGFRo8SPb951IGMUJG1INvZWqc8RJGcHYlOTKFixI5HAf/665iuzj07/Esboczl7yHb01 5EIxU8d/Q9NLbGUDy+anufvVAB/LUSqKYMbZDloBbC1rxoFlf90tQT+YO4PVcH1CoYczmh 76hHRguil4j5rlz+RyViHeOcPUUNsJxlM2GnUHJHbQCXJSpFsjzzVhN18u+w2Dc8dhAQ+A F4f0TS/6Oj8zD52TV1k78ApK5L3j6MDLWW0yc7kYRdJs4TWe0kxj9blUq7PMXxpO3/gTk8 MEG9gc9kVeaNWI+eEsvJdu+fc3sV+r9/+mASZ+UmYj5tejq+iTLrNi00NAEMnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732366647; 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=1vnpEJEYIJSmd2deJNDjUX9Zo9PtnKKBfjAp9lqTkMc=; b=sDpfv/t6DnXz5AfS6t3urJOZx3RP+vJCnSL8amplrX7NPZjee8suligMAjdcxcRJ4OzyqO yicJLSq4a1m8wCOLU6vqvml1n8SBjWHqckQPCAT5szQsLo9gPeqU80CMhmNA6qvY0jtJ91 Y6HG7yUcvD94v+V5BgNuq0gJRKLlVasfqGVWReXvu/zkO+41fprcprR/T2lZtpcElBB3LL zk/xJBWp4dUjbNRwMh+zClhu1m7fZNRI0PlHmIieb0lkaKNYbHHjQPX1M31txsBdOUNoi1 svHAoiZaLuplRFkMjj2Dd6q2PmPK3qX0pGeZ7ehUAyeaq1YOaarz93JDq2+OVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732366647; a=rsa-sha256; cv=none; b=oqbjDV8mrpyUaiznOBQ98wxT5J+zCWOcm/f23bkGX7hWklgTR4xGMX9mXdm4ESqbXAlB8V pRTybeHz0v9IA+XT1sbN8bHYQyFCuTFyRUn4qhFauXtEnu5ACGFKYHBaE/XJX1sqIqH3dn 8iGodH5GjiWhxvppELqlPTlysl+y19zi7fWCyK0PAN4+zEb4wrDKQx9sFYMEpRybYPLttv TisVzunCix/Zs/ab+ukp9pNTdFFZdGL0+igNJRJDuzIpxFnpn8Co88+ivqobWzYz96Tu7J bbbKg5PcRuM2Ys+RapZpRpczTTcQu2qurMUnPu1QAWEwL73ssx5DeI5fjQ9LMw== 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 4XwX7C0xDKz18Gd; Sat, 23 Nov 2024 12:57:27 +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 4ANCvQJ5023218; Sat, 23 Nov 2024 12:57:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ANCvQqo023215; Sat, 23 Nov 2024 12:57:26 GMT (envelope-from git) Date: Sat, 23 Nov 2024 12:57:26 GMT Message-Id: <202411231257.4ANCvQqo023215@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: e012d79c9c73 - main - ipfw: fix order of memcpy arguments. 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: ae X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e012d79c9c732a6aef21066feba2e5e48833cca4 Auto-Submitted: auto-generated The branch main has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=e012d79c9c732a6aef21066feba2e5e48833cca4 commit e012d79c9c732a6aef21066feba2e5e48833cca4 Author: Andrey V. Elsukov AuthorDate: 2024-11-23 12:52:43 +0000 Commit: Andrey V. Elsukov CommitDate: 2024-11-23 12:52:43 +0000 ipfw: fix order of memcpy arguments. This fixes `ipfw table N lookup addr` command for MAC tables. MFC after: 1 week --- sys/netpfil/ipfw/ip_fw_table_algo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfw/ip_fw_table_algo.c b/sys/netpfil/ipfw/ip_fw_table_algo.c index 89e6b69bc3ad..ccc1a8098585 100644 --- a/sys/netpfil/ipfw/ip_fw_table_algo.c +++ b/sys/netpfil/ipfw/ip_fw_table_algo.c @@ -4306,7 +4306,7 @@ ta_find_mac_radix_tentry(void *ta_state, struct table_info *ti, if (tent->subtype == AF_LINK) { struct sa_mac sa; KEY_LEN(sa) = KEY_LEN_MAC; - memcpy(tent->k.mac, sa.mac_addr.octet, ETHER_ADDR_LEN); + memcpy(sa.mac_addr.octet, tent->k.mac, ETHER_ADDR_LEN); rnh = (struct radix_node_head *)ti->state; e = rnh->rnh_matchaddr(&sa, &rnh->rh); }