mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-07-22 03:27:30 -04:00
wifi: mac80211: add KUnit coverage for negotiated TTLM parser
Add KUnit coverage for ieee80211_parse_neg_ttlm() to lock the sparse link_map_presence layout against future regressions. The sparse_presence_no_oob_read case crafts a negotiated TTLM element with link_map_presence = BIT(0) | BIT(7) and bm_size = 2 in a buffer sized exactly to the validated element length. Without the parser fix this would read 14 bytes past the buffer when processing TID 7; under KASAN that is a slab-out-of-bounds report. The dense_presence_baseline case crafts a fully populated link_map_presence = 0xff element to confirm that the cursor-advance fix does not regress the path that was already correct. Export ieee80211_parse_neg_ttlm via VISIBLE_IF_MAC80211_KUNIT so the test can call it directly. Assisted-by: Claude:claude-sonnet-4-6 Signed-off-by: Michael Bommarito <michael.bommarito@gmail.com> Link: https://patch.msgid.link/20260515151719.1317659-3-michael.bommarito@gmail.com Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
committed by
Johannes Berg
parent
1a1f055318
commit
f31ce7e315
@@ -2926,6 +2926,10 @@ ieee80211_determine_chan_mode(struct ieee80211_sub_if_data *sdata,
|
||||
struct ieee80211_chan_req *chanreq,
|
||||
struct cfg80211_chan_def *ap_chandef,
|
||||
unsigned long *userspace_selectors);
|
||||
int ieee80211_parse_neg_ttlm(struct ieee80211_sub_if_data *sdata,
|
||||
const struct ieee80211_ttlm_elem *ttlm,
|
||||
struct ieee80211_neg_ttlm *neg_ttlm,
|
||||
u8 *direction);
|
||||
#else
|
||||
#define EXPORT_SYMBOL_IF_MAC80211_KUNIT(sym)
|
||||
#define VISIBLE_IF_MAC80211_KUNIT static
|
||||
|
||||
@@ -8189,7 +8189,7 @@ ieee80211_send_neg_ttlm_res(struct ieee80211_sub_if_data *sdata,
|
||||
ieee80211_tx_skb(sdata, skb);
|
||||
}
|
||||
|
||||
static int
|
||||
VISIBLE_IF_MAC80211_KUNIT int
|
||||
ieee80211_parse_neg_ttlm(struct ieee80211_sub_if_data *sdata,
|
||||
const struct ieee80211_ttlm_elem *ttlm,
|
||||
struct ieee80211_neg_ttlm *neg_ttlm,
|
||||
@@ -8270,6 +8270,7 @@ ieee80211_parse_neg_ttlm(struct ieee80211_sub_if_data *sdata,
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_IF_MAC80211_KUNIT(ieee80211_parse_neg_ttlm);
|
||||
|
||||
static void ieee80211_process_neg_ttlm_req(struct ieee80211_sub_if_data *sdata,
|
||||
struct ieee80211_mgmt *mgmt,
|
||||
|
||||
4
net/mac80211/tests/.kunitconfig
Normal file
4
net/mac80211/tests/.kunitconfig
Normal file
@@ -0,0 +1,4 @@
|
||||
CONFIG_KUNIT=y
|
||||
CONFIG_CFG80211=y
|
||||
CONFIG_MAC80211=y
|
||||
CONFIG_MAC80211_KUNIT_TEST=y
|
||||
@@ -1,3 +1,3 @@
|
||||
mac80211-tests-y += module.o util.o elems.o mfp.o tpe.o chan-mode.o s1g_tim.o
|
||||
mac80211-tests-y += module.o util.o elems.o mfp.o tpe.o chan-mode.o s1g_tim.o ttlm.o
|
||||
|
||||
obj-$(CONFIG_MAC80211_KUNIT_TEST) += mac80211-tests.o
|
||||
|
||||
175
net/mac80211/tests/ttlm.c
Normal file
175
net/mac80211/tests/ttlm.c
Normal file
@@ -0,0 +1,175 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* KUnit tests for negotiated TTLM (TID-To-Link Mapping) parsing
|
||||
*
|
||||
* Copyright (C) 2026 Michael Bommarito <michael.bommarito@gmail.com>
|
||||
*/
|
||||
#include <kunit/test.h>
|
||||
#include <linux/ieee80211.h>
|
||||
#include "../ieee80211_i.h"
|
||||
|
||||
MODULE_IMPORT_NS("EXPORTED_FOR_KUNIT_TESTING");
|
||||
|
||||
/*
|
||||
* Build a negotiated TTLM element in caller-supplied buffer.
|
||||
*
|
||||
* @buf: destination buffer (must be at least elem_size bytes)
|
||||
* @elem_size: sizeof(ttlm_elem) + 1 (presence byte) + npresent * bm_size
|
||||
* @presence: link_map_presence bitmask; each set bit => one map follows
|
||||
* @bm_size: bytes per map (1 or 2); 2 => LINK_MAP_SIZE bit clear
|
||||
* @maps: array of npresent u16 maps, one per set bit in presence
|
||||
*
|
||||
* Control field encodes direction=BOTH; no switch-time, no expected-dur,
|
||||
* no DEF_LINK_MAP. LINK_MAP_SIZE bit is set iff bm_size==1.
|
||||
*
|
||||
* Returns pointer to the ieee80211_ttlm_elem at buf.
|
||||
*/
|
||||
static const struct ieee80211_ttlm_elem *
|
||||
build_neg_ttlm_elem(u8 *buf, size_t elem_size,
|
||||
u8 presence, u8 bm_size, const u16 *maps)
|
||||
{
|
||||
struct ieee80211_ttlm_elem *t = (void *)buf;
|
||||
u8 control;
|
||||
u8 *pos;
|
||||
int i, tid;
|
||||
|
||||
memset(buf, 0, elem_size);
|
||||
|
||||
control = IEEE80211_TTLM_DIRECTION_BOTH; /* bits [1:0] = 2 */
|
||||
if (bm_size == 1)
|
||||
control |= IEEE80211_TTLM_CONTROL_LINK_MAP_SIZE;
|
||||
|
||||
t->control = control;
|
||||
|
||||
pos = (u8 *)t->optional;
|
||||
*pos++ = presence;
|
||||
|
||||
i = 0;
|
||||
for (tid = 0; tid < IEEE80211_TTLM_NUM_TIDS; tid++) {
|
||||
if (!(presence & BIT(tid)))
|
||||
continue;
|
||||
if (bm_size == 1)
|
||||
*pos = (u8)maps[i];
|
||||
else
|
||||
put_unaligned_le16(maps[i], pos);
|
||||
pos += bm_size;
|
||||
i++;
|
||||
}
|
||||
|
||||
return t;
|
||||
}
|
||||
|
||||
/*
|
||||
* sparse_presence_no_oob_read - BIT(0)|BIT(7) presence, bm_size=2
|
||||
*
|
||||
* Only TID 0 and TID 7 have maps; TIDs 1-6 are absent. Element length
|
||||
* is exactly 6 bytes (1 control + 1 presence + 2 * 2-byte maps).
|
||||
*
|
||||
* Pre-fix the parser advanced pos by bm_size AFTER the switch() block
|
||||
* (i.e. unconditionally for every TID), so when processing TID 7 it
|
||||
* had already advanced 6 * bm_size = 12 bytes past the presence byte
|
||||
* for the absent TIDs before reading the TID-7 map - 14 bytes past the
|
||||
* end of the 2-byte TID-7 map. Under KASAN that is a slab-out-of-bounds.
|
||||
*
|
||||
* After the fix pos is advanced only inside the presence-bit branch so
|
||||
* the cursor lands exactly at end-of-element after processing TID 7.
|
||||
*/
|
||||
static void sparse_presence_no_oob_read(struct kunit *test)
|
||||
{
|
||||
/*
|
||||
* presence = BIT(0)|BIT(7): 2 maps present.
|
||||
* elem_size = sizeof(ttlm_elem) + 1 (presence) + 2*2 (maps) = 6.
|
||||
*/
|
||||
const u8 presence = BIT(0) | BIT(7);
|
||||
const u8 bm_size = 2;
|
||||
const int npresent = 2;
|
||||
const size_t elem_size = sizeof(struct ieee80211_ttlm_elem)
|
||||
+ 1 + npresent * bm_size;
|
||||
/*
|
||||
* Allocate exact-size buffer so a pre-fix OOB read walks into the
|
||||
* KASAN red zone immediately after the allocation.
|
||||
*/
|
||||
u8 *buf = kunit_kzalloc(test, elem_size, GFP_KERNEL);
|
||||
const struct ieee80211_ttlm_elem *ttlm;
|
||||
struct ieee80211_neg_ttlm neg_ttlm = {};
|
||||
/* Non-zero maps so the parser does not reject with -EINVAL. */
|
||||
const u16 maps[2] = { 0x0001, 0x0001 };
|
||||
u8 direction = 0;
|
||||
int ret;
|
||||
|
||||
KUNIT_ASSERT_NOT_NULL(test, buf);
|
||||
|
||||
ttlm = build_neg_ttlm_elem(buf, elem_size, presence, bm_size, maps);
|
||||
|
||||
/*
|
||||
* Pass NULL for sdata: the only sdata dereference in this code path
|
||||
* is inside mlme_dbg() on error returns, which are guarded by
|
||||
* MAC80211_MLME_DEBUG == 0 in non-debug builds and by the dead-code
|
||||
* eliminator in KUnit builds. The success path does not touch sdata.
|
||||
*/
|
||||
ret = ieee80211_parse_neg_ttlm(NULL, ttlm, &neg_ttlm, &direction);
|
||||
|
||||
KUNIT_EXPECT_EQ(test, ret, 0);
|
||||
KUNIT_EXPECT_EQ(test, (int)direction, IEEE80211_TTLM_DIRECTION_BOTH);
|
||||
/* TID 0: map present */
|
||||
KUNIT_EXPECT_EQ(test, (int)neg_ttlm.downlink[0], 0x0001);
|
||||
KUNIT_EXPECT_EQ(test, (int)neg_ttlm.uplink[0], 0x0001);
|
||||
/* TID 3: absent => map should be 0 */
|
||||
KUNIT_EXPECT_EQ(test, (int)neg_ttlm.downlink[3], 0);
|
||||
KUNIT_EXPECT_EQ(test, (int)neg_ttlm.uplink[3], 0);
|
||||
/* TID 7: map present */
|
||||
KUNIT_EXPECT_EQ(test, (int)neg_ttlm.downlink[7], 0x0001);
|
||||
KUNIT_EXPECT_EQ(test, (int)neg_ttlm.uplink[7], 0x0001);
|
||||
}
|
||||
|
||||
/*
|
||||
* dense_presence_baseline - presence=0xff (all 8 TIDs), bm_size=2
|
||||
*
|
||||
* Every TID has a map; this is the dense layout the parser handled
|
||||
* correctly even before the fix. Confirms the cursor-advance fix
|
||||
* does not regress the already-correct path.
|
||||
*/
|
||||
static void dense_presence_baseline(struct kunit *test)
|
||||
{
|
||||
const u8 presence = 0xff;
|
||||
const u8 bm_size = 2;
|
||||
const int npresent = 8;
|
||||
const size_t elem_size = sizeof(struct ieee80211_ttlm_elem)
|
||||
+ 1 + npresent * bm_size;
|
||||
u8 *buf = kunit_kzalloc(test, elem_size, GFP_KERNEL);
|
||||
const struct ieee80211_ttlm_elem *ttlm;
|
||||
struct ieee80211_neg_ttlm neg_ttlm = {};
|
||||
const u16 maps[8] = {
|
||||
0x0003, 0x0003, 0x0003, 0x0003,
|
||||
0x0003, 0x0003, 0x0003, 0x0003,
|
||||
};
|
||||
u8 direction = 0;
|
||||
int ret;
|
||||
|
||||
KUNIT_ASSERT_NOT_NULL(test, buf);
|
||||
|
||||
ttlm = build_neg_ttlm_elem(buf, elem_size, presence, bm_size, maps);
|
||||
|
||||
ret = ieee80211_parse_neg_ttlm(NULL, ttlm, &neg_ttlm, &direction);
|
||||
|
||||
KUNIT_EXPECT_EQ(test, ret, 0);
|
||||
KUNIT_EXPECT_EQ(test, (int)direction, IEEE80211_TTLM_DIRECTION_BOTH);
|
||||
/* All TIDs present: every downlink/uplink entry must be 0x0003. */
|
||||
for (int tid = 0; tid < IEEE80211_TTLM_NUM_TIDS; tid++) {
|
||||
KUNIT_EXPECT_EQ(test, (int)neg_ttlm.downlink[tid], 0x0003);
|
||||
KUNIT_EXPECT_EQ(test, (int)neg_ttlm.uplink[tid], 0x0003);
|
||||
}
|
||||
}
|
||||
|
||||
static struct kunit_case mac80211_ttlm_test_cases[] = {
|
||||
KUNIT_CASE(sparse_presence_no_oob_read),
|
||||
KUNIT_CASE(dense_presence_baseline),
|
||||
{}
|
||||
};
|
||||
|
||||
static struct kunit_suite mac80211_ttlm = {
|
||||
.name = "mac80211-ttlm",
|
||||
.test_cases = mac80211_ttlm_test_cases,
|
||||
};
|
||||
|
||||
kunit_test_suite(mac80211_ttlm);
|
||||
Reference in New Issue
Block a user