| Message ID | 20190615001321.241808-2-briannorris@chromium.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0a3ce169476feca7869255c681884ed227a319c8 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [5.2,1/2] mwifiex: Don't abort on small, spec-compliant vendor IEs | expand |
On Sat, 15 Jun 2019 02:13:21 +0200, Brian Norris wrote: > > This is clearer than copy/pasting the magic number '+ 2' around, and it > even saves the need for one existing comment. > > Cc: Takashi Iwai <tiwai@suse.de> > Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-by: Takashi Iwai <tiwai@suse.de> thanks, Takashi
Brian Norris <briannorris@chromium.org> wrote: > This is clearer than copy/pasting the magic number '+ 2' around, and it > even saves the need for one existing comment. > > Cc: Takashi Iwai <tiwai@suse.de> > Signed-off-by: Brian Norris <briannorris@chromium.org> > Reviewed-by: Takashi Iwai <tiwai@suse.de> This depends on: 63d7ef36103d mwifiex: Don't abort on small, spec-compliant vendor IEs Patch set to Awaiting Upstream.
Brian Norris <briannorris@chromium.org> wrote: > This is clearer than copy/pasting the magic number '+ 2' around, and it > even saves the need for one existing comment. > > Cc: Takashi Iwai <tiwai@suse.de> > Signed-off-by: Brian Norris <briannorris@chromium.org> > Reviewed-by: Takashi Iwai <tiwai@suse.de> Patch applied to wireless-drivers-next.git, thanks. 0a3ce169476f mwifiex: use 'total_ie_len' in mwifiex_update_bss_desc_with_ie()
diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c index e2786ab612ca..707e5159262f 100644 --- a/drivers/net/wireless/marvell/mwifiex/scan.c +++ b/drivers/net/wireless/marvell/mwifiex/scan.c @@ -1269,7 +1269,7 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter, break; case WLAN_EID_FH_PARAMS: - if (element_len + 2 < sizeof(*fh_param_set)) + if (total_ie_len < sizeof(*fh_param_set)) return -EINVAL; fh_param_set = (struct ieee_types_fh_param_set *) current_ptr; @@ -1279,7 +1279,7 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter, break; case WLAN_EID_DS_PARAMS: - if (element_len + 2 < sizeof(*ds_param_set)) + if (total_ie_len < sizeof(*ds_param_set)) return -EINVAL; ds_param_set = (struct ieee_types_ds_param_set *) current_ptr; @@ -1292,7 +1292,7 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter, break; case WLAN_EID_CF_PARAMS: - if (element_len + 2 < sizeof(*cf_param_set)) + if (total_ie_len < sizeof(*cf_param_set)) return -EINVAL; cf_param_set = (struct ieee_types_cf_param_set *) current_ptr; @@ -1302,7 +1302,7 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter, break; case WLAN_EID_IBSS_PARAMS: - if (element_len + 2 < sizeof(*ibss_param_set)) + if (total_ie_len < sizeof(*ibss_param_set)) return -EINVAL; ibss_param_set = (struct ieee_types_ibss_param_set *) @@ -1459,10 +1459,8 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter, break; } - current_ptr += element_len + 2; - - /* Need to account for IE ID and IE Len */ - bytes_left -= (element_len + 2); + current_ptr += total_ie_len; + bytes_left -= total_ie_len; } /* while (bytes_left > 2) */ return ret;
This is clearer than copy/pasting the magic number '+ 2' around, and it even saves the need for one existing comment. Cc: Takashi Iwai <tiwai@suse.de> Signed-off-by: Brian Norris <briannorris@chromium.org> --- drivers/net/wireless/marvell/mwifiex/scan.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)