From owner-dev-commits-src-branches@freebsd.org Sun Jul 18 00:36:30 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0D4D265F599; Sun, 18 Jul 2021 00:36:30 +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 4GS5d93tDSz4RL1; Sun, 18 Jul 2021 00:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 1A2241A1B3; Sun, 18 Jul 2021 00:36:27 +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 16I0aRwf049133; Sun, 18 Jul 2021 00:36:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16I0aQDB049132; Sun, 18 Jul 2021 00:36:26 GMT (envelope-from git) Date: Sun, 18 Jul 2021 00:36:26 GMT Message-Id: <202107180036.16I0aQDB049132@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 9af6ce636839 - stable/13 - LinuxKPI: add ether_addr_equal_unaligned() MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9af6ce636839faecaf2d6357370f8fc811c94775 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jul 2021 00:36:30 -0000 The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9af6ce636839faecaf2d6357370f8fc811c94775 commit 9af6ce636839faecaf2d6357370f8fc811c94775 Author: Bjoern A. Zeeb AuthorDate: 2021-05-24 18:09:37 +0000 Commit: Bjoern A. Zeeb CommitDate: 2021-07-18 00:35:01 +0000 LinuxKPI: add ether_addr_equal_unaligned() Replace the implementation for ether_addr_equal() with ether_addr_equal_unaligned() and add a define for ether_addr_equal() pointing to the now ether_addr_equal_unaligned() implementation. This way ether_addr_equal_unaligned() cannot be broken by accident [1]. Suggested by: emaste [1] Sponsored by: The FreeBSD Foundation Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D30425 (cherry picked from commit 834227ba6e80dc0899d2372ae8986241f5658c4e) --- sys/compat/linuxkpi/common/include/linux/etherdevice.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/etherdevice.h b/sys/compat/linuxkpi/common/include/linux/etherdevice.h index 392f395a5feb..9062cd562347 100644 --- a/sys/compat/linuxkpi/common/include/linux/etherdevice.h +++ b/sys/compat/linuxkpi/common/include/linux/etherdevice.h @@ -82,10 +82,11 @@ ether_addr_copy(u8 * dst, const u8 * src) } static inline bool -ether_addr_equal(const u8 *pa, const u8 *pb) +ether_addr_equal_unaligned(const u8 *pa, const u8 *pb) { return (memcmp(pa, pb, 6) == 0); } +#define ether_addr_equal(_pa, _pb) ether_addr_equal_unaligned(_pa, _pb) static inline bool ether_addr_equal_64bits(const u8 *pa, const u8 *pb)