From nobody Sun Feb 18 21:11:22 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 4TdJHv2hHrz5BmRW; Sun, 18 Feb 2024 21:11:23 +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 4TdJHt6rp6z42gZ; Sun, 18 Feb 2024 21:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708290683; 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=dh9bTpc5A90EZ5f+olyvAc0YlGtpD5+cxIiqJY34H2c=; b=Gmly9YMYhN+//fcPCxHeA46WKgB7ppi8c5wJJdLBFD9jc8zk4q18eqFBe9awkulJe9V3NA mmU5moLV9+xMIwxMIaPbCo4Yy86RC76m9dBwQTBEj8FLr2xyRige4BhSJiZ3iq2xNtk2Fw nm9PqlG7VX2tk7kPRjb2VQig1STYp4BPKB3i7CLvzFQaxFEWZCt3crNcnzNXG6ui5AfT47 xZNSsbFPPKm2HvGtNpDM47YptEzeyPg9FDHgR0zSScFOaBBZm33IuFrjhODHofxble42W6 EGnM6VlBpTqU1p/zPSKxylmVLEQL4Z8rLXxpEEzOtH+UxbHtKxnzfgfkhGzrJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708290683; 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=dh9bTpc5A90EZ5f+olyvAc0YlGtpD5+cxIiqJY34H2c=; b=CZiSGyf+e+KM/S2YOI1XyXn/A4WNCBQmIb7yDAL1mlezIv3sUw3pe5FtY/eVHUzoAvfdb0 1y48ohpFdnImiOood18xgELe1jvShMQUF8oKnQzFPYPClRZ8AXDB+ZIfX8TQfNMDm/p5EM W7RZ+ZJAscwLY4CSK99LMyUx5RVPusl53pItrNpanh3WSFW3OdLsMae3ej6Unr/zksT9AO trnmi0CpueXuxCPRYe7kd9igp08+0N6xakEL4GkjAarv3hJcjutHoVh3TJvBiQ1A/yOXPL bUJGcJZHsBpFxMN9btBPM7SgpPYcFcvWq1beuMjkXZmFCkTNQa1Q+yYjA3nXdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708290683; a=rsa-sha256; cv=none; b=ItJC0+lST1gNQhwRUEvRGYGCdVX0ClOpIB9X3HfExBAICIR/DdP+u/cj4rUoRzi01iWpPj qsuxBakqhybRYL/NEapXAq7TDYYO0fDta9yaa77+P7TiMr7zdv71cwq5QBDMtFGe0sFLlh GPZc/t1CdOn4O/PznTK3zQ7YU8dHFBA8l3HW4WeOZZh/edpDRJk2x8iv6UMDsfs61It6Ol 0AaFrZdT9RlxDAcYbV1trQResiH6LWGspMMJBD9ras49UOWyYQJvwWLu8ufBh6anQC2A4q REGf6/CflMFhevBNH9aKAar9tezo3CrEAphzW35ggf+NPAaa8UmOsXnPbXgk6A== 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 4TdJHt5yH3z16Z3; Sun, 18 Feb 2024 21:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41ILBMt9015675; Sun, 18 Feb 2024 21:11:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41ILBMUq015672; Sun, 18 Feb 2024 21:11:22 GMT (envelope-from git) Date: Sun, 18 Feb 2024 21:11:22 GMT Message-Id: <202402182111.41ILBMUq015672@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: 46c1c9fafac2 - stable/14 - LinuxKPI: 802.11: fix field order in ieee80211_key_conf 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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/14 X-Git-Reftype: branch X-Git-Commit: 46c1c9fafac25e1fcb41afecd2143c1e023ff8a0 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=46c1c9fafac25e1fcb41afecd2143c1e023ff8a0 commit 46c1c9fafac25e1fcb41afecd2143c1e023ff8a0 Author: Bjoern A. Zeeb AuthorDate: 2024-01-28 00:51:23 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-18 18:31:15 +0000 LinuxKPI: 802.11: fix field order in ieee80211_key_conf When adding the new field link_id to struct ieee80211_key_conf, it was erroneously placed at the end of the struct; the zero-length (variable sized) array for the key always needs to stay last. Resort fields and add hopefully helpful comment to avoid the problem in the future. Fixes: adff403fe7a87 Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43635 (cherry picked from commit 828ce22f079df77b3bf52c4cf296959ea66bdc11) --- sys/compat/linuxkpi/common/include/net/mac80211.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index c4d001b3a7e8..293b6868cd50 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -510,9 +510,9 @@ struct ieee80211_key_conf { uint8_t hw_key_idx; /* Set by drv. */ uint8_t keyidx; uint16_t flags; - uint8_t keylen; - uint8_t key[0]; int8_t link_id; /* signed! */ + uint8_t keylen; + uint8_t key[0]; /* Must stay last! */ }; struct ieee80211_key_seq {