psmattas/android_system_qcom-lineage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated string banned functions strncpy and memcpy

Browse Source 
Banned call strncpy has been updated
with strlcpy

Change-Id: I992c2d3580dce24981a4ec9fd9d50ecca109c044
CRs-Fixed: 554334
This commit is contained in:
Hanumantha Reddy Pothula
2013-11-29 17:09:30 +05:30
parent e976b492fe
commit 87d01a1158
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
softap/sdk/qsap.c
View File

@@ -266,12 +266,12 @@ void qsap_send_module_down_indication(void)
/* Equivalent to: iwpriv wlan0 sendModuleInd */
if ((s = socket(PF_INET, SOCK_DGRAM, 0)) >= 0) {
strncpy(wrq.ifr_name, "wlan0", IFNAMSIZ);
strlcpy(wrq.ifr_name, "wlan0", IFNAMSIZ);
wrq.u.data.length = 0; /* No Set arguments */
wrq.u.mode = 5; /* WE_MODULE_DOWN_IND sub-command */
ret = ioctl(s, (SIOCIWFIRSTPRIV + 1), &wrq);
if (ret < 0 ) {
strncpy(wrq.ifr_name, "softap.0", IFNAMSIZ);
strlcpy(wrq.ifr_name, "softap.0", IFNAMSIZ);
ret = ioctl(s, (SIOCIWFIRSTPRIV + 1), &wrq);
if (ret < 0 ) {
ALOGE("ioctl failed: %s", strerror(errno));
@@ -295,7 +295,7 @@ s32 qsap_send_init_ap(void)
/* Equivalent to: iwpriv wlan0 initAP */
if ((s = socket(AF_INET, SOCK_DGRAM, 0)) >= 0) {
strncpy(wrq.ifr_name, "wlan0", IFNAMSIZ);
strlcpy(wrq.ifr_name, "wlan0", IFNAMSIZ);
wrq.u.data.length = 0; /* No Set arguments */
wrq.u.data.flags = 2; /* WE_INIT_AP sub-command */
ret = ioctl(s, (SIOCIWFIRSTPRIV + 6), &wrq);
@@ -323,7 +323,7 @@ s32 qsap_send_exit_ap(void)
/* Equivalent to: iwpriv wlan0 exitAP */
if ((s = socket(AF_INET, SOCK_DGRAM, 0)) >= 0) {
strncpy(wrq.ifr_name, "wlan0", IFNAMSIZ);
strlcpy(wrq.ifr_name, "wlan0", IFNAMSIZ);
wrq.u.data.length = 0; /* No Set arguments */
wrq.u.data.flags = 3; /*WE_EXIT_AP sub-command */
@@ -409,7 +409,7 @@ s32 wifi_qsap_stop_bss(void)
return eERR_STOP_BSS;
}
strncpy(wrq.ifr_name, iface, sizeof(wrq.ifr_name));
strlcpy(wrq.ifr_name, iface, sizeof(wrq.ifr_name));
wrq.u.data.length = sizeof(cmd);
wrq.u.data.pointer = cmd;
wrq.u.data.flags = 0;

16
softap/sdk/qsap_api.c
View File

@@ -1065,7 +1065,7 @@ static int qsap_read_mac_address(s8 *presp, u32 *plen)
if(NULL == ptr)
goto end;
strncpy(mac, ptr+1, MAC_ADDR_LEN);
strlcpy(mac, ptr+1, MAC_ADDR_LEN);
*plen = qsap_scnprintf(presp, len, "%s %s=", SUCCESS, cmd_list[eCMD_MAC_ADDR].name);
ptr = presp + strlen(presp);
len -= strlen(presp); /* decrease the total available buf length */
@@ -1166,7 +1166,7 @@ int qsap_get_operating_channel(s32 *pchan)
*pchan = 0;
strncpy(wrq.ifr_name, pif, sizeof(wrq.ifr_name));
strlcpy(wrq.ifr_name, pif, sizeof(wrq.ifr_name));
wrq.u.data.length = sizeof(s32);
wrq.u.data.pointer = pchan;
wrq.u.data.flags = 0;
@@ -1228,7 +1228,7 @@ int qsap_get_sap_auto_channel_selection(s32 *pautochan)
memset(&sap_autochan_info, 0, sizeof(sap_autochan_info));
memset(&wrq, 0, sizeof(wrq));
strncpy(wrq.ifr_name, pif, sizeof(wrq.ifr_name));
strlcpy(wrq.ifr_name, pif, sizeof(wrq.ifr_name));
wrq.u.data.length = sizeof(s32);
sap_autochan_info.subioctl = QCSAP_PARAM_GET_AUTO_CHANNEL;
wrq.u.data.pointer = pautochan;
@@ -1348,7 +1348,7 @@ int qsap_set_channel_range(s8 *buf)
memset(&wrq, 0, sizeof(wrq));
if (ENABLE != is_softap_enabled()) {
strncpy(wrq.ifr_name, "wlan0", sizeof(wrq.ifr_name));
strlcpy(wrq.ifr_name, "wlan0", sizeof(wrq.ifr_name));
sta_chan_range.subioctl = WE_SET_SAP_CHANNELS;
ret = sscanf(temp, "%d %d %d", &(sta_chan_range.stastartchan),
&(sta_chan_range.staendchan), &(sta_chan_range.staband));
@@ -1363,7 +1363,7 @@ int qsap_set_channel_range(s8 *buf)
__func__);
ret = ioctl(sock, WLAN_PRIV_SET_THREE_INT_GET_NONE, &wrq);
} else {
strncpy(wrq.ifr_name, pif, sizeof(wrq.ifr_name));
strlcpy(wrq.ifr_name, pif, sizeof(wrq.ifr_name));
ret = sscanf(temp, "%d %d %d", &(sap_chan_range.startchan),
&(sap_chan_range.endchan), &(sap_chan_range.band));
if (3 != ret) {
@@ -1491,7 +1491,7 @@ void qsap_get_associated_sta_mac(s8 *presp, u32 *plen)
#define SIZE_OF_MAC_INT (6)
strncpy(wrq.ifr_name, pif, sizeof(wrq.ifr_name));
strlcpy(wrq.ifr_name, pif, sizeof(wrq.ifr_name));
wrq.u.data.length = SIZE_OF_MAC_INT * 8 + 8; /** 8 supported MAC and 7 SPACE separators and a '\0' */
wrq.u.data.pointer = (void *)pbuf;
wrq.u.data.flags = 0;
@@ -1588,7 +1588,7 @@ void qsap_read_ap_stats(s8 *presp, u32 *plen)
goto error;
}
strncpy(wrq.ifr_name, pif, sizeof(wrq.ifr_name));
strlcpy(wrq.ifr_name, pif, sizeof(wrq.ifr_name));
wrq.u.data.length = MAX_RESP_LEN;
wrq.u.data.pointer = (void *)pbuf;
wrq.u.data.flags = 0;
@@ -2296,7 +2296,7 @@ void qsap_disassociate_sta(s8 *pVal, s8 *presp, u32 *plen)
goto end;
}
strncpy(wrq.ifr_name, pif, sizeof(wrq.ifr_name));
strlcpy(wrq.ifr_name, pif, sizeof(wrq.ifr_name));
if (TRUE != qsap_get_mac_in_bytes(pVal, (char *) &wrq.u)) {
ALOGE("%s: Invalid input \n", __func__);