From nobody Sat Feb 03 13:30:26 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 4TRtmy72Cwz59Nyb; Sat, 3 Feb 2024 13:30:26 +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 4TRtmy6XPzz416X; Sat, 3 Feb 2024 13:30:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706967026; 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=AWfDhdwBwJ5RSi3A7vn0MDiS3N3sB87YQWfLOTDKwFE=; b=rJgQG6hDjUbQRWGcFWzCQaOJXULzJaLeVVvksZ8gpmCkUDIyrXdULTNswtYARlnjKxgmwH T3NDt5FUv0O5asSWBR5mR8w4r5c4TtRKw994eNx8zk4SqMkaqlyovg0VM6uw1nyWzP6Df9 s0iG6DzhZ1mJFf2Wf2k5k9Cdpst3nzgwVxTccV2jJtHG4HQTn2n5YW7ke/B9l3XypLKqSW e+BKYWR8PbdLW7Bn5zEt3WH/+09xRKXA2wh8TryyZh9zTy/ueLg6hHr9J1bzPpVKPHj6nD zV/hT4rrFxcvRuPLG8GYjcsK5bckbBjx9oCnDwLM/1jpYkB8XXM1t8jf3EeASw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706967026; 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=AWfDhdwBwJ5RSi3A7vn0MDiS3N3sB87YQWfLOTDKwFE=; b=rTVh26rf5RNsuJISE6nZsA3MCaWTAEt46wvokBZMMUgnaIWzgqi5OkDGJpkRcvWVzsm7pc OzcjMEDjXPxOMAGejjRoa4j7LZKW3WwQYB6Lv7B7phjdzuOywTHWXEmqvY1tjzpZrkINPf 3PPLcXfB1X3WUTMSKjY2M718CAk5YCLruFz4iSFhkIurT8U4Uev3Dl9gFK4pfWoWkYTjvc HeNf96QO813fd/6rGsX5vvKgm5Jpyxu4nKhwOOyuVpzJS/duWFqBE49G4n8B7Aojf4dume MQlokW4ljeFjIX5RvesGtCvK8xaiVnOfpi4EUWmoHNbtLYYjcSC3z4sox1rg5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706967026; a=rsa-sha256; cv=none; b=CmY79j0mfUeNhRo04Iwinx+n7R6VgL3uuxnuAkeLqE4SkU+8LfyUpejsaqtQFz3LzAe6qH CU90gQKNjuyA4ZKYoR8r0963p3fhfQqpxrWHP7LNr8R5fYZZbEJ1Who0xKrdPf4iXLALHL u4Y6uD+stvOBXtK7+jbY3aYyIrx7gxg0/SrehQcSCtuVdhhfMbuALcFzdjSeZYwrfgHeju zbAHEKzQEeamqw095dxbAofz3XfXTwbaceZ5UuDuJfQg3/09t8UVLhCOJh0wrVRkS1HNh7 edWHsWth0+lTjq4rrrs17NEcq2aGy8qIo1BYwkM44iThxA2rj16S2Z81YR/i+g== 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 4TRtmy4z2qzFmg; Sat, 3 Feb 2024 13:30:26 +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 413DUQbd015080; Sat, 3 Feb 2024 13:30:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 413DUQYO015077; Sat, 3 Feb 2024 13:30:26 GMT (envelope-from git) Date: Sat, 3 Feb 2024 13:30:26 GMT Message-Id: <202402031330.413DUQYO015077@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 828ce22f079d - main - 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/main X-Git-Reftype: branch X-Git-Commit: 828ce22f079df77b3bf52c4cf296959ea66bdc11 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=828ce22f079df77b3bf52c4cf296959ea66bdc11 commit 828ce22f079df77b3bf52c4cf296959ea66bdc11 Author: Bjoern A. Zeeb AuthorDate: 2024-01-28 00:51:23 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-03 13:28:25 +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 MFC after: 3 days Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43635 --- 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 {