diff options
author | Dmitry Shmidt <dimitrysh@google.com> | 2013-10-28 16:45:22 -0700 |
---|---|---|
committer | Ying Wang <wangying@google.com> | 2013-12-05 12:29:42 -0800 |
commit | ee001e62478c509dc25d06edd8d969f14f2c80df (patch) | |
tree | ac2e0da71b75bbb16c7938be5c3e2988a213a30f /bcmdhd/wpa_supplicant_8_lib | |
parent | e87d6bef50aac497027afdaf367d997e15134c0b (diff) | |
download | hardware_broadcom_wlan-ee001e62478c509dc25d06edd8d969f14f2c80df.zip hardware_broadcom_wlan-ee001e62478c509dc25d06edd8d969f14f2c80df.tar.gz hardware_broadcom_wlan-ee001e62478c509dc25d06edd8d969f14f2c80df.tar.bz2 |
bcmdhd: Replace os_strncpy with os_strlcpy
Change-Id: I13e64bde048bfdf3f007d6e41a8fe731739336ae
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'bcmdhd/wpa_supplicant_8_lib')
-rw-r--r-- | bcmdhd/wpa_supplicant_8_lib/driver_cmd_nl80211.c | 2 | ||||
-rw-r--r-- | bcmdhd/wpa_supplicant_8_lib/driver_cmd_wext.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/bcmdhd/wpa_supplicant_8_lib/driver_cmd_nl80211.c b/bcmdhd/wpa_supplicant_8_lib/driver_cmd_nl80211.c index b43c01a..29b9e12 100644 --- a/bcmdhd/wpa_supplicant_8_lib/driver_cmd_nl80211.c +++ b/bcmdhd/wpa_supplicant_8_lib/driver_cmd_nl80211.c @@ -62,7 +62,7 @@ int wpa_driver_nl80211_driver_cmd(void *priv, char *cmd, char *buf, os_memcpy(buf, cmd, strlen(cmd) + 1); memset(&ifr, 0, sizeof(ifr)); memset(&priv_cmd, 0, sizeof(priv_cmd)); - os_strncpy(ifr.ifr_name, bss->ifname, IFNAMSIZ); + os_strlcpy(ifr.ifr_name, bss->ifname, IFNAMSIZ); priv_cmd.buf = buf; priv_cmd.used_len = buf_len; diff --git a/bcmdhd/wpa_supplicant_8_lib/driver_cmd_wext.c b/bcmdhd/wpa_supplicant_8_lib/driver_cmd_wext.c index 6aa435a..3734cb0 100644 --- a/bcmdhd/wpa_supplicant_8_lib/driver_cmd_wext.c +++ b/bcmdhd/wpa_supplicant_8_lib/driver_cmd_wext.c @@ -115,7 +115,7 @@ int wpa_driver_wext_combo_scan(void *priv, struct wpa_driver_scan_params *params buf[bp++] = (u8)(WEXT_CSCAN_HOME_DWELL_TIME >> 8); os_memset(&iwr, 0, sizeof(iwr)); - os_strncpy(iwr.ifr_name, drv->ifname, IFNAMSIZ); + os_strlcpy(iwr.ifr_name, drv->ifname, IFNAMSIZ); iwr.u.data.pointer = buf; iwr.u.data.length = bp; @@ -258,7 +258,7 @@ static int wpa_driver_set_backgroundscan_params(void *priv) bp += WEXT_PNO_MAX_REPEAT_LENGTH + 1; os_memset(&iwr, 0, sizeof(iwr)); - os_strncpy(iwr.ifr_name, drv->ifname, IFNAMSIZ); + os_strlcpy(iwr.ifr_name, drv->ifname, IFNAMSIZ); iwr.u.data.pointer = buf; iwr.u.data.length = bp; @@ -293,7 +293,7 @@ int wpa_driver_wext_driver_cmd( void *priv, char *cmd, char *buf, size_t buf_len } if (os_strcasecmp(cmd, "RSSI-APPROX") == 0) { - os_strncpy(cmd, RSSI_CMD, MAX_DRV_CMD_SIZE); + os_strlcpy(cmd, RSSI_CMD, MAX_DRV_CMD_SIZE); } else if( os_strncasecmp(cmd, "SCAN-CHANNELS", 13) == 0 ) { int no_of_chan; @@ -311,15 +311,15 @@ int wpa_driver_wext_driver_cmd( void *priv, char *cmd, char *buf, size_t buf_len if (ret < 0) { return ret; } - os_strncpy(cmd, "PNOFORCE 1", MAX_DRV_CMD_SIZE); + os_strlcpy(cmd, "PNOFORCE 1", MAX_DRV_CMD_SIZE); drv->bgscan_enabled = 1; } else if( os_strcasecmp(cmd, "BGSCAN-STOP") == 0 ) { - os_strncpy(cmd, "PNOFORCE 0", MAX_DRV_CMD_SIZE); + os_strlcpy(cmd, "PNOFORCE 0", MAX_DRV_CMD_SIZE); drv->bgscan_enabled = 0; } os_memset(&iwr, 0, sizeof(iwr)); - os_strncpy(iwr.ifr_name, drv->ifname, IFNAMSIZ); + os_strlcpy(iwr.ifr_name, drv->ifname, IFNAMSIZ); os_memcpy(buf, cmd, strlen(cmd) + 1); iwr.u.data.pointer = buf; iwr.u.data.length = buf_len; |