Skip to content

Commit 082c3d4

Browse files
committed
wifi: mac80211: don't return unset power in ieee80211_get_tx_power()
jira LE-1907 cve CVE-2023-52832 Rebuild_History Non-Buildable kernel-4.18.0-553.16.1.el8_10 commit-author Ping-Ke Shih <[email protected]> commit e160ab8 We can get a UBSAN warning if ieee80211_get_tx_power() returns the INT_MIN value mac80211 internally uses for "unset power level". UBSAN: signed-integer-overflow in net/wireless/nl80211.c:3816:5 -2147483648 * 100 cannot be represented in type 'int' CPU: 0 PID: 20433 Comm: insmod Tainted: G WC OE Call Trace: dump_stack+0x74/0x92 ubsan_epilogue+0x9/0x50 handle_overflow+0x8d/0xd0 __ubsan_handle_mul_overflow+0xe/0x10 nl80211_send_iface+0x688/0x6b0 [cfg80211] [...] cfg80211_register_wdev+0x78/0xb0 [cfg80211] cfg80211_netdev_notifier_call+0x200/0x620 [cfg80211] [...] ieee80211_if_add+0x60e/0x8f0 [mac80211] ieee80211_register_hw+0xda5/0x1170 [mac80211] In this case, simply return an error instead, to indicate that no data is available. Cc: Zong-Zhe Yang <[email protected]> Signed-off-by: Ping-Ke Shih <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Johannes Berg <[email protected]> (cherry picked from commit e160ab8) Signed-off-by: Jonathan Maple <[email protected]>
1 parent bbf3997 commit 082c3d4

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

net/mac80211/cfg.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3105,6 +3105,10 @@ static int ieee80211_get_tx_power(struct wiphy *wiphy,
31053105
else
31063106
*dbm = sdata->vif.bss_conf.txpower;
31073107

3108+
/* INT_MIN indicates no power level was set yet */
3109+
if (*dbm == INT_MIN)
3110+
return -EINVAL;
3111+
31083112
return 0;
31093113
}
31103114

0 commit comments

Comments
 (0)