From nobody Mon Feb 19 08:07:51 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 4TdZsN1h6kz5B307; Mon, 19 Feb 2024 08:07:52 +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 4TdZsM4WxWz4KMH; Mon, 19 Feb 2024 08:07:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708330071; 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=YTrewU6YoIjBtwLXPAUSRLhpppAIoxm5hLOkASn6fco=; b=Lvm48jaVxNK8v1nn3BBlRZY618dZLtxYlTdi+lxpKaWGs2vnQJ5ic3eXjr03iKM/sroLok JP5PO/y6kOGepODBMRvpbrdQ58txcMfzNG32IRsvNNE5FeY0Hg4wAD3Frk+7kop5D1ObXX +JW75SCz/8qG4yYmZK/t5r0NPehyfErklKvlgZN80IOFrAhuBAEOjfvtMbfBRMdZs55sWG HHe9wDXfivs7EX+Bey4SiVT+S/mXNE3A3pgbUIQhf8JRqRnSQlzNw6NlHL33GZ1+e7p/ZT v1rj3kAU9FIktGZyfuMN5M4NTXIiaNZ8XiPcEtzsYA3JNmiCfTlPrxfAhAvu4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708330071; 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=YTrewU6YoIjBtwLXPAUSRLhpppAIoxm5hLOkASn6fco=; b=GaatdkqNbEBvpI3QzfA65xPyru2mRyawjSm/rGGXvOWMOxOLNKrEgjrfMsF2vmV2Vx1fbm wyR3LczTBreIJgmzmmPXuH04lo7LtzgTfKEBbPT803vfBstzF/ghDu3L6Ymp9297a7svhv G7uOHEWzL/MYE650vQ5QQGCjYXOwQ8Q6Uj685L5SZbxaA+6rM/XMaoe9BJuRqQZ+LVFHFU pWSBv+m0jyp3yxXuDkQsj5bIw2vIfD3xOLj7ZI+IE7sKfvRO24j1KY9jdO+M5/9zEOV9e+ iYKWCiIOU2lMXltZGt/XWIyeOepCqXqqZeXHWEthl8Y9Ysam96GD1SxyLTcQYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708330071; a=rsa-sha256; cv=none; b=xXEG4N4W0bIf8fRgNOGdEOCwX5XzmwXF68RjWFkyR1XDNBFjmSEX1nNw1TZlRo6yUFR/3z sRJYf0u/HomJu7xt/vByeBfKiFQ+th8bjNlMWXDhdOcwQ3uFeHtXQ8L6DK+3E24605IKH0 xlEM9HDLj1MnO5kSUTZ2kgxib93TZGqVaU41MqImg85ES9lHj/3ae/IqZjz+oVF6cqs9ov C3nQJVgTqlSAroa7XkAKOMCyB7qBQQF6foc6Ji5mQVpKCrVaavd7t1i1P/EsUYeU+43CYE yvo5mmcLrUw61NVz3syVLPaElPwWmlxPOxU1ODZkCsAK28XSDumnDaNVK49+fA== 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 4TdZsM3dS6zRGg; Mon, 19 Feb 2024 08:07:51 +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 41J87pqA015927; Mon, 19 Feb 2024 08:07:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41J87pVB015924; Mon, 19 Feb 2024 08:07:51 GMT (envelope-from git) Date: Mon, 19 Feb 2024 08:07:51 GMT Message-Id: <202402190807.41J87pVB015924@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: 1cf1f094680f - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 1cf1f094680fe3bfd9836800f83ed0b79e180340 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1cf1f094680fe3bfd9836800f83ed0b79e180340 commit 1cf1f094680fe3bfd9836800f83ed0b79e180340 Author: Bjoern A. Zeeb AuthorDate: 2024-01-28 00:51:23 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-19 08:02:00 +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 {