Skip to content

Commit

Permalink
rtlwifi: fix -Wpointer-sign warning
Browse files Browse the repository at this point in the history 
[ Upstream commit ef41937 ]

There are thousands of warnings in a W=2 build from just one file:

drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.c:3788:15: warning: pointer targets in initialization of 'u8 *' {aka 'unsigned char *'} from 'char *' differ in signedness [-Wpointer-sign]

Change the types to consistently use 'const char *' for the
strings.

Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Ping-Ke Shih <[email protected]>
Signed-off-by: Kalle Valo <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Stable-dep-of: 117dbed ("wifi: rtlwifi: Fix global-out-of-bounds bug in _rtl8812ae_phy_set_txpower_limit()")
Signed-off-by: Sasha Levin <[email protected]>
  • Loading branch information
@arndb @gregkh
arndb authored and gregkh committed Mar 11, 2023
1 parent 75f4eed commit d4fddfd
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 44 deletions.
81 changes: 41 additions & 40 deletions drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1581,7 +1581,7 @@ static void _rtl8821ae_phy_txpower_by_rate_configuration(struct ieee80211_hw *hw
}

/* string is in decimal */
static bool _rtl8812ae_get_integer_from_string(char *str, u8 *pint)
static bool _rtl8812ae_get_integer_from_string(const char *str, u8 *pint)
{
u16 i = 0;
*pint = 0;
Expand All @@ -1599,7 +1599,7 @@ static bool _rtl8812ae_get_integer_from_string(char *str, u8 *pint)
return true;
}

