Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'staging-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging fixes from Greg KH:
"Here are two staging driver bugfixes for 4.20-rc6.
One is a revert of a previously incorrect patch that was merged a
while ago, and the other resolves a possible buffer overrun that was
found by code inspection.
Both of these have been in the linux-next tree with no reported
issues"
* tag 'staging-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
Revert commit ef9209b642f "staging: rtl8723bs: Fix indenting errors and an off-by-one mistake in core/rtw_mlme_ext.c"
staging: rtl8712: Fix possible buffer overrun
+3
-3
+1
-1
drivers/staging/rtl8712/mlme_linux.c
+1
-1
drivers/staging/rtl8712/mlme_linux.c
···
146
146
p = buff;
147
147
p += sprintf(p, "ASSOCINFO(ReqIEs=");
148
148
len = sec_ie[1] + 2;
149
-
len = (len < IW_CUSTOM_MAX) ? len : IW_CUSTOM_MAX - 1;
149
+
len = (len < IW_CUSTOM_MAX) ? len : IW_CUSTOM_MAX;
150
150
for (i = 0; i < len; i++)
151
151
p += sprintf(p, "%02x", sec_ie[i]);
152
152
p += sprintf(p, ")");
+1
-1
drivers/staging/rtl8712/rtl871x_mlme.c
+1
-1
drivers/staging/rtl8712/rtl871x_mlme.c
···
1346
1346
u8 *out_ie, uint in_len)
1347
1347
{
1348
1348
u8 authmode = 0, match;
1349
-
u8 sec_ie[255], uncst_oui[4], bkup_ie[255];
1349
+
u8 sec_ie[IW_CUSTOM_MAX], uncst_oui[4], bkup_ie[255];
1350
1350
u8 wpa_oui[4] = {0x0, 0x50, 0xf2, 0x01};
1351
1351
uint ielength, cnt, remove_cnt;
1352
1352
int iEntry;
+1
-1
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+1
-1
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
···
1565
1565
if (pstat->aid > 0) {
1566
1566
DBG_871X(" old AID %d\n", pstat->aid);
1567
1567
} else {
1568
-
for (pstat->aid = 1; pstat->aid < NUM_STA; pstat->aid++)
1568
+
for (pstat->aid = 1; pstat->aid <= NUM_STA; pstat->aid++)
1569
1569
if (pstapriv->sta_aid[pstat->aid - 1] == NULL)
1570
1570
break;
1571
1571