wifi: rtw88: fix out-of-bounds CAM write when key table is full
Subsystems (2)
PATCH 1/1 wifi: rtw88: fix out-of-bounds CAM write when key table is full
In rtw_ops_set_key(), when the CAM table is full, rtw_sec_get_free_cam() returns RTW_MAX_SEC_CAM_NUM (32) because find_next_zero_bit()/find_first_zero_bit() return the bitmap size when no free slot exists. The bounds check compares the returned index with ">" against total_cam_num (32), so the invalid index 32 passes the check.
rtw_sec_write_cam() then indexes cam_table[32], an array declared with RTW_MAX_SEC_CAM_NUM (32) entries, causing an out-of-bounds write that corrupts the cam_map allocation bitmap. The write also sets bit 32 of cam_map, which overruns the bitmap as well.
Fix the off-by-one by rejecting indices >= total_cam_num.
Tested on: RTL8821CE (PCIe) on kernel 7.2.0-rc6-rtw88test-00059-g0d8395707651. The patched module loaded and associated to a WPA2 network; ping traffic passed with 0% packet loss. Reassociation and disconnect/reconnect cycles completed without errors, and the CAM table (debugfs dump_cam) showed valid key entries. The CAM-full boundary (28+ pairwise keys) requires an access point with 28+ clients and is not reachable in a single-client setup, so that path was verified by code inspection.
--- drivers/net/wireless/realtek/rtw88/mac80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw88/mac80211.c +1 -1
@@ -597,7 +597,7 @@ static int rtw_ops_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, hw_key_idx = key->keyidx; } -if (hw_key_idx > sec->total_cam_num) { +if (hw_key_idx >= sec->total_cam_num) { ret = -ENOSPC ; goto out; }
Signature · 1 line
2.55.0
Quoted 12 lines · イムティヤズ
In
rtw_ops_set_key(), when the CAM table is full,rtw_sec_get_free_cam()returnsRTW_MAX_SEC_CAM_NUM(32) because find_next_zero_bit()/find_first_zero_bit() return the bitmap size when no free slot exists. The bounds check compares the returned index with ">" againsttotal_cam_num(32), so the invalid index 32 passes the check.
rtw_sec_write_cam()then indexes cam_table[32], an array declared withRTW_MAX_SEC_CAM_NUM(32) entries, causing an out-of-bounds write that corrupts thecam_mapallocation bitmap. The write also sets bit 32 ofcam_map, which overruns the bitmap as well.
Quoted 4 lines
Fix the off-by-one by rejecting indices >=
total_cam_num.Fixes e3037485c68e ("rtw88: new Realtek 802.11ac driver")
These two are formal tags, so I'd move them together with Tested-by tag.
Quoted 9 lines
Tested on: RTL8821CE (PCIe) on kernel 7.2.0-rc6-rtw88test-00059-g0d8395707651. The patched module loaded and associated to a WPA2 network; ping traffic passed with 0% packet loss. Reassociation and disconnect/reconnect cycles completed without errors, and the CAM table (debugfs
dump_cam) showed valid key entries. The CAM-full boundary (28+ pairwise keys) requires an access point with 28+ clients and is not reachable in a single-client setup, so that path was verified by code inspection.
Yes. Unless you start an AP mode, and use many clients connect it, but I suspect rtw88 can't afford to support such clients.
Quoted 3 lines
Tested-by イムティヤズ <[email protected]>Signed-off-by イムティヤズ <[email protected]>
By the way, if you want spell your Japanese name in English, the display would be normal since my some git tools do not support UTF-8. But I don't insist this.
Ping-Ke Shih
maintainerQuoted 26 lines · <[email protected]> wrote:
In
rtw_ops_set_key(), when the CAM table is full,rtw_sec_get_free_cam()returnsRTW_MAX_SEC_CAM_NUM(32) because find_next_zero_bit()/find_first_zero_bit() return the bitmap size when no free slot exists. The bounds check compares the returned index with ">" againsttotal_cam_num(32), so the invalid index 32 passes the check.
rtw_sec_write_cam()then indexes cam_table[32], an array declared withRTW_MAX_SEC_CAM_NUM(32) entries, causing an out-of-bounds write that corrupts thecam_mapallocation bitmap. The write also sets bit 32 ofcam_map, which overruns the bitmap as well.Fix the off-by-one by rejecting indices >=
total_cam_num.Fixes e3037485c68e ("rtw88: new Realtek 802.11ac driver")Tested on: RTL8821CE (PCIe) on kernel 7.2.0-rc6-rtw88test-00059-g0d8395707651. The patched module loaded and associated to a WPA2 network; ping traffic passed with 0% packet loss. Reassociation and disconnect/reconnect cycles completed without errors, and the CAM table (debugfs
dump_cam) showed valid key entries. The CAM-full boundary (28+ pairwise keys) requires an access point with 28+ clients and is not reachable in a single-client setup, so that path was verified by code inspection.
Quoted 3 lines
Tested-by イムティヤズ <[email protected]>Signed-off-by イムティヤズ <[email protected]>Acked-by Ping-Ke Shih <[email protected]>
1 patch(es) applied to rtw-next branch of rtw.git, thanks.
10d58823cb44 wifi: rtw88: fix out-of-bounds CAM write when key table is full