static bool _rtl8812ae_eq_n_byte(u8 *str1, u8 *str2, u32 num)
static bool _rtl8812ae_eq_n_byte(const char *str1, const char *str2, u32 num)
{
if (num == 0)
return false;
Expand Down Expand Up @@ -1637,19 +1637,20 @@ static s8 _rtl8812ae_phy_get_chnl_idx_of_txpwr_lmt(struct ieee80211_hw *hw,
return channel_index;
}

static void _rtl8812ae_phy_set_txpower_limit(struct ieee80211_hw *hw, u8 *pregulation,
u8 *pband, u8 *pbandwidth,
u8 *prate_section, u8 *prf_path,
u8 *pchannel, u8 *ppower_limit)
static void _rtl8812ae_phy_set_txpower_limit(struct ieee80211_hw *hw,
const char *pregulation,
const char *pband, const char *pbandwidth,
const char *prate_section, const char *prf_path,
const char *pchannel, const char *ppower_limit)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_phy *rtlphy = &rtlpriv->phy;
u8 regulation = 0, bandwidth = 0, rate_section = 0, channel;
u8 channel_index;
s8 power_limit = 0, prev_power_limit, ret;

if (!_rtl8812ae_get_integer_from_string((char *)pchannel, &channel) ||
!_rtl8812ae_get_integer_from_string((char *)ppower_limit,
if (!_rtl8812ae_get_integer_from_string(pchannel, &channel) ||
!_rtl8812ae_get_integer_from_string(ppower_limit,
&power_limit)) {
rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
"Illegal index of pwr_lmt table [chnl %d][val %d]\n",
Expand All @@ -1659,42 +1660,42 @@ static void _rtl8812ae_phy_set_txpower_limit(struct ieee80211_hw *hw, u8 *pregul
power_limit = power_limit > MAX_POWER_INDEX ?
MAX_POWER_INDEX : power_limit;

if (_rtl8812ae_eq_n_byte(pregulation, (u8 *)("FCC"), 3))
if (_rtl8812ae_eq_n_byte(pregulation, "FCC", 3))
regulation = 0;
else if (_rtl8812ae_eq_n_byte(pregulation, (u8 *)("MKK"), 3))
else if (_rtl8812ae_eq_n_byte(pregulation, "MKK", 3))
regulation = 1;
else if (_rtl8812ae_eq_n_byte(pregulation, (u8 *)("ETSI"), 4))
else if (_rtl8812ae_eq_n_byte(pregulation, "ETSI", 4))
regulation = 2;
else if (_rtl8812ae_eq_n_byte(pregulation, (u8 *)("WW13"), 4))
else if (_rtl8812ae_eq_n_byte(pregulation, "WW13", 4))
regulation = 3;

if (_rtl8812ae_eq_n_byte(prate_section, (u8 *)("CCK"), 3))
if (_rtl8812ae_eq_n_byte(prate_section, "CCK", 3))
rate_section = 0;
else if (_rtl8812ae_eq_n_byte(prate_section, (u8 *)("OFDM"), 4))
else if (_rtl8812ae_eq_n_byte(prate_section, "OFDM", 4))
rate_section = 1;
else if (_rtl8812ae_eq_n_byte(prate_section, (u8 *)("HT"), 2) &&
_rtl8812ae_eq_n_byte(prf_path, (u8 *)("1T"), 2))
else if (_rtl8812ae_eq_n_byte(prate_section, "HT", 2) &&
_rtl8812ae_eq_n_byte(prf_path, "1T", 2))
rate_section = 2;
else if (_rtl8812ae_eq_n_byte(prate_section, (u8 *)("HT"), 2) &&
_rtl8812ae_eq_n_byte(prf_path, (u8 *)("2T"), 2))
else if (_rtl8812ae_eq_n_byte(prate_section, "HT", 2) &&
_rtl8812ae_eq_n_byte(prf_path, "2T", 2))
rate_section = 3;
else if (_rtl8812ae_eq_n_byte(prate_section, (u8 *)("VHT"), 3) &&
_rtl8812ae_eq_n_byte(prf_path, (u8 *)("1T"), 2))
else if (_rtl8812ae_eq_n_byte(prate_section, "VHT", 3) &&
_rtl8812ae_eq_n_byte(prf_path, "1T", 2))
rate_section = 4;
else if (_rtl8812ae_eq_n_byte(prate_section, (u8 *)("VHT"), 3) &&
_rtl8812ae_eq_n_byte(prf_path, (u8 *)("2T"), 2))
else if (_rtl8812ae_eq_n_byte(prate_section, "VHT", 3) &&
_rtl8812ae_eq_n_byte(prf_path, "2T", 2))
rate_section = 5;

if (_rtl8812ae_eq_n_byte(pbandwidth, (u8 *)("20M"), 3))
if (_rtl8812ae_eq_n_byte(pbandwidth, "20M", 3))
bandwidth = 0;
else if (_rtl8812ae_eq_n_byte(pbandwidth, (u8 *)("40M"), 3))
else if (_rtl8812ae_eq_n_byte(pbandwidth, "40M", 3))
bandwidth = 1;
else if (_rtl8812ae_eq_n_byte(pbandwidth, (u8 *)("80M"), 3))
else if (_rtl8812ae_eq_n_byte(pbandwidth, "80M", 3))
bandwidth = 2;
else if (_rtl8812ae_eq_n_byte(pbandwidth, (u8 *)("160M"), 4))
else if (_rtl8812ae_eq_n_byte(pbandwidth, "160M", 4))
bandwidth = 3;

if (_rtl8812ae_eq_n_byte(pband, (u8 *)("2.4G"), 4)) {
if (_rtl8812ae_eq_n_byte(pband, "2.4G", 4)) {
ret = _rtl8812ae_phy_get_chnl_idx_of_txpwr_lmt(hw,
BAND_ON_2_4G,
channel);
Expand All @@ -1718,7 +1719,7 @@ static void _rtl8812ae_phy_set_txpower_limit(struct ieee80211_hw *hw, u8 *pregul
regulation, bandwidth, rate_section, channel_index,
rtlphy->txpwr_limit_2_4g[regulation][bandwidth]
[rate_section][channel_index][RF90_PATH_A]);
} else if (_rtl8812ae_eq_n_byte(pband, (u8 *)("5G"), 2)) {
} else if (_rtl8812ae_eq_n_byte(pband, "5G", 2)) {
ret = _rtl8812ae_phy_get_chnl_idx_of_txpwr_lmt(hw,
BAND_ON_5G,
channel);
Expand Down Expand Up @@ -1749,10 +1750,10 @@ static void _rtl8812ae_phy_set_txpower_limit(struct ieee80211_hw *hw, u8 *pregul
}

static void _rtl8812ae_phy_config_bb_txpwr_lmt(struct ieee80211_hw *hw,
u8 *regulation, u8 *band,
u8 *bandwidth, u8 *rate_section,
u8 *rf_path, u8 *channel,
u8 *power_limit)
const char *regulation, const char *band,
const char *bandwidth, const char *rate_section,
const char *rf_path, const char *channel,
const char *power_limit)
{
_rtl8812ae_phy_set_txpower_limit(hw, regulation, band, bandwidth,
rate_section, rf_path, channel,
Expand All @@ -1765,7 +1766,7 @@ static void _rtl8821ae_phy_read_and_config_txpwr_lmt(struct ieee80211_hw *hw)
struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
u32 i = 0;
u32 array_len;
u8 **array;
const char **array;

if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
array_len = RTL8812AE_TXPWR_LMT_ARRAY_LEN;
Expand All @@ -1778,13 +1779,13 @@ static void _rtl8821ae_phy_read_and_config_txpwr_lmt(struct ieee80211_hw *hw)
rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE, "\n");

for (i = 0; i < array_len; i += 7) {
u8 *regulation = array[i];
u8 *band = array[i+1];
u8 *bandwidth = array[i+2];
u8 *rate = array[i+3];
u8 *rf_path = array[i+4];
u8 *chnl = array[i+5];
u8 *val = array[i+6];
const char *regulation = array[i];
const char *band = array[i+1];
const char *bandwidth = array[i+2];
const char *rate = array[i+3];
const char *rf_path = array[i+4];
const char *chnl = array[i+5];
const char *val = array[i+6];

_rtl8812ae_phy_config_bb_txpwr_lmt(hw, regulation, band,
bandwidth, rate, rf_path,
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2894,7 +2894,7 @@ u32 RTL8821AE_AGC_TAB_1TARRAYLEN = ARRAY_SIZE(RTL8821AE_AGC_TAB_ARRAY);
* TXPWR_LMT.TXT
******************************************************************************/

u8 *RTL8812AE_TXPWR_LMT[] = {
const char *RTL8812AE_TXPWR_LMT[] = {
"FCC", "2.4G", "20M", "CCK", "1T", "01", "36",
"ETSI", "2.4G", "20M", "CCK", "1T", "01", "32",
"MKK", "2.4G", "20M", "CCK", "1T", "01", "32",
Expand Down Expand Up @@ -3463,7 +3463,7 @@ u8 *RTL8812AE_TXPWR_LMT[] = {

u32 RTL8812AE_TXPWR_LMT_ARRAY_LEN = ARRAY_SIZE(RTL8812AE_TXPWR_LMT);

u8 *RTL8821AE_TXPWR_LMT[] = {
const char *RTL8821AE_TXPWR_LMT[] = {
"FCC", "2.4G", "20M", "CCK", "1T", "01", "32",
"ETSI", "2.4G", "20M", "CCK", "1T", "01", "32",
"MKK", "2.4G", "20M", "CCK", "1T", "01", "32",
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ extern u32 RTL8821AE_AGC_TAB_ARRAY[];
extern u32 RTL8812AE_AGC_TAB_1TARRAYLEN;
extern u32 RTL8812AE_AGC_TAB_ARRAY[];
extern u32 RTL8812AE_TXPWR_LMT_ARRAY_LEN;
extern u8 *RTL8812AE_TXPWR_LMT[];
extern const char *RTL8812AE_TXPWR_LMT[];
extern u32 RTL8821AE_TXPWR_LMT_ARRAY_LEN;
extern u8 *RTL8821AE_TXPWR_LMT[];
extern const char *RTL8821AE_TXPWR_LMT[];
#endif

0 comments on commit d4fddfd

Please sign in to comment.