A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-15 01:01:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Use max STA count when iterating SAP clients

Browse source 
When printing all of the stations connected to a SAP adapter, the ini
value for max number of station clients is used as the iteration limit.
Instead, use the max number of stations constant used to allocate the
array. This ensures all connected stations are printed in all cases, and
removes the theoretical possibility of running off the end of the array
in some configurations.

Change-Id: I3a506905f40272efe472028391e8080d764cb390
CRs-Fixed: 2100833
This commit is contained in:
Dustin Brown 2017-08-31 12:16:14 -07:00 • committed by snandini
commit e5d06fb548
1 changed files with 47 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

111
core/hdd/src/wlan_hdd_hostapd.c
View file

@ -5109,93 +5109,82 @@ static int iw_softap_version(struct net_device *dev,
return ret;
}
static
QDF_STATUS hdd_softap_get_sta_info(hdd_adapter_t *pAdapter, uint8_t *pBuf,
int buf_len) {
uint8_t i;
uint8_t maxSta = 0;
int len = 0;
const char sta_info_header[] = "staId staAddress";
struct hdd_context *hdd_ctx;
static int hdd_softap_get_sta_info(hdd_adapter_t *adapter,
uint8_t *buf,
int size)
{
int i;
int written;
uint8_t bc_sta_id;
ENTER();
if (NULL == pAdapter) {
hdd_err("Adapter is NULL");
return -EINVAL;
}
bc_sta_id = WLAN_HDD_GET_AP_CTX_PTR(adapter)->uBCStaId;
hdd_ctx = WLAN_HDD_GET_CTX(pAdapter);
if (0 != wlan_hdd_validate_context(hdd_ctx))
return QDF_STATUS_E_FAULT;
written = scnprintf(buf, size, "\nstaId staAddress\n");
for (i = 0; i < WLAN_MAX_STA_COUNT; i++) {
hdd_station_info_t *sta = &adapter->aStaInfo[i];
len = scnprintf(pBuf, buf_len, sta_info_header);
pBuf += len;
buf_len -= len;
maxSta = hdd_ctx->config->maxNumberOfPeers;
for (i = 0; i <= maxSta; i++) {
hdd_station_info_t *sta_info_ptr = &pAdapter->aStaInfo[i];
if (!sta_info_ptr->isUsed)
continue;
if (CHAN_HOP_ALL_BANDS_ENABLE &&
(i == (WLAN_HDD_GET_AP_CTX_PTR(pAdapter))->uBCStaId))
continue;
if (WE_GET_STA_INFO_SIZE > buf_len)
if (written >= size - 1)
break;
len = scnprintf(pBuf, buf_len,
"%5d %02x:%02x:%02x:%02x:%02x:%02x ecsa=%d\n",
sta_info_ptr->ucSTAId,
sta_info_ptr->macAddrSTA.bytes[0],
sta_info_ptr->macAddrSTA.bytes[1],
sta_info_ptr->macAddrSTA.bytes[2],
sta_info_ptr->macAddrSTA.bytes[3],
sta_info_ptr->macAddrSTA.bytes[4],
sta_info_ptr->macAddrSTA.bytes[5],
sta_info_ptr->ecsa_capable);
pBuf += len;
buf_len -= len;
if (!sta->isUsed)
continue;
if (i == bc_sta_id)
continue;
written += scnprintf(buf + written, size - written,
"%5d %02x:%02x:%02x:%02x:%02x:%02x ecsa=%d\n",
sta->ucSTAId,
sta->macAddrSTA.bytes[0],
sta->macAddrSTA.bytes[1],
sta->macAddrSTA.bytes[2],
sta->macAddrSTA.bytes[3],
sta->macAddrSTA.bytes[4],
sta->macAddrSTA.bytes[5],
sta->ecsa_capable);
}
EXIT();
return QDF_STATUS_SUCCESS;
return 0;
}
static int __iw_softap_get_sta_info(struct net_device *dev,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
hdd_adapter_t *pHostapdAdapter = netdev_priv(dev);
QDF_STATUS status;
int errno;
hdd_adapter_t *adapter;
struct hdd_context *hdd_ctx;
int ret;
ENTER_DEV(dev);
hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter);
ret = wlan_hdd_validate_context(hdd_ctx);
if (0 != ret)
return ret;
adapter = netdev_priv(dev);
errno = hdd_validate_adapter(adapter);
if (errno)
return errno;
ret = hdd_check_private_wext_control(hdd_ctx, info);
if (0 != ret)
return ret;
hdd_ctx = WLAN_HDD_GET_CTX(adapter);
errno = wlan_hdd_validate_context(hdd_ctx);
if (errno)
return errno;
status =
hdd_softap_get_sta_info(pHostapdAdapter, extra,
WE_SAP_MAX_STA_INFO);
errno = hdd_check_private_wext_control(hdd_ctx, info);
if (errno)
return errno;
if (!QDF_IS_STATUS_SUCCESS(status)) {
hdd_err("Failed to get sta info: %d", status);
return -EINVAL;
errno = hdd_softap_get_sta_info(adapter, extra, WE_SAP_MAX_STA_INFO);
if (errno) {
hdd_err("Failed to get sta info; errno:%d", errno);
return errno;
}
wrqu->data.length = strlen(extra);
EXIT();
return 0;
}