wifi: mac80211, cfg80211: Export michael_mic() and move it to cfg80211

Export michael_mic() so that the ath11k and ath12k drivers can call it.
In addition, move it from mac80211 to cfg80211 so that the ipw2x00
drivers, which depend on cfg80211 but not mac80211, can also call it.

Currently these drivers have their own local implementations of
michael_mic() based on crypto_shash, which is redundant and inefficient.
By consolidating all the Michael MIC code into cfg80211, we'll be able
to remove the duplicate Michael MIC code in the crypto/ directory.

Signed-off-by: Eric Biggers <ebiggers@kernel.org>
Link: https://patch.msgid.link/20260408030651.80336-3-ebiggers@kernel.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index ffa8f9f77efe44b9a3559f16219a9f941799df26..23f9df9be83728cb866be9254488dc197252196f 100644 (file)
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -1921,6 +1921,11 @@ enum ieee80211_radio_measurement_actioncode {
 #define PMK_MAX_LEN                    64
 #define SAE_PASSWORD_MAX_LEN           128
 
+#define MICHAEL_MIC_LEN                        8
+
+void michael_mic(const u8 *key, struct ieee80211_hdr *hdr,
+                const u8 *data, size_t data_len, u8 *mic);
+
 /* Public action codes (IEEE Std 802.11-2016, 9.6.8.1, Table 9-307) */
 enum ieee80211_pub_actioncode {
        WLAN_PUB_ACTION_20_40_BSS_COEX = 0,

diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile
index abf46c95129935ceedd8edce5ff417a24ff39793..20c3135b73ea6e89496b3cc3f8ec26dc279240be 100644 (file)
--- a/net/mac80211/Makefile
+++ b/net/mac80211/Makefile
@@ -18,7 +18,6 @@ mac80211-y := \
        iface.o \
        link.o \
        rate.o \
-       michael.o \
        tkip.o \
        aes_cmac.o \
        aes_gmac.o \

diff --git a/net/mac80211/michael.c b/net/mac80211/michael.c
deleted file mode 100644 (file)
index 8a1afc9..0000000
--- a/net/mac80211/michael.c
+++ /dev/null
@@ -1,83 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Michael MIC implementation - optimized for TKIP MIC operations
- * Copyright 2002-2003, Instant802 Networks, Inc.
- */
-#include <linux/types.h>
-#include <linux/bitops.h>
-#include <linux/ieee80211.h>
-#include <linux/unaligned.h>
-
-#include "michael.h"
-
-static void michael_block(struct michael_mic_ctx *mctx, u32 val)
-{
-       mctx->l ^= val;
-       mctx->r ^= rol32(mctx->l, 17);
-       mctx->l += mctx->r;
-       mctx->r ^= ((mctx->l & 0xff00ff00) >> 8) |
-                  ((mctx->l & 0x00ff00ff) << 8);
-       mctx->l += mctx->r;
-       mctx->r ^= rol32(mctx->l, 3);
-       mctx->l += mctx->r;
-       mctx->r ^= ror32(mctx->l, 2);
-       mctx->l += mctx->r;
-}
-
-static void michael_mic_hdr(struct michael_mic_ctx *mctx, const u8 *key,
-                           struct ieee80211_hdr *hdr)
-{
-       u8 *da, *sa, tid;
-
-       da = ieee80211_get_DA(hdr);
-       sa = ieee80211_get_SA(hdr);
-       if (ieee80211_is_data_qos(hdr->frame_control))
-               tid = ieee80211_get_tid(hdr);
-       else
-               tid = 0;
-
-       mctx->l = get_unaligned_le32(key);
-       mctx->r = get_unaligned_le32(key + 4);
-
-       /*
-        * A pseudo header (DA, SA, Priority, 0, 0, 0) is used in Michael MIC
-        * calculation, but it is _not_ transmitted
-        */
-       michael_block(mctx, get_unaligned_le32(da));
-       michael_block(mctx, get_unaligned_le16(&da[4]) |
-                           (get_unaligned_le16(sa) << 16));
-       michael_block(mctx, get_unaligned_le32(&sa[2]));
-       michael_block(mctx, tid);
-}
-
-void michael_mic(const u8 *key, struct ieee80211_hdr *hdr,
-                const u8 *data, size_t data_len, u8 *mic)
-{
-       u32 val;
-       size_t block, blocks, left;
-       struct michael_mic_ctx mctx;
-
-       michael_mic_hdr(&mctx, key, hdr);
-
-       /* Real data */
-       blocks = data_len / 4;
-       left = data_len % 4;
-
-       for (block = 0; block < blocks; block++)
-               michael_block(&mctx, get_unaligned_le32(&data[block * 4]));
-
-       /* Partial block of 0..3 bytes and padding: 0x5a + 4..7 zeros to make
-        * total length a multiple of 4. */
-       val = 0x5a;
-       while (left > 0) {
-               val <<= 8;
-               left--;
-               val |= data[blocks * 4 + left];
-       }
-
-       michael_block(&mctx, val);
-       michael_block(&mctx, 0);
-
-       put_unaligned_le32(mctx.l, mic);
-       put_unaligned_le32(mctx.r, mic + 4);
-}

diff --git a/net/mac80211/michael.h b/net/mac80211/michael.h
deleted file mode 100644 (file)
index a7fdb8e..0000000
--- a/net/mac80211/michael.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Michael MIC implementation - optimized for TKIP MIC operations
- * Copyright 2002-2003, Instant802 Networks, Inc.
- */
-
-#ifndef MICHAEL_H
-#define MICHAEL_H
-
-#include <linux/types.h>
-#include <linux/ieee80211.h>
-
-#define MICHAEL_MIC_LEN 8
-
-struct michael_mic_ctx {
-       u32 l, r;
-};
-
-void michael_mic(const u8 *key, struct ieee80211_hdr *hdr,
-                const u8 *data, size_t data_len, u8 *mic);
-
-#endif /* MICHAEL_H */

diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c
index 64a57475ce506416d47067baa775640d30721358..724ec831a88571ccf075aaaa4b6b61d1c4e395b8 100644 (file)
--- a/net/mac80211/wpa.c
+++ b/net/mac80211/wpa.c
@@ -18,7 +18,6 @@
 #include <crypto/utils.h>
 
 #include "ieee80211_i.h"
-#include "michael.h"
 #include "tkip.h"
 #include "aes_ccm.h"
 #include "aes_cmac.h"

diff --git a/net/wireless/Makefile b/net/wireless/Makefile
index 62a83faf0e07d089e64674c8c530de49f8e08dea..a77fd5ba63686cf02cfc33fc70b8953c38d78f34 100644 (file)
--- a/net/wireless/Makefile
+++ b/net/wireless/Makefile
@@ -8,7 +8,7 @@ obj-$(CONFIG_WEXT_PRIV) += wext-priv.o
 
 cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o
 cfg80211-y += mlme.o ibss.o sme.o chan.o ethtool.o mesh.o ap.o trace.o ocb.o
-cfg80211-y += pmsr.o
+cfg80211-y += michael-mic.o pmsr.o
 cfg80211-$(CONFIG_OF) += of.o
 cfg80211-$(CONFIG_CFG80211_DEBUGFS) += debugfs.o
 cfg80211-$(CONFIG_CFG80211_WEXT) += wext-compat.o wext-sme.o

diff --git a/net/wireless/michael-mic.c b/net/wireless/michael-mic.c
new file mode 100644 (file)
index 0000000..50cdb67
--- /dev/null
+++ b/net/wireless/michael-mic.c
@@ -0,0 +1,86 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Michael MIC implementation - optimized for TKIP MIC operations
+ * Copyright 2002-2003, Instant802 Networks, Inc.
+ */
+#include <linux/types.h>
+#include <linux/bitops.h>
+#include <linux/ieee80211.h>
+#include <linux/unaligned.h>
+
+struct michael_mic_ctx {
+       u32 l, r;
+};
+
+static void michael_block(struct michael_mic_ctx *mctx, u32 val)
+{
+       mctx->l ^= val;
+       mctx->r ^= rol32(mctx->l, 17);
+       mctx->l += mctx->r;
+       mctx->r ^= ((mctx->l & 0xff00ff00) >> 8) |
+                  ((mctx->l & 0x00ff00ff) << 8);
+       mctx->l += mctx->r;
+       mctx->r ^= rol32(mctx->l, 3);
+       mctx->l += mctx->r;
+       mctx->r ^= ror32(mctx->l, 2);
+       mctx->l += mctx->r;
+}
+
+static void michael_mic_hdr(struct michael_mic_ctx *mctx, const u8 *key,
+                           struct ieee80211_hdr *hdr)
+{
+       u8 *da, *sa, tid;
+
+       da = ieee80211_get_DA(hdr);
+       sa = ieee80211_get_SA(hdr);
+       if (ieee80211_is_data_qos(hdr->frame_control))
+               tid = ieee80211_get_tid(hdr);
+       else
+               tid = 0;
+
+       mctx->l = get_unaligned_le32(key);
+       mctx->r = get_unaligned_le32(key + 4);
+
+       /*
+        * A pseudo header (DA, SA, Priority, 0, 0, 0) is used in Michael MIC
+        * calculation, but it is _not_ transmitted
+        */
+       michael_block(mctx, get_unaligned_le32(da));
+       michael_block(mctx, get_unaligned_le16(&da[4]) |
+                           (get_unaligned_le16(sa) << 16));
+       michael_block(mctx, get_unaligned_le32(&sa[2]));
+       michael_block(mctx, tid);
+}
+
+void michael_mic(const u8 *key, struct ieee80211_hdr *hdr,
+                const u8 *data, size_t data_len, u8 *mic)
+{
+       u32 val;
+       size_t block, blocks, left;
+       struct michael_mic_ctx mctx;
+
+       michael_mic_hdr(&mctx, key, hdr);
+
+       /* Real data */
+       blocks = data_len / 4;
+       left = data_len % 4;
+
+       for (block = 0; block < blocks; block++)
+               michael_block(&mctx, get_unaligned_le32(&data[block * 4]));
+
+       /* Partial block of 0..3 bytes and padding: 0x5a + 4..7 zeros to make
+        * total length a multiple of 4. */
+       val = 0x5a;
+       while (left > 0) {
+               val <<= 8;
+               left--;
+               val |= data[blocks * 4 + left];
+       }
+
+       michael_block(&mctx, val);
+       michael_block(&mctx, 0);
+
+       put_unaligned_le32(mctx.l, mic);
+       put_unaligned_le32(mctx.r, mic + 4);
+}
+EXPORT_SYMBOL_GPL(michael_mic);