Commit d944e09e authored by Johannes Berg's avatar Johannes Berg Committed by Kalle Valo

wifi: libertas: use variable-size data in assoc req/resp cmd

The firmware has a 512 limit here, but we use less, so gcc
starts complaining about it:

drivers/net/wireless/marvell/libertas/cfg.c:1198:63: warning: array subscript ‘struct cmd_ds_802_11_associate_response[0]’ is partly outside array bounds of ‘unsigned char[203]’ [-Warray-bounds]
 1198 |                       "aid 0x%04x\n", status, le16_to_cpu(resp->statuscode),
      |                                                               ^~

Since we size the command and response buffer per our needs
and not per the firmware maximum, change to a variable size
data array and put the 512 only into a comment.

In the end, that's actually what the code always wanted, and
it simplifies the code that used to subtract the fixed size
buffer size in two places.
Reported-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Acked-by: default avatarKalle Valo <kvalo@kernel.org>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220523180200.115fa27fbece.Ie66d874b047e7afad63900aa2df70f031711147e@changeid
parent a54ce370
...@@ -1053,7 +1053,6 @@ static int lbs_set_authtype(struct lbs_private *priv, ...@@ -1053,7 +1053,6 @@ static int lbs_set_authtype(struct lbs_private *priv,
*/ */
#define LBS_ASSOC_MAX_CMD_SIZE \ #define LBS_ASSOC_MAX_CMD_SIZE \
(sizeof(struct cmd_ds_802_11_associate) \ (sizeof(struct cmd_ds_802_11_associate) \
- 512 /* cmd_ds_802_11_associate.iebuf */ \
+ LBS_MAX_SSID_TLV_SIZE \ + LBS_MAX_SSID_TLV_SIZE \
+ LBS_MAX_CHANNEL_TLV_SIZE \ + LBS_MAX_CHANNEL_TLV_SIZE \
+ LBS_MAX_CF_PARAM_TLV_SIZE \ + LBS_MAX_CF_PARAM_TLV_SIZE \
...@@ -1130,8 +1129,7 @@ static int lbs_associate(struct lbs_private *priv, ...@@ -1130,8 +1129,7 @@ static int lbs_associate(struct lbs_private *priv,
if (sme->ie && sme->ie_len) if (sme->ie && sme->ie_len)
pos += lbs_add_wpa_tlv(pos, sme->ie, sme->ie_len); pos += lbs_add_wpa_tlv(pos, sme->ie, sme->ie_len);
len = (sizeof(*cmd) - sizeof(cmd->iebuf)) + len = sizeof(*cmd) + (u16)(pos - (u8 *) &cmd->iebuf);
(u16)(pos - (u8 *) &cmd->iebuf);
cmd->hdr.size = cpu_to_le16(len); cmd->hdr.size = cpu_to_le16(len);
lbs_deb_hex(LBS_DEB_ASSOC, "ASSOC_CMD", (u8 *) cmd, lbs_deb_hex(LBS_DEB_ASSOC, "ASSOC_CMD", (u8 *) cmd,
......
...@@ -528,7 +528,8 @@ struct cmd_ds_802_11_associate { ...@@ -528,7 +528,8 @@ struct cmd_ds_802_11_associate {
__le16 listeninterval; __le16 listeninterval;
__le16 bcnperiod; __le16 bcnperiod;
u8 dtimperiod; u8 dtimperiod;
u8 iebuf[512]; /* Enough for required and most optional IEs */ /* 512 permitted - enough for required and most optional IEs */
u8 iebuf[];
} __packed; } __packed;
struct cmd_ds_802_11_associate_response { struct cmd_ds_802_11_associate_response {
...@@ -537,7 +538,8 @@ struct cmd_ds_802_11_associate_response { ...@@ -537,7 +538,8 @@ struct cmd_ds_802_11_associate_response {
__le16 capability; __le16 capability;
__le16 statuscode; __le16 statuscode;
__le16 aid; __le16 aid;
u8 iebuf[512]; /* max 512 */
u8 iebuf[];
} __packed; } __packed;
struct cmd_ds_802_11_set_wep { struct cmd_ds_802_11_set_wep {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment