Merge "softap: sscanf sanity check for SoftAP service"

This commit is contained in:
Linux Build Service Account
2013-11-26 13:29:20 -08:00
committed by Gerrit - the friendly Code Review server

View File

@@ -1352,8 +1352,13 @@ int qsap_set_channel_range(s8 *buf)
if (ENABLE != is_softap_enabled()) { if (ENABLE != is_softap_enabled()) {
strncpy(wrq.ifr_name, "wlan0", sizeof(wrq.ifr_name)); strncpy(wrq.ifr_name, "wlan0", sizeof(wrq.ifr_name));
sta_chan_range.subioctl = WE_SET_SAP_CHANNELS; sta_chan_range.subioctl = WE_SET_SAP_CHANNELS;
sscanf(temp, "%d %d %d", &(sta_chan_range.stastartchan), ret = sscanf(temp, "%d %d %d", &(sta_chan_range.stastartchan),
&(sta_chan_range.staendchan), &(sta_chan_range.staband)); &(sta_chan_range.staendchan), &(sta_chan_range.staband));
if (3 != ret) {
ALOGE("%s : sscanf is not successful\n", __func__);
close(sock);
goto error;
}
memcpy(wrq.u.name, (char *)(&sta_chan_range), sizeof(sta_chan_range)); memcpy(wrq.u.name, (char *)(&sta_chan_range), sizeof(sta_chan_range));
ALOGE("%s :Softap is off,Send SET_CHANNEL_RANGE over sta interface\n", ALOGE("%s :Softap is off,Send SET_CHANNEL_RANGE over sta interface\n",
@@ -1361,8 +1366,13 @@ int qsap_set_channel_range(s8 *buf)
ret = ioctl(sock, WLAN_PRIV_SET_THREE_INT_GET_NONE, &wrq); ret = ioctl(sock, WLAN_PRIV_SET_THREE_INT_GET_NONE, &wrq);
} else { } else {
strncpy(wrq.ifr_name, pif, sizeof(wrq.ifr_name)); strncpy(wrq.ifr_name, pif, sizeof(wrq.ifr_name));
sscanf(temp, "%d %d %d", &(sap_chan_range.startchan), ret = sscanf(temp, "%d %d %d", &(sap_chan_range.startchan),
&(sap_chan_range.endchan), &(sap_chan_range.band)); &(sap_chan_range.endchan), &(sap_chan_range.band));
if (3 != ret) {
ALOGE("%s : sscanf is not successful\n", __func__);
close(sock);
goto error;
}
memcpy(wrq.u.name, (char *)(&sap_chan_range), sizeof(sap_chan_range)); memcpy(wrq.u.name, (char *)(&sap_chan_range), sizeof(sap_chan_range));
ALOGE("%s :SAP is on,Send SET_CHANNEL_RANGE over softap interface\n", ALOGE("%s :SAP is on,Send SET_CHANNEL_RANGE over softap interface\n",