From nobody Mon Dec 02 10:37:39 2024 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 4Y20bl5nTWz5fX9S; Mon, 02 Dec 2024 10:37:39 +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 4Y20bl57zkz4QvV; Mon, 2 Dec 2024 10:37:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733135859; 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=g2V8uHT8BkP02SdzHvK6Y+QEMqO40akEPHRsXVR1CgM=; b=Q9xmhfMFc5rnedI4NVo7ABhqBGBuT20jqvxvPB1i4AEkLIKCtEz9rPDixKhmEOLK+y2it7 bAUiLzncYdZ956aixrsWqyT3ZcGALqdr08ryVnbLxXl9KKxahjybRaqOLzRacX0J3i4Ph1 DZxlr4kJMW28qTJt4X/QG+1Vt6ZnhnI7GxvZmpDK+HI50OzHcL8gIKEvsv0iokBjgn/ozN 0vxtAnkq1dbV2N9GwtHjpuZ9T/dil2SBA9lN/Q/SLAuCBMVVw7cuf9na4/1sWiZ/gtzl+i cHNgVK75jA9WKsaEBxvUrH+Jf1klZ6P8ZUTQEnzmZoZZJhkfPPx51FG6wkPW9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733135859; 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=g2V8uHT8BkP02SdzHvK6Y+QEMqO40akEPHRsXVR1CgM=; b=pNmermF/XCPVI1fA0MLXOwibV86dFeqQM/YqrBTRZgG2Ll324jUyAgkuC6CNEmbj46gKVc xcCmi+pvyr0EWmoncXQxxJxWCeG0EXQzCCno6SdeCV6hcFgf7lP9IoeAdA3GCVElP7SA5k uzCA31S89nh6xT6OhANb3V1VGoO0bv/u0FpN7h183xmzv3w5/KgUcEpCH4f5omcXieZ1U/ ZaB5Dr0nhJvmdRalC6ioGYrwP6QzCJzY0jTJ9DSU/Pq/GAvNaM0CssYf56x5SPIgDuzK3S Sy3zFbftwN0IpPCxlaWwJ1PH4slt8Z7j8cM4U05PAJ08huX07G69Ea/sPbti1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733135859; a=rsa-sha256; cv=none; b=w7Ku8VqBxtZ0/K3VdHRYOhE76eKIKD+XGCLGAiSnCsbdBNYLgTrlRvOs0xmOCnrTjD34lv rIig1ttBToDGEhnOfgrggVX256PCXYxS90magvRG5wEI491r+zJWra+Ir8RkgR4sPD53hL sdl1sdHBRTju/8Q8ggrFVr/ZpdxQOEVGahc0Iwv3cT27fco6odZ6ON7Yb4fB9y9+p9gL38 +2HUDBv/siLdjKmQ8kHf0MPElZ5iX5ZAq7zfmPHH+yobyj4oN2wgzaXOI/sc/3ddxuRMhp YmjDCvWYmX7nM2kUz08xuaxEf13ag+H2/FZNtuIkQfqSaAQi8FGuuHuAOBgtqQ== 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 4Y20bl4YP6zZ4v; Mon, 2 Dec 2024 10:37:39 +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 4B2AbdSn015515; Mon, 2 Dec 2024 10:37:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B2Abdkc015512; Mon, 2 Dec 2024 10:37:39 GMT (envelope-from git) Date: Mon, 2 Dec 2024 10:37:39 GMT Message-Id: <202412021037.4B2Abdkc015512@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: 447a1e6914fa - stable/13 - ipfw: fix order of memcpy arguments. 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: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 447a1e6914fa8ce26683246dab5ebfd210eba042 Auto-Submitted: auto-generated The branch stable/13 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=447a1e6914fa8ce26683246dab5ebfd210eba042 commit 447a1e6914fa8ce26683246dab5ebfd210eba042 Author: Andrey V. Elsukov AuthorDate: 2024-11-23 12:52:43 +0000 Commit: Andrey V. Elsukov CommitDate: 2024-12-02 10:36:48 +0000 ipfw: fix order of memcpy arguments. This fixes `ipfw table N lookup addr` command for MAC tables. (cherry picked from commit e012d79c9c732a6aef21066feba2e5e48833cca4) --- 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 f2ea1ddfc384..e1e45cb3d085 100644 --- a/sys/netpfil/ipfw/ip_fw_table_algo.c +++ b/sys/netpfil/ipfw/ip_fw_table_algo.c @@ -4314,7 +4314,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); }