From nobody Mon Feb 19 16:10:19 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 4TdnZ44WWDz5C5Dm; Mon, 19 Feb 2024 16:10:20 +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 4TdnZ40td1z4Nx5; Mon, 19 Feb 2024 16:10:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708359020; 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=OJWSwadkv3/Uxv5cquSWrNOcxU/e6lAnmtlUh/MrDY0=; b=BnSaitBIkcchsAq2WkRUyOQ59blBAUl8L8JS7NSB+WVXvQdea9TJfer8ab7IKoKbucp4d2 d9VCBV/w7oQ6iGASopSJ7zqncujQznXyzoiy+TaYONtY5CVUqDMpOiIOwgY24sAr+Ltzlt PvMVX7trKRg2zkppGZ7TkGa23Tf0sffG8MifQU9ctJuZwxNUb4P3RhxTGU3A4A2CeD8cQY zo1YLBRijn3cK0QXDAN+S0mSp0FDA3OhbLvNW6XEvSCCNeyiVS9EpZNvqYo2olg4Z+YktH i94S+y11qiBV/d3642dksfGHvMYRz9SVEiSoI5Nh8TJVIFxwc8NwXkRh0USFIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708359020; 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=OJWSwadkv3/Uxv5cquSWrNOcxU/e6lAnmtlUh/MrDY0=; b=Dd9bfKxxj8VBv5RV7CyOUC5jZxu1ETq2ofzNUY4Pga6gLZOsy3I0xVBtvp1b0muvU6eklw /E2nUeHzERN6Zy4oAvHzHpJL3R29PhHFOAG4HU45Rsn6bq8h7twbDcbnGyEVUEZy3nZ8ef 598TEXh/TSLk2BFBg3JI/KYiTVtlYz+k4AeZHbNGg1N5Altr1mnPurTXeaC98Bqiw0+7ve J5S03W8u7fCSHxQz/JAQcmHtyXXP7B111WP2Pe4qMFMI5SRIefpl60IX/0l9bkXMOuxkyo G9t0EWyRLhhzVOSU2cs3Wsp5nFKE5OzOpPF5ss3t5sXw+182TxYkHxTzKfbKpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708359020; a=rsa-sha256; cv=none; b=MqEKBSdBQYxdBTXAxOtjsk6f0XjCpzdIy7eUiTAEk74gXspcj6eQZS4za+SKZW8TgWX8To JlUR8jnSVk9vD13funGwKlhlpkt4FwmZfVylAG5foZouNkz89bSj5PvUt2mn7BO/YzlAlK wq8pp4XZvGoY+XHTiV4rR7uEBy9k+hEQCgKLwGysI+1UK10sw0hYoD1AOxxpFUUzFp+JEG 757SrboVC5mGpF8Jz5Q7HDWSyvEmqMr1buDIHnoR6uw2f+lefJfIw5q5GSlPBp2R6G8K05 QbTybrdrtiiJTtwqs1qyxMKhx2onknNwtneZE1JBkTqcKEiQoBVceTdCWvfBlQ== 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 4TdnZ4008czh9v; Mon, 19 Feb 2024 16:10:19 +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 41JGAJxI035791; Mon, 19 Feb 2024 16:10:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41JGAJjN035788; Mon, 19 Feb 2024 16:10:19 GMT (envelope-from git) Date: Mon, 19 Feb 2024 16:10:19 GMT Message-Id: <202402191610.41JGAJjN035788@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: 5463d4cd99f3 - releng/13.3 - 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/releng/13.3 X-Git-Reftype: branch X-Git-Commit: 5463d4cd99f339f7ed40a70679f48eb31f2b819e Auto-Submitted: auto-generated The branch releng/13.3 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5463d4cd99f339f7ed40a70679f48eb31f2b819e commit 5463d4cd99f339f7ed40a70679f48eb31f2b819e Author: Bjoern A. Zeeb AuthorDate: 2024-01-28 00:51:23 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-19 16:06:59 +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. Approved by: re (cperciva) Fixes: adff403fe7a87 Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43635 (cherry picked from commit 828ce22f079df77b3bf52c4cf296959ea66bdc11) (cherry picked from commit 1cf1f094680fe3bfd9836800f83ed0b79e180340) --- 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 fee29d3b1a1d..f6d807263cef 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -507,9 +507,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 {