mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
Just a couple of more things over the holidays:
- first kunit tests for both cfg80211 and mac80211 - a few multi-link fixes - DSCP mapping update - RCU fix -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEpeA8sTs3M8SN2hR410qiO8sPaAAFAmWVcYQACgkQ10qiO8sP aABEdw//VOD/aR+ZXNwZBcRoJufHYCHu0h3gIKqEcB+W+e7dFs8OYQryHP/jo3AI brOjcP9Upooyk6h7TNszL/YvjLjRmEFnaz3mEb41xy62M2NGHyPcA5lB9J5gphpY uurhcj+SfxZeB0/YIVPR4Bwf/RTbDkWzJIWJ/f7mfXk2ELQby1ohzYCezK6p6f/p vP7w0zk4xFFKZChbyrccBGHl5/Q6oOFOeuwXE4h0J1skBWUCfxjUInGiU7fuQEWb FhJUzB1WSJPVKPzWuLC4bUvAcrwfv4JHCcjWECQyPr38+wrEj4DZle8XtLN/dEUB aE/2wKyFcbHmGTqRiBuaPhms439WKbave1yDEdOmuvcgyj2AMNkY6hod9Q5bWZJr L+MvJ50tTKJcUQNayA7pyGMdLr7lvMxkMsLPgPKGSLBMp/uqW/4SioXO4AqCfL7p T3Vw9Z1SMFI5WvSSRssIL8Sbl0LS+vMGEN76HZmxs5m4d0f5Hv9RRFFDmNqFyD4G iqKmYPi1XJc7QsoHtonyx+kByImFdl839RsU7WPh9GS045yNwlC3eWhZMgbuF/ol 1iWNPcXogh9ABh8zgFaeWrLnDj2Kcix6vtec//7YM5cTYklyr0Ruo3bwKR3N00C3 hNh5zVLd/LHoce6B0V5HAq+ajMnnGw6CT6pM7quF5srAJZLIKLM= =dHxp -----END PGP SIGNATURE----- Merge tag 'wireless-next-2024-01-03' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next Johannes Berg says: ==================== Just a couple of more things over the holidays: - first kunit tests for both cfg80211 and mac80211 - a few multi-link fixes - DSCP mapping update - RCU fix * tag 'wireless-next-2024-01-03' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next: wifi: mac80211: remove redundant ML element check wifi: cfg80211: parse all ML elements in an ML probe response wifi: cfg80211: correct comment about MLD ID wifi: cfg80211: Update the default DSCP-to-UP mapping wifi: cfg80211: tests: add some scanning related tests wifi: mac80211: kunit: extend MFP tests wifi: mac80211: kunit: generalize public action test wifi: mac80211: add kunit tests for public action handling kunit: add a convenience allocation wrapper for SKBs kunit: add parameter generation macro using description from array wifi: mac80211: fix spelling typo in comment wifi: cfg80211: fix RCU dereference in __cfg80211_bss_update ==================== Link: https://lore.kernel.org/r/20240103144423.52269-3-johannes@sipsolutions.net Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
commit
a180b0b1a6
|
@ -566,13 +566,9 @@ By reusing the same ``cases`` array from above, we can write the test as a
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
// Need a helper function to generate a name for each test case.
|
// Creates `sha1_gen_params()` to iterate over `cases` while using
|
||||||
static void case_to_desc(const struct sha1_test_case *t, char *desc)
|
// the struct member `str` for the case description.
|
||||||
{
|
KUNIT_ARRAY_PARAM_DESC(sha1, cases, str);
|
||||||
strcpy(desc, t->str);
|
|
||||||
}
|
|
||||||
// Creates `sha1_gen_params()` to iterate over `cases`.
|
|
||||||
KUNIT_ARRAY_PARAM(sha1, cases, case_to_desc);
|
|
||||||
|
|
||||||
// Looks no different from a normal test.
|
// Looks no different from a normal test.
|
||||||
static void sha1_test(struct kunit *test)
|
static void sha1_test(struct kunit *test)
|
||||||
|
@ -588,7 +584,7 @@ By reusing the same ``cases`` array from above, we can write the test as a
|
||||||
}
|
}
|
||||||
|
|
||||||
// Instead of KUNIT_CASE, we use KUNIT_CASE_PARAM and pass in the
|
// Instead of KUNIT_CASE, we use KUNIT_CASE_PARAM and pass in the
|
||||||
// function declared by KUNIT_ARRAY_PARAM.
|
// function declared by KUNIT_ARRAY_PARAM or KUNIT_ARRAY_PARAM_DESC.
|
||||||
static struct kunit_case sha1_test_cases[] = {
|
static struct kunit_case sha1_test_cases[] = {
|
||||||
KUNIT_CASE_PARAM(sha1_test, sha1_gen_params),
|
KUNIT_CASE_PARAM(sha1_test, sha1_gen_params),
|
||||||
{}
|
{}
|
||||||
|
|
56
include/kunit/skbuff.h
Normal file
56
include/kunit/skbuff.h
Normal file
|
@ -0,0 +1,56 @@
|
||||||
|
/* SPDX-License-Identifier: GPL-2.0 */
|
||||||
|
/*
|
||||||
|
* KUnit resource management helpers for SKBs (skbuff).
|
||||||
|
*
|
||||||
|
* Copyright (C) 2023 Intel Corporation
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _KUNIT_SKBUFF_H
|
||||||
|
#define _KUNIT_SKBUFF_H
|
||||||
|
|
||||||
|
#include <kunit/resource.h>
|
||||||
|
#include <linux/skbuff.h>
|
||||||
|
|
||||||
|
static void kunit_action_kfree_skb(void *p)
|
||||||
|
{
|
||||||
|
kfree_skb((struct sk_buff *)p);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* kunit_zalloc_skb() - Allocate and initialize a resource managed skb.
|
||||||
|
* @test: The test case to which the skb belongs
|
||||||
|
* @len: size to allocate
|
||||||
|
*
|
||||||
|
* Allocate a new struct sk_buff with GFP_KERNEL, zero fill the give length
|
||||||
|
* and add it as a resource to the kunit test for automatic cleanup.
|
||||||
|
*
|
||||||
|
* Returns: newly allocated SKB, or %NULL on error
|
||||||
|
*/
|
||||||
|
static inline struct sk_buff *kunit_zalloc_skb(struct kunit *test, int len,
|
||||||
|
gfp_t gfp)
|
||||||
|
{
|
||||||
|
struct sk_buff *res = alloc_skb(len, GFP_KERNEL);
|
||||||
|
|
||||||
|
if (!res || skb_pad(res, len))
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
if (kunit_add_action_or_reset(test, kunit_action_kfree_skb, res))
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* kunit_kfree_skb() - Like kfree_skb except for allocations managed by KUnit.
|
||||||
|
* @test: The test case to which the resource belongs.
|
||||||
|
* @skb: The SKB to free.
|
||||||
|
*/
|
||||||
|
static inline void kunit_kfree_skb(struct kunit *test, struct sk_buff *skb)
|
||||||
|
{
|
||||||
|
if (!skb)
|
||||||
|
return;
|
||||||
|
|
||||||
|
kunit_release_action(test, kunit_action_kfree_skb, (void *)skb);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif /* _KUNIT_SKBUFF_H */
|
|
@ -1514,6 +1514,25 @@ do { \
|
||||||
return NULL; \
|
return NULL; \
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* KUNIT_ARRAY_PARAM_DESC() - Define test parameter generator from an array.
|
||||||
|
* @name: prefix for the test parameter generator function.
|
||||||
|
* @array: array of test parameters.
|
||||||
|
* @desc_member: structure member from array element to use as description
|
||||||
|
*
|
||||||
|
* Define function @name_gen_params which uses @array to generate parameters.
|
||||||
|
*/
|
||||||
|
#define KUNIT_ARRAY_PARAM_DESC(name, array, desc_member) \
|
||||||
|
static const void *name##_gen_params(const void *prev, char *desc) \
|
||||||
|
{ \
|
||||||
|
typeof((array)[0]) *__next = prev ? ((typeof(__next)) prev) + 1 : (array); \
|
||||||
|
if (__next - (array) < ARRAY_SIZE((array))) { \
|
||||||
|
strscpy(desc, __next->desc_member, KUNIT_PARAM_DESC_SIZE); \
|
||||||
|
return __next; \
|
||||||
|
} \
|
||||||
|
return NULL; \
|
||||||
|
}
|
||||||
|
|
||||||
// TODO(dlatypov@google.com): consider eventually migrating users to explicitly
|
// TODO(dlatypov@google.com): consider eventually migrating users to explicitly
|
||||||
// include resource.h themselves if they need it.
|
// include resource.h themselves if they need it.
|
||||||
#include <kunit/resource.h>
|
#include <kunit/resource.h>
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
#include "sta_info.h"
|
#include "sta_info.h"
|
||||||
#include "driver-ops.h"
|
#include "driver-ops.h"
|
||||||
|
|
||||||
/* sta attributtes */
|
/* sta attributes */
|
||||||
|
|
||||||
#define STA_READ(name, field, format_string) \
|
#define STA_READ(name, field, format_string) \
|
||||||
static ssize_t sta_ ##name## _read(struct file *file, \
|
static ssize_t sta_ ##name## _read(struct file *file, \
|
||||||
|
|
|
@ -2608,4 +2608,14 @@ void ieee80211_check_wbrf_support(struct ieee80211_local *local);
|
||||||
void ieee80211_add_wbrf(struct ieee80211_local *local, struct cfg80211_chan_def *chandef);
|
void ieee80211_add_wbrf(struct ieee80211_local *local, struct cfg80211_chan_def *chandef);
|
||||||
void ieee80211_remove_wbrf(struct ieee80211_local *local, struct cfg80211_chan_def *chandef);
|
void ieee80211_remove_wbrf(struct ieee80211_local *local, struct cfg80211_chan_def *chandef);
|
||||||
|
|
||||||
|
#if IS_ENABLED(CONFIG_MAC80211_KUNIT_TEST)
|
||||||
|
#define EXPORT_SYMBOL_IF_MAC80211_KUNIT(sym) EXPORT_SYMBOL_IF_KUNIT(sym)
|
||||||
|
#define VISIBLE_IF_MAC80211_KUNIT
|
||||||
|
ieee80211_rx_result
|
||||||
|
ieee80211_drop_unencrypted_mgmt(struct ieee80211_rx_data *rx);
|
||||||
|
#else
|
||||||
|
#define EXPORT_SYMBOL_IF_MAC80211_KUNIT(sym)
|
||||||
|
#define VISIBLE_IF_MAC80211_KUNIT static
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* IEEE80211_I_H */
|
#endif /* IEEE80211_I_H */
|
||||||
|
|
|
@ -5407,33 +5407,24 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ieee80211_vif_is_mld(&sdata->vif)) {
|
if (ieee80211_vif_is_mld(&sdata->vif)) {
|
||||||
|
struct ieee80211_mle_basic_common_info *common;
|
||||||
|
|
||||||
if (!elems->ml_basic) {
|
if (!elems->ml_basic) {
|
||||||
sdata_info(sdata,
|
sdata_info(sdata,
|
||||||
"MLO association with %pM but no multi-link element in response!\n",
|
"MLO association with %pM but no (basic) multi-link element in response!\n",
|
||||||
assoc_data->ap_addr);
|
assoc_data->ap_addr);
|
||||||
goto abandon_assoc;
|
goto abandon_assoc;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (le16_get_bits(elems->ml_basic->control,
|
common = (void *)elems->ml_basic->variable;
|
||||||
IEEE80211_ML_CONTROL_TYPE) !=
|
|
||||||
IEEE80211_ML_CONTROL_TYPE_BASIC) {
|
if (memcmp(assoc_data->ap_addr,
|
||||||
|
common->mld_mac_addr, ETH_ALEN)) {
|
||||||
sdata_info(sdata,
|
sdata_info(sdata,
|
||||||
"bad multi-link element (control=0x%x)\n",
|
"AP MLD MAC address mismatch: got %pM expected %pM\n",
|
||||||
le16_to_cpu(elems->ml_basic->control));
|
common->mld_mac_addr,
|
||||||
|
assoc_data->ap_addr);
|
||||||
goto abandon_assoc;
|
goto abandon_assoc;
|
||||||
} else {
|
|
||||||
struct ieee80211_mle_basic_common_info *common;
|
|
||||||
|
|
||||||
common = (void *)elems->ml_basic->variable;
|
|
||||||
|
|
||||||
if (memcmp(assoc_data->ap_addr,
|
|
||||||
common->mld_mac_addr, ETH_ALEN)) {
|
|
||||||
sdata_info(sdata,
|
|
||||||
"AP MLD MAC address mismatch: got %pM expected %pM\n",
|
|
||||||
common->mld_mac_addr,
|
|
||||||
assoc_data->ap_addr);
|
|
||||||
goto abandon_assoc;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
#include <linux/export.h>
|
#include <linux/export.h>
|
||||||
#include <linux/kcov.h>
|
#include <linux/kcov.h>
|
||||||
#include <linux/bitops.h>
|
#include <linux/bitops.h>
|
||||||
|
#include <kunit/visibility.h>
|
||||||
#include <net/mac80211.h>
|
#include <net/mac80211.h>
|
||||||
#include <net/ieee80211_radiotap.h>
|
#include <net/ieee80211_radiotap.h>
|
||||||
#include <asm/unaligned.h>
|
#include <asm/unaligned.h>
|
||||||
|
@ -2414,7 +2415,7 @@ static int ieee80211_drop_unencrypted(struct ieee80211_rx_data *rx, __le16 fc)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static ieee80211_rx_result
|
VISIBLE_IF_MAC80211_KUNIT ieee80211_rx_result
|
||||||
ieee80211_drop_unencrypted_mgmt(struct ieee80211_rx_data *rx)
|
ieee80211_drop_unencrypted_mgmt(struct ieee80211_rx_data *rx)
|
||||||
{
|
{
|
||||||
struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(rx->skb);
|
struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(rx->skb);
|
||||||
|
@ -2493,6 +2494,7 @@ ieee80211_drop_unencrypted_mgmt(struct ieee80211_rx_data *rx)
|
||||||
|
|
||||||
return RX_CONTINUE;
|
return RX_CONTINUE;
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL_IF_MAC80211_KUNIT(ieee80211_drop_unencrypted_mgmt);
|
||||||
|
|
||||||
static ieee80211_rx_result
|
static ieee80211_rx_result
|
||||||
__ieee80211_data_to_8023(struct ieee80211_rx_data *rx, bool *port_control)
|
__ieee80211_data_to_8023(struct ieee80211_rx_data *rx, bool *port_control)
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
mac80211-tests-y += module.o elems.o
|
mac80211-tests-y += module.o elems.o mfp.o
|
||||||
|
|
||||||
obj-$(CONFIG_MAC80211_KUNIT_TEST) += mac80211-tests.o
|
obj-$(CONFIG_MAC80211_KUNIT_TEST) += mac80211-tests.o
|
||||||
|
|
286
net/mac80211/tests/mfp.c
Normal file
286
net/mac80211/tests/mfp.c
Normal file
|
@ -0,0 +1,286 @@
|
||||||
|
// SPDX-License-Identifier: GPL-2.0-only
|
||||||
|
/*
|
||||||
|
* KUnit tests for management frame acceptance
|
||||||
|
*
|
||||||
|
* Copyright (C) 2023 Intel Corporation
|
||||||
|
*/
|
||||||
|
#include <kunit/test.h>
|
||||||
|
#include <kunit/skbuff.h>
|
||||||
|
#include "../ieee80211_i.h"
|
||||||
|
#include "../sta_info.h"
|
||||||
|
|
||||||
|
MODULE_IMPORT_NS(EXPORTED_FOR_KUNIT_TESTING);
|
||||||
|
|
||||||
|
static const struct mfp_test_case {
|
||||||
|
const char *desc;
|
||||||
|
bool sta, mfp, decrypted, unicast, assoc;
|
||||||
|
u8 category;
|
||||||
|
u8 stype;
|
||||||
|
u8 action;
|
||||||
|
ieee80211_rx_result result;
|
||||||
|
} accept_mfp_cases[] = {
|
||||||
|
/* regular public action */
|
||||||
|
{
|
||||||
|
.desc = "public action: accept unicast from unknown peer",
|
||||||
|
.stype = IEEE80211_STYPE_ACTION,
|
||||||
|
.category = WLAN_CATEGORY_PUBLIC,
|
||||||
|
.action = WLAN_PUB_ACTION_DSE_ENABLEMENT,
|
||||||
|
.unicast = true,
|
||||||
|
.result = RX_CONTINUE,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.desc = "public action: accept multicast from unknown peer",
|
||||||
|
.stype = IEEE80211_STYPE_ACTION,
|
||||||
|
.category = WLAN_CATEGORY_PUBLIC,
|
||||||
|
.action = WLAN_PUB_ACTION_DSE_ENABLEMENT,
|
||||||
|
.unicast = false,
|
||||||
|
.result = RX_CONTINUE,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.desc = "public action: accept unicast without MFP",
|
||||||
|
.stype = IEEE80211_STYPE_ACTION,
|
||||||
|
.category = WLAN_CATEGORY_PUBLIC,
|
||||||
|
.action = WLAN_PUB_ACTION_DSE_ENABLEMENT,
|
||||||
|
.unicast = true,
|
||||||
|
.sta = true,
|
||||||
|
.result = RX_CONTINUE,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.desc = "public action: accept multicast without MFP",
|
||||||
|
.stype = IEEE80211_STYPE_ACTION,
|
||||||
|
.category = WLAN_CATEGORY_PUBLIC,
|
||||||
|
.action = WLAN_PUB_ACTION_DSE_ENABLEMENT,
|
||||||
|
.unicast = false,
|
||||||
|
.sta = true,
|
||||||
|
.result = RX_CONTINUE,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.desc = "public action: drop unicast with MFP",
|
||||||
|
.stype = IEEE80211_STYPE_ACTION,
|
||||||
|
.category = WLAN_CATEGORY_PUBLIC,
|
||||||
|
.action = WLAN_PUB_ACTION_DSE_ENABLEMENT,
|
||||||
|
.unicast = true,
|
||||||
|
.sta = true,
|
||||||
|
.mfp = true,
|
||||||
|
.result = RX_DROP_U_UNPROT_UNICAST_PUB_ACTION,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.desc = "public action: accept multicast with MFP",
|
||||||
|
.stype = IEEE80211_STYPE_ACTION,
|
||||||
|
.category = WLAN_CATEGORY_PUBLIC,
|
||||||
|
.action = WLAN_PUB_ACTION_DSE_ENABLEMENT,
|
||||||
|
.unicast = false,
|
||||||
|
.sta = true,
|
||||||
|
.mfp = true,
|
||||||
|
.result = RX_CONTINUE,
|
||||||
|
},
|
||||||
|
/* protected dual of public action */
|
||||||
|
{
|
||||||
|
.desc = "protected dual: drop unicast from unknown peer",
|
||||||
|
.stype = IEEE80211_STYPE_ACTION,
|
||||||
|
.category = WLAN_CATEGORY_PROTECTED_DUAL_OF_ACTION,
|
||||||
|
.action = WLAN_PUB_ACTION_DSE_ENABLEMENT,
|
||||||
|
.unicast = true,
|
||||||
|
.result = RX_DROP_U_UNPROT_DUAL,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.desc = "protected dual: drop multicast from unknown peer",
|
||||||
|
.stype = IEEE80211_STYPE_ACTION,
|
||||||
|
.category = WLAN_CATEGORY_PROTECTED_DUAL_OF_ACTION,
|
||||||
|
.action = WLAN_PUB_ACTION_DSE_ENABLEMENT,
|
||||||
|
.unicast = false,
|
||||||
|
.result = RX_DROP_U_UNPROT_DUAL,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.desc = "protected dual: drop unicast without MFP",
|
||||||
|
.stype = IEEE80211_STYPE_ACTION,
|
||||||
|
.category = WLAN_CATEGORY_PROTECTED_DUAL_OF_ACTION,
|
||||||
|
.action = WLAN_PUB_ACTION_DSE_ENABLEMENT,
|
||||||
|
.unicast = true,
|
||||||
|
.sta = true,
|
||||||
|
.result = RX_DROP_U_UNPROT_DUAL,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.desc = "protected dual: drop multicast without MFP",
|
||||||
|
.stype = IEEE80211_STYPE_ACTION,
|
||||||
|
.category = WLAN_CATEGORY_PROTECTED_DUAL_OF_ACTION,
|
||||||
|
.action = WLAN_PUB_ACTION_DSE_ENABLEMENT,
|
||||||
|
.unicast = false,
|
||||||
|
.sta = true,
|
||||||
|
.result = RX_DROP_U_UNPROT_DUAL,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.desc = "protected dual: drop undecrypted unicast with MFP",
|
||||||
|
.stype = IEEE80211_STYPE_ACTION,
|
||||||
|
.category = WLAN_CATEGORY_PROTECTED_DUAL_OF_ACTION,
|
||||||
|
.action = WLAN_PUB_ACTION_DSE_ENABLEMENT,
|
||||||
|
.unicast = true,
|
||||||
|
.sta = true,
|
||||||
|
.mfp = true,
|
||||||
|
.result = RX_DROP_U_UNPROT_DUAL,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.desc = "protected dual: drop undecrypted multicast with MFP",
|
||||||
|
.stype = IEEE80211_STYPE_ACTION,
|
||||||
|
.category = WLAN_CATEGORY_PROTECTED_DUAL_OF_ACTION,
|
||||||
|
.action = WLAN_PUB_ACTION_DSE_ENABLEMENT,
|
||||||
|
.unicast = false,
|
||||||
|
.sta = true,
|
||||||
|
.mfp = true,
|
||||||
|
.result = RX_DROP_U_UNPROT_DUAL,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.desc = "protected dual: accept unicast with MFP",
|
||||||
|
.stype = IEEE80211_STYPE_ACTION,
|
||||||
|
.category = WLAN_CATEGORY_PROTECTED_DUAL_OF_ACTION,
|
||||||
|
.action = WLAN_PUB_ACTION_DSE_ENABLEMENT,
|
||||||
|
.decrypted = true,
|
||||||
|
.unicast = true,
|
||||||
|
.sta = true,
|
||||||
|
.mfp = true,
|
||||||
|
.result = RX_CONTINUE,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.desc = "protected dual: accept multicast with MFP",
|
||||||
|
.stype = IEEE80211_STYPE_ACTION,
|
||||||
|
.category = WLAN_CATEGORY_PROTECTED_DUAL_OF_ACTION,
|
||||||
|
.action = WLAN_PUB_ACTION_DSE_ENABLEMENT,
|
||||||
|
.decrypted = true,
|
||||||
|
.unicast = false,
|
||||||
|
.sta = true,
|
||||||
|
.mfp = true,
|
||||||
|
.result = RX_CONTINUE,
|
||||||
|
},
|
||||||
|
/* deauth/disassoc before keys are set */
|
||||||
|
{
|
||||||
|
.desc = "deauth: accept unicast with MFP but w/o key",
|
||||||
|
.stype = IEEE80211_STYPE_DEAUTH,
|
||||||
|
.sta = true,
|
||||||
|
.mfp = true,
|
||||||
|
.unicast = true,
|
||||||
|
.result = RX_CONTINUE,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.desc = "disassoc: accept unicast with MFP but w/o key",
|
||||||
|
.stype = IEEE80211_STYPE_DEAUTH,
|
||||||
|
.sta = true,
|
||||||
|
.mfp = true,
|
||||||
|
.unicast = true,
|
||||||
|
.result = RX_CONTINUE,
|
||||||
|
},
|
||||||
|
/* non-public robust action frame ... */
|
||||||
|
{
|
||||||
|
.desc = "BA action: drop unicast before assoc",
|
||||||
|
.stype = IEEE80211_STYPE_ACTION,
|
||||||
|
.category = WLAN_CATEGORY_BACK,
|
||||||
|
.unicast = true,
|
||||||
|
.sta = true,
|
||||||
|
.result = RX_DROP_U_UNPROT_ROBUST_ACTION,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.desc = "BA action: drop unprotected after assoc",
|
||||||
|
.stype = IEEE80211_STYPE_ACTION,
|
||||||
|
.category = WLAN_CATEGORY_BACK,
|
||||||
|
.unicast = true,
|
||||||
|
.sta = true,
|
||||||
|
.mfp = true,
|
||||||
|
.result = RX_DROP_U_UNPROT_UCAST_MGMT,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.desc = "BA action: accept unprotected without MFP",
|
||||||
|
.stype = IEEE80211_STYPE_ACTION,
|
||||||
|
.category = WLAN_CATEGORY_BACK,
|
||||||
|
.unicast = true,
|
||||||
|
.sta = true,
|
||||||
|
.assoc = true,
|
||||||
|
.mfp = false,
|
||||||
|
.result = RX_CONTINUE,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.desc = "BA action: drop unprotected with MFP",
|
||||||
|
.stype = IEEE80211_STYPE_ACTION,
|
||||||
|
.category = WLAN_CATEGORY_BACK,
|
||||||
|
.unicast = true,
|
||||||
|
.sta = true,
|
||||||
|
.mfp = true,
|
||||||
|
.result = RX_DROP_U_UNPROT_UCAST_MGMT,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
KUNIT_ARRAY_PARAM_DESC(accept_mfp, accept_mfp_cases, desc);
|
||||||
|
|
||||||
|
static void accept_mfp(struct kunit *test)
|
||||||
|
{
|
||||||
|
static struct sta_info sta;
|
||||||
|
const struct mfp_test_case *params = test->param_value;
|
||||||
|
struct ieee80211_rx_data rx = {
|
||||||
|
.sta = params->sta ? &sta : NULL,
|
||||||
|
};
|
||||||
|
struct ieee80211_rx_status *status;
|
||||||
|
struct ieee80211_hdr_3addr hdr = {
|
||||||
|
.frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
|
||||||
|
params->stype),
|
||||||
|
.addr1 = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
|
||||||
|
.addr2 = { 0x12, 0x22, 0x33, 0x44, 0x55, 0x66 },
|
||||||
|
/* A3/BSSID doesn't matter here */
|
||||||
|
};
|
||||||
|
|
||||||
|
memset(&sta, 0, sizeof(sta));
|
||||||
|
|
||||||
|
if (!params->sta) {
|
||||||
|
KUNIT_ASSERT_FALSE(test, params->mfp);
|
||||||
|
KUNIT_ASSERT_FALSE(test, params->decrypted);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (params->mfp)
|
||||||
|
set_sta_flag(&sta, WLAN_STA_MFP);
|
||||||
|
|
||||||
|
if (params->assoc)
|
||||||
|
set_bit(WLAN_STA_ASSOC, &sta._flags);
|
||||||
|
|
||||||
|
rx.skb = kunit_zalloc_skb(test, 128, GFP_KERNEL);
|
||||||
|
KUNIT_ASSERT_NOT_NULL(test, rx.skb);
|
||||||
|
status = IEEE80211_SKB_RXCB(rx.skb);
|
||||||
|
|
||||||
|
if (params->decrypted) {
|
||||||
|
status->flag |= RX_FLAG_DECRYPTED;
|
||||||
|
if (params->unicast)
|
||||||
|
hdr.frame_control |=
|
||||||
|
cpu_to_le16(IEEE80211_FCTL_PROTECTED);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (params->unicast)
|
||||||
|
hdr.addr1[0] = 0x02;
|
||||||
|
|
||||||
|
skb_put_data(rx.skb, &hdr, sizeof(hdr));
|
||||||
|
|
||||||
|
switch (params->stype) {
|
||||||
|
case IEEE80211_STYPE_ACTION:
|
||||||
|
skb_put_u8(rx.skb, params->category);
|
||||||
|
skb_put_u8(rx.skb, params->action);
|
||||||
|
break;
|
||||||
|
case IEEE80211_STYPE_DEAUTH:
|
||||||
|
case IEEE80211_STYPE_DISASSOC: {
|
||||||
|
__le16 reason = cpu_to_le16(WLAN_REASON_UNSPECIFIED);
|
||||||
|
|
||||||
|
skb_put_data(rx.skb, &reason, sizeof(reason));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
KUNIT_EXPECT_EQ(test,
|
||||||
|
(__force u32)ieee80211_drop_unencrypted_mgmt(&rx),
|
||||||
|
(__force u32)params->result);
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct kunit_case mfp_test_cases[] = {
|
||||||
|
KUNIT_CASE_PARAM(accept_mfp, accept_mfp_gen_params),
|
||||||
|
{}
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct kunit_suite mfp = {
|
||||||
|
.name = "mac80211-mfp",
|
||||||
|
.test_cases = mfp_test_cases,
|
||||||
|
};
|
||||||
|
|
||||||
|
kunit_test_suite(mfp);
|
|
@ -3,7 +3,7 @@
|
||||||
* Wireless configuration interface internals.
|
* Wireless configuration interface internals.
|
||||||
*
|
*
|
||||||
* Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net>
|
* Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net>
|
||||||
* Copyright (C) 2018-2022 Intel Corporation
|
* Copyright (C) 2018-2023 Intel Corporation
|
||||||
*/
|
*/
|
||||||
#ifndef __NET_WIRELESS_CORE_H
|
#ifndef __NET_WIRELESS_CORE_H
|
||||||
#define __NET_WIRELESS_CORE_H
|
#define __NET_WIRELESS_CORE_H
|
||||||
|
@ -549,4 +549,15 @@ int cfg80211_remove_virtual_intf(struct cfg80211_registered_device *rdev,
|
||||||
struct wireless_dev *wdev);
|
struct wireless_dev *wdev);
|
||||||
void cfg80211_wdev_release_link_bsses(struct wireless_dev *wdev, u16 link_mask);
|
void cfg80211_wdev_release_link_bsses(struct wireless_dev *wdev, u16 link_mask);
|
||||||
|
|
||||||
|
#if IS_ENABLED(CONFIG_CFG80211_KUNIT_TEST)
|
||||||
|
#define EXPORT_SYMBOL_IF_CFG80211_KUNIT(sym) EXPORT_SYMBOL_IF_KUNIT(sym)
|
||||||
|
#define VISIBLE_IF_CFG80211_KUNIT
|
||||||
|
size_t cfg80211_gen_new_ie(const u8 *ie, size_t ielen,
|
||||||
|
const u8 *subie, size_t subie_len,
|
||||||
|
u8 *new_ie, size_t new_ie_len);
|
||||||
|
#else
|
||||||
|
#define EXPORT_SYMBOL_IF_CFG80211_KUNIT(sym)
|
||||||
|
#define VISIBLE_IF_CFG80211_KUNIT static
|
||||||
|
#endif /* IS_ENABLED(CONFIG_CFG80211_KUNIT_TEST) */
|
||||||
|
|
||||||
#endif /* __NET_WIRELESS_CORE_H */
|
#endif /* __NET_WIRELESS_CORE_H */
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
#include <net/cfg80211.h>
|
#include <net/cfg80211.h>
|
||||||
#include <net/cfg80211-wext.h>
|
#include <net/cfg80211-wext.h>
|
||||||
#include <net/iw_handler.h>
|
#include <net/iw_handler.h>
|
||||||
|
#include <kunit/visibility.h>
|
||||||
#include "core.h"
|
#include "core.h"
|
||||||
#include "nl80211.h"
|
#include "nl80211.h"
|
||||||
#include "wext-compat.h"
|
#include "wext-compat.h"
|
||||||
|
@ -303,9 +304,10 @@ static size_t cfg80211_copy_elem_with_frags(const struct element *elem,
|
||||||
return *pos - buf;
|
return *pos - buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
static size_t cfg80211_gen_new_ie(const u8 *ie, size_t ielen,
|
VISIBLE_IF_CFG80211_KUNIT size_t
|
||||||
const u8 *subie, size_t subie_len,
|
cfg80211_gen_new_ie(const u8 *ie, size_t ielen,
|
||||||
u8 *new_ie, size_t new_ie_len)
|
const u8 *subie, size_t subie_len,
|
||||||
|
u8 *new_ie, size_t new_ie_len)
|
||||||
{
|
{
|
||||||
const struct element *non_inherit_elem, *parent, *sub;
|
const struct element *non_inherit_elem, *parent, *sub;
|
||||||
u8 *pos = new_ie;
|
u8 *pos = new_ie;
|
||||||
|
@ -413,6 +415,7 @@ static size_t cfg80211_gen_new_ie(const u8 *ie, size_t ielen,
|
||||||
|
|
||||||
return pos - new_ie;
|
return pos - new_ie;
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL_IF_CFG80211_KUNIT(cfg80211_gen_new_ie);
|
||||||
|
|
||||||
static bool is_bss(struct cfg80211_bss *a, const u8 *bssid,
|
static bool is_bss(struct cfg80211_bss *a, const u8 *bssid,
|
||||||
const u8 *ssid, size_t ssid_len)
|
const u8 *ssid, size_t ssid_len)
|
||||||
|
@ -1864,7 +1867,7 @@ __cfg80211_bss_update(struct cfg80211_registered_device *rdev,
|
||||||
&hidden->hidden_list);
|
&hidden->hidden_list);
|
||||||
hidden->refcount++;
|
hidden->refcount++;
|
||||||
|
|
||||||
ies = (void *)rcu_dereference(new->pub.beacon_ies);
|
ies = (void *)rcu_access_pointer(new->pub.beacon_ies);
|
||||||
rcu_assign_pointer(new->pub.beacon_ies,
|
rcu_assign_pointer(new->pub.beacon_ies,
|
||||||
hidden->pub.beacon_ies);
|
hidden->pub.beacon_ies);
|
||||||
if (ies)
|
if (ies)
|
||||||
|
@ -2614,10 +2617,12 @@ cfg80211_tbtt_info_for_mld_ap(const u8 *ie, size_t ielen, u8 mld_id, u8 link_id,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void cfg80211_parse_ml_sta_data(struct wiphy *wiphy,
|
static void
|
||||||
struct cfg80211_inform_single_bss_data *tx_data,
|
cfg80211_parse_ml_elem_sta_data(struct wiphy *wiphy,
|
||||||
struct cfg80211_bss *source_bss,
|
struct cfg80211_inform_single_bss_data *tx_data,
|
||||||
gfp_t gfp)
|
struct cfg80211_bss *source_bss,
|
||||||
|
const struct element *elem,
|
||||||
|
gfp_t gfp)
|
||||||
{
|
{
|
||||||
struct cfg80211_inform_single_bss_data data = {
|
struct cfg80211_inform_single_bss_data data = {
|
||||||
.drv_data = tx_data->drv_data,
|
.drv_data = tx_data->drv_data,
|
||||||
|
@ -2626,7 +2631,6 @@ static void cfg80211_parse_ml_sta_data(struct wiphy *wiphy,
|
||||||
.bss_source = BSS_SOURCE_STA_PROFILE,
|
.bss_source = BSS_SOURCE_STA_PROFILE,
|
||||||
};
|
};
|
||||||
struct ieee80211_multi_link_elem *ml_elem;
|
struct ieee80211_multi_link_elem *ml_elem;
|
||||||
const struct element *elem;
|
|
||||||
struct cfg80211_mle *mle;
|
struct cfg80211_mle *mle;
|
||||||
u16 control;
|
u16 control;
|
||||||
u8 ml_common_len;
|
u8 ml_common_len;
|
||||||
|
@ -2637,15 +2641,7 @@ static void cfg80211_parse_ml_sta_data(struct wiphy *wiphy,
|
||||||
const u8 *pos;
|
const u8 *pos;
|
||||||
u8 i;
|
u8 i;
|
||||||
|
|
||||||
if (!source_bss)
|
if (!ieee80211_mle_size_ok(elem->data + 1, elem->datalen - 1))
|
||||||
return;
|
|
||||||
|
|
||||||
if (tx_data->ftype != CFG80211_BSS_FTYPE_PRESP)
|
|
||||||
return;
|
|
||||||
|
|
||||||
elem = cfg80211_find_ext_elem(WLAN_EID_EXT_EHT_MULTI_LINK,
|
|
||||||
tx_data->ie, tx_data->ielen);
|
|
||||||
if (!elem || !ieee80211_mle_size_ok(elem->data + 1, elem->datalen - 1))
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
ml_elem = (void *)elem->data + 1;
|
ml_elem = (void *)elem->data + 1;
|
||||||
|
@ -2673,8 +2669,11 @@ static void cfg80211_parse_ml_sta_data(struct wiphy *wiphy,
|
||||||
/* MLD capabilities and operations */
|
/* MLD capabilities and operations */
|
||||||
pos += 2;
|
pos += 2;
|
||||||
|
|
||||||
/* Not included when the (nontransmitted) AP is responding itself,
|
/*
|
||||||
* but defined to zero then (Draft P802.11be_D3.0, 9.4.2.170.2)
|
* The MLD ID of the reporting AP is always zero. It is set if the AP
|
||||||
|
* is part of an MBSSID set and will be non-zero for ML Elements
|
||||||
|
* relating to a nontransmitted BSS (matching the Multi-BSSID Index,
|
||||||
|
* Draft P802.11be_D3.2, 35.3.4.2)
|
||||||
*/
|
*/
|
||||||
if (u16_get_bits(control, IEEE80211_MLC_BASIC_PRES_MLD_ID)) {
|
if (u16_get_bits(control, IEEE80211_MLC_BASIC_PRES_MLD_ID)) {
|
||||||
mld_id = *pos;
|
mld_id = *pos;
|
||||||
|
@ -2817,6 +2816,25 @@ static void cfg80211_parse_ml_sta_data(struct wiphy *wiphy,
|
||||||
kfree(mle);
|
kfree(mle);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void cfg80211_parse_ml_sta_data(struct wiphy *wiphy,
|
||||||
|
struct cfg80211_inform_single_bss_data *tx_data,
|
||||||
|
struct cfg80211_bss *source_bss,
|
||||||
|
gfp_t gfp)
|
||||||
|
{
|
||||||
|
const struct element *elem;
|
||||||
|
|
||||||
|
if (!source_bss)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (tx_data->ftype != CFG80211_BSS_FTYPE_PRESP)
|
||||||
|
return;
|
||||||
|
|
||||||
|
for_each_element_extid(elem, WLAN_EID_EXT_EHT_MULTI_LINK,
|
||||||
|
tx_data->ie, tx_data->ielen)
|
||||||
|
cfg80211_parse_ml_elem_sta_data(wiphy, tx_data, source_bss,
|
||||||
|
elem, gfp);
|
||||||
|
}
|
||||||
|
|
||||||
struct cfg80211_bss *
|
struct cfg80211_bss *
|
||||||
cfg80211_inform_bss_data(struct wiphy *wiphy,
|
cfg80211_inform_bss_data(struct wiphy *wiphy,
|
||||||
struct cfg80211_inform_bss *data,
|
struct cfg80211_inform_bss *data,
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
cfg80211-tests-y += module.o fragmentation.o
|
cfg80211-tests-y += module.o fragmentation.o scan.o util.o
|
||||||
|
|
||||||
obj-$(CONFIG_CFG80211_KUNIT_TEST) += cfg80211-tests.o
|
obj-$(CONFIG_CFG80211_KUNIT_TEST) += cfg80211-tests.o
|
||||||
|
|
625
net/wireless/tests/scan.c
Normal file
625
net/wireless/tests/scan.c
Normal file
|
@ -0,0 +1,625 @@
|
||||||
|
// SPDX-License-Identifier: GPL-2.0-only
|
||||||
|
/*
|
||||||
|
* KUnit tests for inform_bss functions
|
||||||
|
*
|
||||||
|
* Copyright (C) 2023 Intel Corporation
|
||||||
|
*/
|
||||||
|
#include <linux/ieee80211.h>
|
||||||
|
#include <net/cfg80211.h>
|
||||||
|
#include <kunit/test.h>
|
||||||
|
#include <kunit/skbuff.h>
|
||||||
|
#include "../core.h"
|
||||||
|
#include "util.h"
|
||||||
|
|
||||||
|
/* mac80211 helpers for element building */
|
||||||
|
#include "../../mac80211/ieee80211_i.h"
|
||||||
|
|
||||||
|
MODULE_IMPORT_NS(EXPORTED_FOR_KUNIT_TESTING);
|
||||||
|
|
||||||
|
struct test_elem {
|
||||||
|
u8 id;
|
||||||
|
u8 len;
|
||||||
|
union {
|
||||||
|
u8 data[255];
|
||||||
|
struct {
|
||||||
|
u8 eid;
|
||||||
|
u8 edata[254];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct gen_new_ie_case {
|
||||||
|
const char *desc;
|
||||||
|
struct test_elem parent_ies[16];
|
||||||
|
struct test_elem child_ies[16];
|
||||||
|
struct test_elem result_ies[16];
|
||||||
|
} gen_new_ie_cases[] = {
|
||||||
|
{
|
||||||
|
.desc = "ML not inherited",
|
||||||
|
.parent_ies = {
|
||||||
|
{ .id = WLAN_EID_EXTENSION, .len = 255,
|
||||||
|
.eid = WLAN_EID_EXT_EHT_MULTI_LINK },
|
||||||
|
},
|
||||||
|
.child_ies = {
|
||||||
|
{ .id = WLAN_EID_SSID, .len = 2 },
|
||||||
|
},
|
||||||
|
.result_ies = {
|
||||||
|
{ .id = WLAN_EID_SSID, .len = 2 },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.desc = "fragments are ignored if previous len not 255",
|
||||||
|
.parent_ies = {
|
||||||
|
{ .id = WLAN_EID_REDUCED_NEIGHBOR_REPORT, .len = 254, },
|
||||||
|
{ .id = WLAN_EID_FRAGMENT, .len = 125, },
|
||||||
|
},
|
||||||
|
.child_ies = {
|
||||||
|
{ .id = WLAN_EID_SSID, .len = 2 },
|
||||||
|
{ .id = WLAN_EID_FRAGMENT, .len = 125, },
|
||||||
|
},
|
||||||
|
.result_ies = {
|
||||||
|
{ .id = WLAN_EID_REDUCED_NEIGHBOR_REPORT, .len = 254, },
|
||||||
|
{ .id = WLAN_EID_SSID, .len = 2 },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.desc = "fragments inherited",
|
||||||
|
.parent_ies = {
|
||||||
|
{ .id = WLAN_EID_REDUCED_NEIGHBOR_REPORT, .len = 255, },
|
||||||
|
{ .id = WLAN_EID_FRAGMENT, .len = 125, },
|
||||||
|
},
|
||||||
|
.child_ies = {
|
||||||
|
{ .id = WLAN_EID_SSID, .len = 2 },
|
||||||
|
},
|
||||||
|
.result_ies = {
|
||||||
|
{ .id = WLAN_EID_REDUCED_NEIGHBOR_REPORT, .len = 255, },
|
||||||
|
{ .id = WLAN_EID_FRAGMENT, .len = 125, },
|
||||||
|
{ .id = WLAN_EID_SSID, .len = 2 },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.desc = "fragments copied",
|
||||||
|
.parent_ies = {
|
||||||
|
{ .id = WLAN_EID_REDUCED_NEIGHBOR_REPORT, .len = 255, },
|
||||||
|
{ .id = WLAN_EID_FRAGMENT, .len = 125, },
|
||||||
|
},
|
||||||
|
.child_ies = {
|
||||||
|
{ .id = WLAN_EID_SSID, .len = 2 },
|
||||||
|
},
|
||||||
|
.result_ies = {
|
||||||
|
{ .id = WLAN_EID_REDUCED_NEIGHBOR_REPORT, .len = 255, },
|
||||||
|
{ .id = WLAN_EID_FRAGMENT, .len = 125, },
|
||||||
|
{ .id = WLAN_EID_SSID, .len = 2 },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.desc = "multiple elements inherit",
|
||||||
|
.parent_ies = {
|
||||||
|
{ .id = WLAN_EID_REDUCED_NEIGHBOR_REPORT, .len = 255, },
|
||||||
|
{ .id = WLAN_EID_FRAGMENT, .len = 125, },
|
||||||
|
{ .id = WLAN_EID_REDUCED_NEIGHBOR_REPORT, .len = 123, },
|
||||||
|
},
|
||||||
|
.child_ies = {
|
||||||
|
{ .id = WLAN_EID_SSID, .len = 2 },
|
||||||
|
},
|
||||||
|
.result_ies = {
|
||||||
|
{ .id = WLAN_EID_REDUCED_NEIGHBOR_REPORT, .len = 255, },
|
||||||
|
{ .id = WLAN_EID_FRAGMENT, .len = 125, },
|
||||||
|
{ .id = WLAN_EID_REDUCED_NEIGHBOR_REPORT, .len = 123, },
|
||||||
|
{ .id = WLAN_EID_SSID, .len = 2 },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.desc = "one child element overrides",
|
||||||
|
.parent_ies = {
|
||||||
|
{ .id = WLAN_EID_REDUCED_NEIGHBOR_REPORT, .len = 255, },
|
||||||
|
{ .id = WLAN_EID_FRAGMENT, .len = 125, },
|
||||||
|
{ .id = WLAN_EID_REDUCED_NEIGHBOR_REPORT, .len = 123, },
|
||||||
|
},
|
||||||
|
.child_ies = {
|
||||||
|
{ .id = WLAN_EID_REDUCED_NEIGHBOR_REPORT, .len = 127, },
|
||||||
|
{ .id = WLAN_EID_SSID, .len = 2 },
|
||||||
|
},
|
||||||
|
.result_ies = {
|
||||||
|
{ .id = WLAN_EID_REDUCED_NEIGHBOR_REPORT, .len = 127, },
|
||||||
|
{ .id = WLAN_EID_SSID, .len = 2 },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.desc = "empty elements from parent",
|
||||||
|
.parent_ies = {
|
||||||
|
{ .id = 0x1, .len = 0, },
|
||||||
|
{ .id = WLAN_EID_EXTENSION, .len = 1, .eid = 0x10 },
|
||||||
|
},
|
||||||
|
.child_ies = {
|
||||||
|
},
|
||||||
|
.result_ies = {
|
||||||
|
{ .id = 0x1, .len = 0, },
|
||||||
|
{ .id = WLAN_EID_EXTENSION, .len = 1, .eid = 0x10 },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.desc = "empty elements from child",
|
||||||
|
.parent_ies = {
|
||||||
|
},
|
||||||
|
.child_ies = {
|
||||||
|
{ .id = 0x1, .len = 0, },
|
||||||
|
{ .id = WLAN_EID_EXTENSION, .len = 1, .eid = 0x10 },
|
||||||
|
},
|
||||||
|
.result_ies = {
|
||||||
|
{ .id = 0x1, .len = 0, },
|
||||||
|
{ .id = WLAN_EID_EXTENSION, .len = 1, .eid = 0x10 },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.desc = "invalid extended elements ignored",
|
||||||
|
.parent_ies = {
|
||||||
|
{ .id = WLAN_EID_EXTENSION, .len = 0 },
|
||||||
|
},
|
||||||
|
.child_ies = {
|
||||||
|
{ .id = WLAN_EID_EXTENSION, .len = 0 },
|
||||||
|
},
|
||||||
|
.result_ies = {
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.desc = "multiple extended elements",
|
||||||
|
.parent_ies = {
|
||||||
|
{ .id = WLAN_EID_EXTENSION, .len = 3,
|
||||||
|
.eid = WLAN_EID_EXT_HE_CAPABILITY },
|
||||||
|
{ .id = WLAN_EID_EXTENSION, .len = 5,
|
||||||
|
.eid = WLAN_EID_EXT_ASSOC_DELAY_INFO },
|
||||||
|
{ .id = WLAN_EID_EXTENSION, .len = 7,
|
||||||
|
.eid = WLAN_EID_EXT_HE_OPERATION },
|
||||||
|
{ .id = WLAN_EID_EXTENSION, .len = 11,
|
||||||
|
.eid = WLAN_EID_EXT_FILS_REQ_PARAMS },
|
||||||
|
},
|
||||||
|
.child_ies = {
|
||||||
|
{ .id = WLAN_EID_SSID, .len = 13 },
|
||||||
|
{ .id = WLAN_EID_EXTENSION, .len = 17,
|
||||||
|
.eid = WLAN_EID_EXT_HE_CAPABILITY },
|
||||||
|
{ .id = WLAN_EID_EXTENSION, .len = 11,
|
||||||
|
.eid = WLAN_EID_EXT_FILS_KEY_CONFIRM },
|
||||||
|
{ .id = WLAN_EID_EXTENSION, .len = 19,
|
||||||
|
.eid = WLAN_EID_EXT_HE_OPERATION },
|
||||||
|
},
|
||||||
|
.result_ies = {
|
||||||
|
{ .id = WLAN_EID_EXTENSION, .len = 17,
|
||||||
|
.eid = WLAN_EID_EXT_HE_CAPABILITY },
|
||||||
|
{ .id = WLAN_EID_EXTENSION, .len = 5,
|
||||||
|
.eid = WLAN_EID_EXT_ASSOC_DELAY_INFO },
|
||||||
|
{ .id = WLAN_EID_EXTENSION, .len = 19,
|
||||||
|
.eid = WLAN_EID_EXT_HE_OPERATION },
|
||||||
|
{ .id = WLAN_EID_EXTENSION, .len = 11,
|
||||||
|
.eid = WLAN_EID_EXT_FILS_REQ_PARAMS },
|
||||||
|
{ .id = WLAN_EID_SSID, .len = 13 },
|
||||||
|
{ .id = WLAN_EID_EXTENSION, .len = 11,
|
||||||
|
.eid = WLAN_EID_EXT_FILS_KEY_CONFIRM },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.desc = "non-inherit element",
|
||||||
|
.parent_ies = {
|
||||||
|
{ .id = 0x1, .len = 7, },
|
||||||
|
{ .id = 0x2, .len = 11, },
|
||||||
|
{ .id = 0x3, .len = 13, },
|
||||||
|
{ .id = WLAN_EID_EXTENSION, .len = 17, .eid = 0x10 },
|
||||||
|
{ .id = WLAN_EID_EXTENSION, .len = 19, .eid = 0x11 },
|
||||||
|
{ .id = WLAN_EID_EXTENSION, .len = 23, .eid = 0x12 },
|
||||||
|
{ .id = WLAN_EID_EXTENSION, .len = 29, .eid = 0x14 },
|
||||||
|
},
|
||||||
|
.child_ies = {
|
||||||
|
{ .id = WLAN_EID_EXTENSION,
|
||||||
|
.eid = WLAN_EID_EXT_NON_INHERITANCE,
|
||||||
|
.len = 10,
|
||||||
|
.edata = { 0x3, 0x1, 0x2, 0x3,
|
||||||
|
0x4, 0x10, 0x11, 0x13, 0x14 } },
|
||||||
|
{ .id = WLAN_EID_SSID, .len = 2 },
|
||||||
|
},
|
||||||
|
.result_ies = {
|
||||||
|
{ .id = WLAN_EID_EXTENSION, .len = 23, .eid = 0x12 },
|
||||||
|
{ .id = WLAN_EID_SSID, .len = 2 },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
KUNIT_ARRAY_PARAM_DESC(gen_new_ie, gen_new_ie_cases, desc)
|
||||||
|
|
||||||
|
static void test_gen_new_ie(struct kunit *test)
|
||||||
|
{
|
||||||
|
const struct gen_new_ie_case *params = test->param_value;
|
||||||
|
struct sk_buff *parent = kunit_zalloc_skb(test, 1024, GFP_KERNEL);
|
||||||
|
struct sk_buff *child = kunit_zalloc_skb(test, 1024, GFP_KERNEL);
|
||||||
|
struct sk_buff *reference = kunit_zalloc_skb(test, 1024, GFP_KERNEL);
|
||||||
|
u8 *out = kunit_kzalloc(test, IEEE80211_MAX_DATA_LEN, GFP_KERNEL);
|
||||||
|
size_t len;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
KUNIT_ASSERT_NOT_NULL(test, parent);
|
||||||
|
KUNIT_ASSERT_NOT_NULL(test, child);
|
||||||
|
KUNIT_ASSERT_NOT_NULL(test, reference);
|
||||||
|
KUNIT_ASSERT_NOT_NULL(test, out);
|
||||||
|
|
||||||
|
for (i = 0; i < ARRAY_SIZE(params->parent_ies); i++) {
|
||||||
|
if (params->parent_ies[i].len != 0) {
|
||||||
|
skb_put_u8(parent, params->parent_ies[i].id);
|
||||||
|
skb_put_u8(parent, params->parent_ies[i].len);
|
||||||
|
skb_put_data(parent, params->parent_ies[i].data,
|
||||||
|
params->parent_ies[i].len);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (params->child_ies[i].len != 0) {
|
||||||
|
skb_put_u8(child, params->child_ies[i].id);
|
||||||
|
skb_put_u8(child, params->child_ies[i].len);
|
||||||
|
skb_put_data(child, params->child_ies[i].data,
|
||||||
|
params->child_ies[i].len);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (params->result_ies[i].len != 0) {
|
||||||
|
skb_put_u8(reference, params->result_ies[i].id);
|
||||||
|
skb_put_u8(reference, params->result_ies[i].len);
|
||||||
|
skb_put_data(reference, params->result_ies[i].data,
|
||||||
|
params->result_ies[i].len);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
len = cfg80211_gen_new_ie(parent->data, parent->len,
|
||||||
|
child->data, child->len,
|
||||||
|
out, IEEE80211_MAX_DATA_LEN);
|
||||||
|
KUNIT_EXPECT_EQ(test, len, reference->len);
|
||||||
|
KUNIT_EXPECT_MEMEQ(test, out, reference->data, reference->len);
|
||||||
|
memset(out, 0, IEEE80211_MAX_DATA_LEN);
|
||||||
|
|
||||||
|
/* Exactly enough space */
|
||||||
|
len = cfg80211_gen_new_ie(parent->data, parent->len,
|
||||||
|
child->data, child->len,
|
||||||
|
out, reference->len);
|
||||||
|
KUNIT_EXPECT_EQ(test, len, reference->len);
|
||||||
|
KUNIT_EXPECT_MEMEQ(test, out, reference->data, reference->len);
|
||||||
|
memset(out, 0, IEEE80211_MAX_DATA_LEN);
|
||||||
|
|
||||||
|
/* Not enough space (or expected zero length) */
|
||||||
|
len = cfg80211_gen_new_ie(parent->data, parent->len,
|
||||||
|
child->data, child->len,
|
||||||
|
out, reference->len - 1);
|
||||||
|
KUNIT_EXPECT_EQ(test, len, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void test_gen_new_ie_malformed(struct kunit *test)
|
||||||
|
{
|
||||||
|
struct sk_buff *malformed = kunit_zalloc_skb(test, 1024, GFP_KERNEL);
|
||||||
|
u8 *out = kunit_kzalloc(test, IEEE80211_MAX_DATA_LEN, GFP_KERNEL);
|
||||||
|
size_t len;
|
||||||
|
|
||||||
|
KUNIT_ASSERT_NOT_NULL(test, malformed);
|
||||||
|
KUNIT_ASSERT_NOT_NULL(test, out);
|
||||||
|
|
||||||
|
skb_put_u8(malformed, WLAN_EID_SSID);
|
||||||
|
skb_put_u8(malformed, 3);
|
||||||
|
skb_put(malformed, 3);
|
||||||
|
skb_put_u8(malformed, WLAN_EID_REDUCED_NEIGHBOR_REPORT);
|
||||||
|
skb_put_u8(malformed, 10);
|
||||||
|
skb_put(malformed, 9);
|
||||||
|
|
||||||
|
len = cfg80211_gen_new_ie(malformed->data, malformed->len,
|
||||||
|
out, 0,
|
||||||
|
out, IEEE80211_MAX_DATA_LEN);
|
||||||
|
KUNIT_EXPECT_EQ(test, len, 5);
|
||||||
|
|
||||||
|
len = cfg80211_gen_new_ie(out, 0,
|
||||||
|
malformed->data, malformed->len,
|
||||||
|
out, IEEE80211_MAX_DATA_LEN);
|
||||||
|
KUNIT_EXPECT_EQ(test, len, 5);
|
||||||
|
}
|
||||||
|
|
||||||
|
struct inform_bss {
|
||||||
|
struct kunit *test;
|
||||||
|
|
||||||
|
int inform_bss_count;
|
||||||
|
};
|
||||||
|
|
||||||
|
static void inform_bss_inc_counter(struct wiphy *wiphy,
|
||||||
|
struct cfg80211_bss *bss,
|
||||||
|
const struct cfg80211_bss_ies *ies,
|
||||||
|
void *drv_data)
|
||||||
|
{
|
||||||
|
struct inform_bss *ctx = t_wiphy_ctx(wiphy);
|
||||||
|
|
||||||
|
ctx->inform_bss_count++;
|
||||||
|
|
||||||
|
rcu_read_lock();
|
||||||
|
KUNIT_EXPECT_PTR_EQ(ctx->test, drv_data, ctx);
|
||||||
|
KUNIT_EXPECT_PTR_EQ(ctx->test, ies, rcu_dereference(bss->ies));
|
||||||
|
rcu_read_unlock();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void test_inform_bss_ssid_only(struct kunit *test)
|
||||||
|
{
|
||||||
|
struct inform_bss ctx = {
|
||||||
|
.test = test,
|
||||||
|
};
|
||||||
|
struct wiphy *wiphy = T_WIPHY(test, ctx);
|
||||||
|
struct t_wiphy_priv *w_priv = wiphy_priv(wiphy);
|
||||||
|
struct cfg80211_inform_bss inform_bss = {
|
||||||
|
.signal = 50,
|
||||||
|
.drv_data = &ctx,
|
||||||
|
};
|
||||||
|
const u8 bssid[ETH_ALEN] = { 0x10, 0x22, 0x33, 0x44, 0x55, 0x66 };
|
||||||
|
u64 tsf = 0x1000000000000000ULL;
|
||||||
|
int beacon_int = 100;
|
||||||
|
u16 capability = 0x1234;
|
||||||
|
static const u8 input[] = {
|
||||||
|
[0] = WLAN_EID_SSID,
|
||||||
|
[1] = 4,
|
||||||
|
[2] = 'T', 'E', 'S', 'T'
|
||||||
|
};
|
||||||
|
struct cfg80211_bss *bss, *other;
|
||||||
|
const struct cfg80211_bss_ies *ies;
|
||||||
|
|
||||||
|
w_priv->ops->inform_bss = inform_bss_inc_counter;
|
||||||
|
|
||||||
|
inform_bss.chan = ieee80211_get_channel_khz(wiphy, MHZ_TO_KHZ(2412));
|
||||||
|
KUNIT_ASSERT_NOT_NULL(test, inform_bss.chan);
|
||||||
|
|
||||||
|
bss = cfg80211_inform_bss_data(wiphy, &inform_bss,
|
||||||
|
CFG80211_BSS_FTYPE_PRESP, bssid, tsf,
|
||||||
|
capability, beacon_int,
|
||||||
|
input, sizeof(input),
|
||||||
|
GFP_KERNEL);
|
||||||
|
KUNIT_EXPECT_NOT_NULL(test, bss);
|
||||||
|
KUNIT_EXPECT_EQ(test, ctx.inform_bss_count, 1);
|
||||||
|
|
||||||
|
/* Check values in returned bss are correct */
|
||||||
|
KUNIT_EXPECT_EQ(test, bss->signal, inform_bss.signal);
|
||||||
|
KUNIT_EXPECT_EQ(test, bss->beacon_interval, beacon_int);
|
||||||
|
KUNIT_EXPECT_EQ(test, bss->capability, capability);
|
||||||
|
KUNIT_EXPECT_EQ(test, bss->bssid_index, 0);
|
||||||
|
KUNIT_EXPECT_PTR_EQ(test, bss->channel, inform_bss.chan);
|
||||||
|
KUNIT_EXPECT_MEMEQ(test, bssid, bss->bssid, sizeof(bssid));
|
||||||
|
|
||||||
|
/* Check the IEs have the expected value */
|
||||||
|
rcu_read_lock();
|
||||||
|
ies = rcu_dereference(bss->ies);
|
||||||
|
KUNIT_EXPECT_NOT_NULL(test, ies);
|
||||||
|
KUNIT_EXPECT_EQ(test, ies->tsf, tsf);
|
||||||
|
KUNIT_EXPECT_EQ(test, ies->len, sizeof(input));
|
||||||
|
KUNIT_EXPECT_MEMEQ(test, ies->data, input, sizeof(input));
|
||||||
|
rcu_read_unlock();
|
||||||
|
|
||||||
|
/* Check we can look up the BSS - by SSID */
|
||||||
|
other = cfg80211_get_bss(wiphy, NULL, NULL, "TEST", 4,
|
||||||
|
IEEE80211_BSS_TYPE_ANY,
|
||||||
|
IEEE80211_PRIVACY_ANY);
|
||||||
|
KUNIT_EXPECT_PTR_EQ(test, bss, other);
|
||||||
|
cfg80211_put_bss(wiphy, other);
|
||||||
|
|
||||||
|
/* Check we can look up the BSS - by BSSID */
|
||||||
|
other = cfg80211_get_bss(wiphy, NULL, bssid, NULL, 0,
|
||||||
|
IEEE80211_BSS_TYPE_ANY,
|
||||||
|
IEEE80211_PRIVACY_ANY);
|
||||||
|
KUNIT_EXPECT_PTR_EQ(test, bss, other);
|
||||||
|
cfg80211_put_bss(wiphy, other);
|
||||||
|
|
||||||
|
cfg80211_put_bss(wiphy, bss);
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct inform_bss_ml_sta_case {
|
||||||
|
const char *desc;
|
||||||
|
int mld_id;
|
||||||
|
bool sta_prof_vendor_elems;
|
||||||
|
} inform_bss_ml_sta_cases[] = {
|
||||||
|
{ .desc = "no_mld_id", .mld_id = 0, .sta_prof_vendor_elems = false },
|
||||||
|
{ .desc = "mld_id_eq_1", .mld_id = 1, .sta_prof_vendor_elems = true },
|
||||||
|
};
|
||||||
|
KUNIT_ARRAY_PARAM_DESC(inform_bss_ml_sta, inform_bss_ml_sta_cases, desc)
|
||||||
|
|
||||||
|
static void test_inform_bss_ml_sta(struct kunit *test)
|
||||||
|
{
|
||||||
|
const struct inform_bss_ml_sta_case *params = test->param_value;
|
||||||
|
struct inform_bss ctx = {
|
||||||
|
.test = test,
|
||||||
|
};
|
||||||
|
struct wiphy *wiphy = T_WIPHY(test, ctx);
|
||||||
|
struct t_wiphy_priv *w_priv = wiphy_priv(wiphy);
|
||||||
|
struct cfg80211_inform_bss inform_bss = {
|
||||||
|
.signal = 50,
|
||||||
|
.drv_data = &ctx,
|
||||||
|
};
|
||||||
|
struct cfg80211_bss *bss, *link_bss;
|
||||||
|
const struct cfg80211_bss_ies *ies;
|
||||||
|
|
||||||
|
/* sending station */
|
||||||
|
const u8 bssid[ETH_ALEN] = { 0x10, 0x22, 0x33, 0x44, 0x55, 0x66 };
|
||||||
|
u64 tsf = 0x1000000000000000ULL;
|
||||||
|
int beacon_int = 100;
|
||||||
|
u16 capability = 0x1234;
|
||||||
|
|
||||||
|
/* Building the frame *************************************************/
|
||||||
|
struct sk_buff *input = kunit_zalloc_skb(test, 1024, GFP_KERNEL);
|
||||||
|
u8 *len_mle, *len_prof;
|
||||||
|
u8 link_id = 2;
|
||||||
|
struct {
|
||||||
|
struct ieee80211_neighbor_ap_info info;
|
||||||
|
struct ieee80211_tbtt_info_ge_11 ap;
|
||||||
|
} __packed rnr = {
|
||||||
|
.info = {
|
||||||
|
.tbtt_info_hdr = u8_encode_bits(0, IEEE80211_AP_INFO_TBTT_HDR_COUNT),
|
||||||
|
.tbtt_info_len = sizeof(struct ieee80211_tbtt_info_ge_11),
|
||||||
|
.op_class = 81,
|
||||||
|
.channel = 11,
|
||||||
|
},
|
||||||
|
.ap = {
|
||||||
|
.tbtt_offset = 0xff,
|
||||||
|
.bssid = { 0x10, 0x22, 0x33, 0x44, 0x55, 0x67 },
|
||||||
|
.short_ssid = 0, /* unused */
|
||||||
|
.bss_params = 0,
|
||||||
|
.psd_20 = 0,
|
||||||
|
.mld_params.mld_id = params->mld_id,
|
||||||
|
.mld_params.params =
|
||||||
|
le16_encode_bits(link_id,
|
||||||
|
IEEE80211_RNR_MLD_PARAMS_LINK_ID),
|
||||||
|
}
|
||||||
|
};
|
||||||
|
struct {
|
||||||
|
__le16 control;
|
||||||
|
u8 var_len;
|
||||||
|
u8 mld_mac_addr[ETH_ALEN];
|
||||||
|
u8 link_id_info;
|
||||||
|
u8 params_change_count;
|
||||||
|
__le16 mld_caps_and_ops;
|
||||||
|
u8 mld_id;
|
||||||
|
__le16 ext_mld_caps_and_ops;
|
||||||
|
} __packed mle_basic_common_info = {
|
||||||
|
.control =
|
||||||
|
cpu_to_le16(IEEE80211_ML_CONTROL_TYPE_BASIC |
|
||||||
|
IEEE80211_MLC_BASIC_PRES_BSS_PARAM_CH_CNT |
|
||||||
|
IEEE80211_MLC_BASIC_PRES_LINK_ID |
|
||||||
|
(params->mld_id ? IEEE80211_MLC_BASIC_PRES_MLD_ID : 0) |
|
||||||
|
IEEE80211_MLC_BASIC_PRES_MLD_CAPA_OP),
|
||||||
|
.mld_id = params->mld_id,
|
||||||
|
.mld_caps_and_ops = cpu_to_le16(0x0102),
|
||||||
|
.ext_mld_caps_and_ops = cpu_to_le16(0x0304),
|
||||||
|
.var_len = sizeof(mle_basic_common_info) - 2 -
|
||||||
|
(params->mld_id ? 0 : 1),
|
||||||
|
.mld_mac_addr = { 0x10, 0x22, 0x33, 0x44, 0x55, 0x60 },
|
||||||
|
};
|
||||||
|
struct {
|
||||||
|
__le16 control;
|
||||||
|
u8 var_len;
|
||||||
|
u8 bssid[ETH_ALEN];
|
||||||
|
__le16 beacon_int;
|
||||||
|
__le64 tsf_offset;
|
||||||
|
__le16 capabilities; /* already part of payload */
|
||||||
|
} __packed sta_prof = {
|
||||||
|
.control =
|
||||||
|
cpu_to_le16(IEEE80211_MLE_STA_CONTROL_COMPLETE_PROFILE |
|
||||||
|
IEEE80211_MLE_STA_CONTROL_STA_MAC_ADDR_PRESENT |
|
||||||
|
IEEE80211_MLE_STA_CONTROL_BEACON_INT_PRESENT |
|
||||||
|
IEEE80211_MLE_STA_CONTROL_TSF_OFFS_PRESENT |
|
||||||
|
u16_encode_bits(link_id,
|
||||||
|
IEEE80211_MLE_STA_CONTROL_LINK_ID)),
|
||||||
|
.var_len = sizeof(sta_prof) - 2 - 2,
|
||||||
|
.bssid = { *rnr.ap.bssid },
|
||||||
|
.beacon_int = cpu_to_le16(101),
|
||||||
|
.tsf_offset = cpu_to_le64(-123ll),
|
||||||
|
.capabilities = cpu_to_le16(0xdead),
|
||||||
|
};
|
||||||
|
|
||||||
|
KUNIT_ASSERT_NOT_NULL(test, input);
|
||||||
|
|
||||||
|
w_priv->ops->inform_bss = inform_bss_inc_counter;
|
||||||
|
|
||||||
|
inform_bss.chan = ieee80211_get_channel_khz(wiphy, MHZ_TO_KHZ(2412));
|
||||||
|
KUNIT_ASSERT_NOT_NULL(test, inform_bss.chan);
|
||||||
|
|
||||||
|
skb_put_u8(input, WLAN_EID_SSID);
|
||||||
|
skb_put_u8(input, 4);
|
||||||
|
skb_put_data(input, "TEST", 4);
|
||||||
|
|
||||||
|
skb_put_u8(input, WLAN_EID_REDUCED_NEIGHBOR_REPORT);
|
||||||
|
skb_put_u8(input, sizeof(rnr));
|
||||||
|
skb_put_data(input, &rnr, sizeof(rnr));
|
||||||
|
|
||||||
|
/* build a multi-link element */
|
||||||
|
skb_put_u8(input, WLAN_EID_EXTENSION);
|
||||||
|
len_mle = skb_put(input, 1);
|
||||||
|
skb_put_u8(input, WLAN_EID_EXT_EHT_MULTI_LINK);
|
||||||
|
skb_put_data(input, &mle_basic_common_info, sizeof(mle_basic_common_info));
|
||||||
|
if (!params->mld_id)
|
||||||
|
t_skb_remove_member(input, typeof(mle_basic_common_info), mld_id);
|
||||||
|
/* with a STA profile inside */
|
||||||
|
skb_put_u8(input, IEEE80211_MLE_SUBELEM_PER_STA_PROFILE);
|
||||||
|
len_prof = skb_put(input, 1);
|
||||||
|
skb_put_data(input, &sta_prof, sizeof(sta_prof));
|
||||||
|
|
||||||
|
if (params->sta_prof_vendor_elems) {
|
||||||
|
/* Put two (vendor) element into sta_prof */
|
||||||
|
skb_put_u8(input, WLAN_EID_VENDOR_SPECIFIC);
|
||||||
|
skb_put_u8(input, 160);
|
||||||
|
skb_put(input, 160);
|
||||||
|
|
||||||
|
skb_put_u8(input, WLAN_EID_VENDOR_SPECIFIC);
|
||||||
|
skb_put_u8(input, 165);
|
||||||
|
skb_put(input, 165);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* fragment STA profile */
|
||||||
|
ieee80211_fragment_element(input, len_prof,
|
||||||
|
IEEE80211_MLE_SUBELEM_FRAGMENT);
|
||||||
|
/* fragment MLE */
|
||||||
|
ieee80211_fragment_element(input, len_mle, WLAN_EID_FRAGMENT);
|
||||||
|
|
||||||
|
/* Put a (vendor) element after the ML element */
|
||||||
|
skb_put_u8(input, WLAN_EID_VENDOR_SPECIFIC);
|
||||||
|
skb_put_u8(input, 155);
|
||||||
|
skb_put(input, 155);
|
||||||
|
|
||||||
|
/* Submit *************************************************************/
|
||||||
|
bss = cfg80211_inform_bss_data(wiphy, &inform_bss,
|
||||||
|
CFG80211_BSS_FTYPE_PRESP, bssid, tsf,
|
||||||
|
capability, beacon_int,
|
||||||
|
input->data, input->len,
|
||||||
|
GFP_KERNEL);
|
||||||
|
KUNIT_EXPECT_NOT_NULL(test, bss);
|
||||||
|
KUNIT_EXPECT_EQ(test, ctx.inform_bss_count, 2);
|
||||||
|
|
||||||
|
/* Check link_bss *****************************************************/
|
||||||
|
link_bss = cfg80211_get_bss(wiphy, NULL, sta_prof.bssid, NULL, 0,
|
||||||
|
IEEE80211_BSS_TYPE_ANY,
|
||||||
|
IEEE80211_PRIVACY_ANY);
|
||||||
|
KUNIT_ASSERT_NOT_NULL(test, link_bss);
|
||||||
|
KUNIT_EXPECT_EQ(test, link_bss->signal, 0);
|
||||||
|
KUNIT_EXPECT_EQ(test, link_bss->beacon_interval,
|
||||||
|
le16_to_cpu(sta_prof.beacon_int));
|
||||||
|
KUNIT_EXPECT_EQ(test, link_bss->capability,
|
||||||
|
le16_to_cpu(sta_prof.capabilities));
|
||||||
|
KUNIT_EXPECT_EQ(test, link_bss->bssid_index, 0);
|
||||||
|
KUNIT_EXPECT_PTR_EQ(test, link_bss->channel,
|
||||||
|
ieee80211_get_channel_khz(wiphy, MHZ_TO_KHZ(2462)));
|
||||||
|
|
||||||
|
rcu_read_lock();
|
||||||
|
ies = rcu_dereference(link_bss->ies);
|
||||||
|
KUNIT_EXPECT_NOT_NULL(test, ies);
|
||||||
|
KUNIT_EXPECT_EQ(test, ies->tsf, tsf + le64_to_cpu(sta_prof.tsf_offset));
|
||||||
|
/* Resulting length should be:
|
||||||
|
* SSID (inherited) + RNR (inherited) + vendor element(s) +
|
||||||
|
* MLE common info + MLE header and control
|
||||||
|
*/
|
||||||
|
if (params->sta_prof_vendor_elems)
|
||||||
|
KUNIT_EXPECT_EQ(test, ies->len,
|
||||||
|
6 + 2 + sizeof(rnr) + 2 + 160 + 2 + 165 +
|
||||||
|
mle_basic_common_info.var_len + 5);
|
||||||
|
else
|
||||||
|
KUNIT_EXPECT_EQ(test, ies->len,
|
||||||
|
6 + 2 + sizeof(rnr) + 2 + 155 +
|
||||||
|
mle_basic_common_info.var_len + 5);
|
||||||
|
rcu_read_unlock();
|
||||||
|
|
||||||
|
cfg80211_put_bss(wiphy, bss);
|
||||||
|
cfg80211_put_bss(wiphy, link_bss);
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct kunit_case gen_new_ie_test_cases[] = {
|
||||||
|
KUNIT_CASE_PARAM(test_gen_new_ie, gen_new_ie_gen_params),
|
||||||
|
KUNIT_CASE(test_gen_new_ie_malformed),
|
||||||
|
{}
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct kunit_suite gen_new_ie = {
|
||||||
|
.name = "cfg80211-ie-generation",
|
||||||
|
.test_cases = gen_new_ie_test_cases,
|
||||||
|
};
|
||||||
|
|
||||||
|
kunit_test_suite(gen_new_ie);
|
||||||
|
|
||||||
|
static struct kunit_case inform_bss_test_cases[] = {
|
||||||
|
KUNIT_CASE(test_inform_bss_ssid_only),
|
||||||
|
KUNIT_CASE_PARAM(test_inform_bss_ml_sta, inform_bss_ml_sta_gen_params),
|
||||||
|
{}
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct kunit_suite inform_bss = {
|
||||||
|
.name = "cfg80211-inform-bss",
|
||||||
|
.test_cases = inform_bss_test_cases,
|
||||||
|
};
|
||||||
|
|
||||||
|
kunit_test_suite(inform_bss);
|
56
net/wireless/tests/util.c
Normal file
56
net/wireless/tests/util.c
Normal file
|
@ -0,0 +1,56 @@
|
||||||
|
// SPDX-License-Identifier: GPL-2.0-only
|
||||||
|
/*
|
||||||
|
* KUnit fixture to have a (configurable) wiphy
|
||||||
|
*
|
||||||
|
* Copyright (C) 2023 Intel Corporation
|
||||||
|
*/
|
||||||
|
#include <linux/ieee80211.h>
|
||||||
|
#include <net/cfg80211.h>
|
||||||
|
#include <kunit/test.h>
|
||||||
|
#include <kunit/test-bug.h>
|
||||||
|
#include "util.h"
|
||||||
|
|
||||||
|
int t_wiphy_init(struct kunit_resource *resource, void *ctx)
|
||||||
|
{
|
||||||
|
struct kunit *test = kunit_get_current_test();
|
||||||
|
struct cfg80211_ops *ops;
|
||||||
|
struct wiphy *wiphy;
|
||||||
|
struct t_wiphy_priv *priv;
|
||||||
|
|
||||||
|
ops = kzalloc(sizeof(*ops), GFP_KERNEL);
|
||||||
|
KUNIT_ASSERT_NOT_NULL(test, ops);
|
||||||
|
|
||||||
|
wiphy = wiphy_new_nm(ops, sizeof(*priv), "kunit");
|
||||||
|
KUNIT_ASSERT_NOT_NULL(test, wiphy);
|
||||||
|
|
||||||
|
priv = wiphy_priv(wiphy);
|
||||||
|
priv->ctx = ctx;
|
||||||
|
priv->ops = ops;
|
||||||
|
|
||||||
|
/* Initialize channels, feel free to add more here channels/bands */
|
||||||
|
memcpy(priv->channels_2ghz, channels_2ghz, sizeof(channels_2ghz));
|
||||||
|
wiphy->bands[NL80211_BAND_2GHZ] = &priv->band_2ghz;
|
||||||
|
priv->band_2ghz.channels = priv->channels_2ghz;
|
||||||
|
priv->band_2ghz.n_channels = ARRAY_SIZE(channels_2ghz);
|
||||||
|
|
||||||
|
resource->data = wiphy;
|
||||||
|
resource->name = "wiphy";
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void t_wiphy_exit(struct kunit_resource *resource)
|
||||||
|
{
|
||||||
|
struct t_wiphy_priv *priv;
|
||||||
|
struct cfg80211_ops *ops;
|
||||||
|
|
||||||
|
priv = wiphy_priv(resource->data);
|
||||||
|
ops = priv->ops;
|
||||||
|
|
||||||
|
/* Should we ensure anything about the state here?
|
||||||
|
* e.g. full destruction or no calls to any ops on destruction?
|
||||||
|
*/
|
||||||
|
|
||||||
|
wiphy_free(resource->data);
|
||||||
|
kfree(ops);
|
||||||
|
}
|
66
net/wireless/tests/util.h
Normal file
66
net/wireless/tests/util.h
Normal file
|
@ -0,0 +1,66 @@
|
||||||
|
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||||
|
/*
|
||||||
|
* Utilities for cfg80211 unit testing
|
||||||
|
*
|
||||||
|
* Copyright (C) 2023 Intel Corporation
|
||||||
|
*/
|
||||||
|
#ifndef __CFG80211_UTILS_H
|
||||||
|
#define __CFG80211_UTILS_H
|
||||||
|
|
||||||
|
#define CHAN2G(_freq) { \
|
||||||
|
.band = NL80211_BAND_2GHZ, \
|
||||||
|
.center_freq = (_freq), \
|
||||||
|
.hw_value = (_freq), \
|
||||||
|
}
|
||||||
|
|
||||||
|
static const struct ieee80211_channel channels_2ghz[] = {
|
||||||
|
CHAN2G(2412), /* Channel 1 */
|
||||||
|
CHAN2G(2417), /* Channel 2 */
|
||||||
|
CHAN2G(2422), /* Channel 3 */
|
||||||
|
CHAN2G(2427), /* Channel 4 */
|
||||||
|
CHAN2G(2432), /* Channel 5 */
|
||||||
|
CHAN2G(2437), /* Channel 6 */
|
||||||
|
CHAN2G(2442), /* Channel 7 */
|
||||||
|
CHAN2G(2447), /* Channel 8 */
|
||||||
|
CHAN2G(2452), /* Channel 9 */
|
||||||
|
CHAN2G(2457), /* Channel 10 */
|
||||||
|
CHAN2G(2462), /* Channel 11 */
|
||||||
|
CHAN2G(2467), /* Channel 12 */
|
||||||
|
CHAN2G(2472), /* Channel 13 */
|
||||||
|
CHAN2G(2484), /* Channel 14 */
|
||||||
|
};
|
||||||
|
|
||||||
|
struct t_wiphy_priv {
|
||||||
|
struct kunit *test;
|
||||||
|
struct cfg80211_ops *ops;
|
||||||
|
|
||||||
|
void *ctx;
|
||||||
|
|
||||||
|
struct ieee80211_supported_band band_2ghz;
|
||||||
|
struct ieee80211_channel channels_2ghz[ARRAY_SIZE(channels_2ghz)];
|
||||||
|
};
|
||||||
|
|
||||||
|
#define T_WIPHY(test, ctx) ({ \
|
||||||
|
struct wiphy *__wiphy = \
|
||||||
|
kunit_alloc_resource(test, t_wiphy_init, \
|
||||||
|
t_wiphy_exit, \
|
||||||
|
GFP_KERNEL, &(ctx)); \
|
||||||
|
\
|
||||||
|
KUNIT_ASSERT_NOT_NULL(test, __wiphy); \
|
||||||
|
__wiphy; \
|
||||||
|
})
|
||||||
|
#define t_wiphy_ctx(wiphy) (((struct t_wiphy_priv *)wiphy_priv(wiphy))->ctx)
|
||||||
|
|
||||||
|
int t_wiphy_init(struct kunit_resource *resource, void *data);
|
||||||
|
void t_wiphy_exit(struct kunit_resource *resource);
|
||||||
|
|
||||||
|
#define t_skb_remove_member(skb, type, member) do { \
|
||||||
|
memmove((skb)->data + (skb)->len - sizeof(type) + \
|
||||||
|
offsetof(type, member), \
|
||||||
|
(skb)->data + (skb)->len - sizeof(type) + \
|
||||||
|
offsetofend(type, member), \
|
||||||
|
offsetofend(type, member)); \
|
||||||
|
skb_trim(skb, (skb)->len - sizeof_field(type, member)); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#endif /* __CFG80211_UTILS_H */
|
|
@ -980,7 +980,63 @@ unsigned int cfg80211_classify8021d(struct sk_buff *skb,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* The default mapping as defined Section 2.3 in RFC8325: The three
|
||||||
|
* Most Significant Bits (MSBs) of the DSCP are used as the
|
||||||
|
* corresponding L2 markings.
|
||||||
|
*/
|
||||||
ret = dscp >> 5;
|
ret = dscp >> 5;
|
||||||
|
|
||||||
|
/* Handle specific DSCP values for which the default mapping (as
|
||||||
|
* described above) doesn't adhere to the intended usage of the DSCP
|
||||||
|
* value. See section 4 in RFC8325. Specifically, for the following
|
||||||
|
* Diffserv Service Classes no update is needed:
|
||||||
|
* - Standard: DF
|
||||||
|
* - Low Priority Data: CS1
|
||||||
|
* - Multimedia Streaming: AF31, AF32, AF33
|
||||||
|
* - Multimedia Conferencing: AF41, AF42, AF43
|
||||||
|
* - Network Control Traffic: CS7
|
||||||
|
* - Real-Time Interactive: CS4
|
||||||
|
*/
|
||||||
|
switch (dscp >> 2) {
|
||||||
|
case 10:
|
||||||
|
case 12:
|
||||||
|
case 14:
|
||||||
|
/* High throughput data: AF11, AF12, AF13 */
|
||||||
|
ret = 0;
|
||||||
|
break;
|
||||||
|
case 16:
|
||||||
|
/* Operations, Administration, and Maintenance and Provisioning:
|
||||||
|
* CS2
|
||||||
|
*/
|
||||||
|
ret = 0;
|
||||||
|
break;
|
||||||
|
case 18:
|
||||||
|
case 20:
|
||||||
|
case 22:
|
||||||
|
/* Low latency data: AF21, AF22, AF23 */
|
||||||
|
ret = 3;
|
||||||
|
break;
|
||||||
|
case 24:
|
||||||
|
/* Broadcasting video: CS3 */
|
||||||
|
ret = 4;
|
||||||
|
break;
|
||||||
|
case 40:
|
||||||
|
/* Signaling: CS5 */
|
||||||
|
ret = 5;
|
||||||
|
break;
|
||||||
|
case 44:
|
||||||
|
/* Voice Admit: VA */
|
||||||
|
ret = 6;
|
||||||
|
break;
|
||||||
|
case 46:
|
||||||
|
/* Telephony traffic: EF */
|
||||||
|
ret = 6;
|
||||||
|
break;
|
||||||
|
case 48:
|
||||||
|
/* Network Control Traffic: CS6 */
|
||||||
|
ret = 7;
|
||||||
|
break;
|
||||||
|
}
|
||||||
out:
|
out:
|
||||||
return array_index_nospec(ret, IEEE80211_NUM_TIDS);
|
return array_index_nospec(ret, IEEE80211_NUM_TIDS);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue