From nobody Mon Dec 02 10:23:31 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 4Y20HR5Dvxz5fW31; Mon, 02 Dec 2024 10:23:31 +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 4Y20HR4Vqwz4Nmg; Mon, 2 Dec 2024 10:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733135011; 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=1bugkkKYl+XOPXd1fXgbd7sWjCJYP1Vlbxe3/zZXfck=; b=LSH9NKIz9qlrzM4t4XpuUa77zTHNzQflSYe26yh7tZLCvN/R6ll5FGRbq5YV9ns6RWsvQN WL5/m9qt3ujnX/JHn4XlyUAH1yYEd83SIWpexR6pkbk/LnqhDhVHfqNOfjjyoA6duv2YuR keeTsHz/178GdekE3yR3idzYYnyMyKwP5gYecpdaM3zPZJlFdAB4eHCEnl5UNJ7GWwTIYg 33FDSrJ97qy0R/8UZPxa0zQcgkxxJLJKA75MqFkWNKaQocL/Pee60nUgNZSEfDPmkGXmof J3HlSTfggk411TMf8W6czJpIdtB/t8Ypm9wRyTaipDhFZWy83aqggUMc7JVBhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733135011; 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=1bugkkKYl+XOPXd1fXgbd7sWjCJYP1Vlbxe3/zZXfck=; b=Kgp/ruaBaA3yQgUbuhfHlfUM8Tt9fO6eabEzDyjwMsUmXIsqGysLV/0yjASzNRdu0NIDO6 mWV45ZTtC7wVgoKTsi+M00flrLA03Ty1UKbcNJItx5/WuPehzgs9Bm4K4T7uP9nKZuuFww KqikPPruAElc7mBcxqgco9InFHmnQoC0Ebf0T69+Yz0qJubQJ5bkjfAgkmdTLPsgN+tq5q XQMupDWDNv7mpsBWpbt8z1TeuiqA6/grW5YzR5HPetrxelKdB6gfcgkTzdMS2+LQDY0yAE uCENzlVTjd+5BUUU9TqF1gFl0ChWJ0i5JkpH5HKVR7lXbYUWxL0B7pdYM7skag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733135011; a=rsa-sha256; cv=none; b=kqA9p6outNxTd+qp/5bv1f2RdkrQ8nL3GfjtyiEc17RoL0rHIhfP5p/AsX56kMSDXSHXeB Da8hPu7DvqaHmJtwYGJ4RETnzWIj4wnZMaZN9em2Kp2N3bigAB2SWlcZ0xwl2TakJDIFDJ 7jvDmsWBcUXNSVUUYmmNv4Y71U0EVOOvbyzK5hYiuxULn1BhyqGlGulXMkCEYAlyPv1OG7 Z3aCaUHmgl41iUH40dpOm4S7dg/QqmD8T3wneGDDsqiWEO7AkgHVlJlahsrZSlc56nEOV9 8ApFSsWDzweQQmYJonGxuMctsE2wY9QxOpO5y01cPsaHUpCfk3DAovrrYNRxRg== 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 4Y20HR3bQwzZ48; Mon, 2 Dec 2024 10:23:31 +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 4B2ANVJd096020; Mon, 2 Dec 2024 10:23:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B2ANVg4096017; Mon, 2 Dec 2024 10:23:31 GMT (envelope-from git) Date: Mon, 2 Dec 2024 10:23:31 GMT Message-Id: <202412021023.4B2ANVg4096017@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: a731e69eebc3 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: a731e69eebc3914ea8787ea84a7cdd1a0db3ab3c Auto-Submitted: auto-generated The branch stable/14 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=a731e69eebc3914ea8787ea84a7cdd1a0db3ab3c commit a731e69eebc3914ea8787ea84a7cdd1a0db3ab3c Author: Andrey V. Elsukov AuthorDate: 2024-11-23 12:52:43 +0000 Commit: Andrey V. Elsukov CommitDate: 2024-12-02 10:22:36 +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 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); }