Commit 4217d96d authored by Khalid Elmously's avatar Khalid Elmously

Revert "UBUNTU: SAUCE: libertas: Fix two buffer overflows at parsing bss descriptor"

BugLink: https://bugs.launchpad.net/bugs/1864773

This reverts commit f41dbb3e.
Note: it will be replaced by a modified version from linux-stable
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent 0a6d680e
...@@ -272,10 +272,6 @@ add_ie_rates(u8 *tlv, const u8 *ie, int *nrates) ...@@ -272,10 +272,6 @@ add_ie_rates(u8 *tlv, const u8 *ie, int *nrates)
int hw, ap, ap_max = ie[1]; int hw, ap, ap_max = ie[1];
u8 hw_rate; u8 hw_rate;
if (ap_max > MAX_RATES) {
lbs_deb_assoc("invalid rates\n");
return tlv;
}
/* Advance past IE header */ /* Advance past IE header */
ie += 2; ie += 2;
...@@ -1849,10 +1845,6 @@ static int lbs_ibss_join_existing(struct lbs_private *priv, ...@@ -1849,10 +1845,6 @@ static int lbs_ibss_join_existing(struct lbs_private *priv,
} else { } else {
int hw, i; int hw, i;
u8 rates_max = rates_eid[1]; u8 rates_max = rates_eid[1];
if (rates_max > MAX_RATES) {
lbs_deb_join("invalid rates");
goto out;
}
u8 *rates = cmd.bss.rates; u8 *rates = cmd.bss.rates;
for (hw = 0; hw < ARRAY_SIZE(lbs_rates); hw++) { for (hw = 0; hw < ARRAY_SIZE(lbs_rates); hw++) {
u8 hw_rate = lbs_rates[hw].bitrate / 5; u8 hw_rate = lbs_rates[hw].bitrate / 5;
......
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