Replace remainining strncpy() uses with strlcpy()

Signed-hostap: Jouni Malinen <j@w1.fi>

diff --git a/src/drivers/driver_atheros.c b/src/drivers/driver_atheros.c
index 2921afb7bb8aaf80e74e5b6b87af18690863ec78..2547a43d7a91ed6c983a4a91f3ee9d2339fa3bd9 100644 (file)
--- a/src/drivers/driver_atheros.c
+++ b/src/drivers/driver_atheros.c
@@ -894,7 +894,7 @@ static int atheros_set_qos_map(void *ctx, const u8 *qos_map_set,
                memset(&req, 0, sizeof(struct ieee80211req_athdbg));
                req.cmd = IEEE80211_DBGREQ_SETQOSMAPCONF;
                os_memset(&iwr, 0, sizeof(iwr));
-               os_strncpy(iwr.ifr_name, drv->iface, sizeof(iwr.ifr_name));
+               os_strlcpy(iwr.ifr_name, drv->iface, sizeof(iwr.ifr_name));
                iwr.u.data.pointer = (void *) &req;
                iwr.u.data.length = sizeof(struct ieee80211req_athdbg);
        }
@@ -1385,7 +1385,7 @@ static void fetch_pending_big_events(struct atheros_driver_data *drv)
 
        while (1) {
                os_memset(&iwr, 0, sizeof(iwr));
-               os_strncpy(iwr.ifr_name, drv->iface, IFNAMSIZ);
+               os_strlcpy(iwr.ifr_name, drv->iface, IFNAMSIZ);
 
                iwr.u.data.pointer = (void *) tbuf;
                iwr.u.data.length = sizeof(tbuf);

diff --git a/src/drivers/driver_bsd.c b/src/drivers/driver_bsd.c
index 4acb12beaabfc89d00283ad08e9f1d3551b31572..45d6b191c0879ceb21dae3d735a291188f8ed1b5 100644 (file)
--- a/src/drivers/driver_bsd.c
+++ b/src/drivers/driver_bsd.c
@@ -72,7 +72,7 @@ get80211opmode(struct bsd_driver_data *drv)
        struct ifmediareq ifmr;
 
        (void) memset(&ifmr, 0, sizeof(ifmr));
-       (void) strncpy(ifmr.ifm_name, drv->ifname, sizeof(ifmr.ifm_name));
+       (void) os_strlcpy(ifmr.ifm_name, drv->ifname, sizeof(ifmr.ifm_name));
 
        if (ioctl(drv->sock, SIOCGIFMEDIA, (caddr_t)&ifmr) >= 0) {
                if (ifmr.ifm_current & IFM_IEEE80211_ADHOC) {

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 30a8bb198ba90d6b5df97cb9447e95f66179e066..a1155ce652afc4a1f797c1b309a1aed66cdad759 100644 (file)
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -3187,7 +3187,7 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg)
                  genlmsg_attrlen(gnlh, 0), NULL);
 
        if (tb[NL80211_ATTR_WIPHY_NAME])
-               os_strncpy(drv->phyname,
+               os_strlcpy(drv->phyname,
                           nla_get_string(tb[NL80211_ATTR_WIPHY_NAME]),
                           sizeof(drv->phyname));
        if (tb[NL80211_ATTR_MAX_NUM_SCAN_SSIDS])
@@ -10656,7 +10656,7 @@ static int android_pno_start(struct i802_bss *bss,
 
        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 = bp;

diff --git a/src/drivers/driver_wext.c b/src/drivers/driver_wext.c
index 140105024cd7baa923819c315dbe0c2aed69c878..6e2e771b9fda2d89689d7abd1dd66fcaa258bec3 100644 (file)
--- a/src/drivers/driver_wext.c
+++ b/src/drivers/driver_wext.c
@@ -2427,7 +2427,7 @@ static int wext_sched_scan(void *priv, struct wpa_driver_scan_params *params,
        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;