diff --git a/net/arp/arp_send.c b/net/arp/arp_send.c
index 31d84c6fb4a..174aa933a84 100644
--- a/net/arp/arp_send.c
+++ b/net/arp/arp_send.c
@@ -289,7 +289,7 @@ int arp_send(in_addr_t ipaddr)
 
   /* Remember the routing device name */
 
-  strncpy((FAR char *)state.snd_ifname, (FAR const char *)dev->d_ifname,
+  strlcpy((FAR char *)state.snd_ifname, (FAR const char *)dev->d_ifname,
           IFNAMSIZ);
 
   /* Now loop, testing if the address mapping is in the ARP table and re-
diff --git a/net/netdev/netdev_ifconf.c b/net/netdev/netdev_ifconf.c
index 513ec6e9c84..360228468d2 100644
--- a/net/netdev/netdev_ifconf.c
+++ b/net/netdev/netdev_ifconf.c
@@ -122,7 +122,7 @@ static int ifconf_ipv4_callback(FAR struct net_driver_s *dev, FAR void *arg)
            * transferred is returned in ifc_len.
            */
 
-          strncpy(req->ifr_name, dev->d_ifname, IFNAMSIZ);
+          strlcpy(req->ifr_name, dev->d_ifname, IFNAMSIZ);
 
           inaddr->sin_family = AF_INET;
           inaddr->sin_port   = 0;
diff --git a/net/netdev/netdev_ioctl.c b/net/netdev/netdev_ioctl.c
index cd9296613e6..e3243be15c9 100644
--- a/net/netdev/netdev_ioctl.c
+++ b/net/netdev/netdev_ioctl.c
@@ -1086,7 +1086,7 @@ static int netdev_ifr_ioctl(FAR struct socket *psock, int cmd,
           dev = netdev_findbyindex(req->ifr_ifindex);
           if (dev != NULL)
             {
-              strncpy(req->ifr_name, dev->d_ifname, IFNAMSIZ);
+              strlcpy(req->ifr_name, dev->d_ifname, IFNAMSIZ);
               ret = OK;
             }
           else
diff --git a/net/netdev/netdev_register.c b/net/netdev/netdev_register.c
index 0aefec673d9..c44510ee829 100644
--- a/net/netdev/netdev_register.c
+++ b/net/netdev/netdev_register.c
@@ -399,7 +399,7 @@ int netdev_register(FAR struct net_driver_s *dev, enum net_lltype_e lltype)
            */
 
           dev->d_ifname[IFNAMSIZ - 1] = '\0';
-          strncpy(devfmt_str, dev->d_ifname, IFNAMSIZ);
+          strlcpy(devfmt_str, dev->d_ifname, IFNAMSIZ);
 
           /* Then use the content of the temporary buffer as the format
            * string.
diff --git a/net/netlink/netlink_route.c b/net/netlink/netlink_route.c
index eb0e9035c7e..4e09229bbc2 100644
--- a/net/netlink/netlink_route.c
+++ b/net/netlink/netlink_route.c
@@ -217,7 +217,7 @@ netlink_get_device(FAR struct net_driver_s *dev,
   resp->attr.rta_len     = RTA_LENGTH(strnlen(dev->d_ifname, IFNAMSIZ));
   resp->attr.rta_type    = IFLA_IFNAME;
 
-  strncpy((FAR char *)resp->data, dev->d_ifname, IFNAMSIZ);
+  strlcpy((FAR char *)resp->data, dev->d_ifname, IFNAMSIZ);
 
   /* Finally, return the response */
 
diff --git a/net/rpmsg/rpmsg_sockif.c b/net/rpmsg/rpmsg_sockif.c
index f7c8eb5f479..08aca79045f 100644
--- a/net/rpmsg/rpmsg_sockif.c
+++ b/net/rpmsg/rpmsg_sockif.c
@@ -517,8 +517,10 @@ static void rpmsg_socket_ns_bind(FAR struct rpmsg_device *rdev,
       return;
     }
 
-  strcpy(new->rpaddr.rp_cpu, rpmsg_get_cpuname(rdev));
-  strcpy(new->rpaddr.rp_name, name + RPMSG_SOCKET_NAME_PREFIX_LEN);
+  strlcpy(new->rpaddr.rp_cpu, rpmsg_get_cpuname(rdev),
+          sizeof(new->rpaddr.rp_cpu));
+  strlcpy(new->rpaddr.rp_name, name + RPMSG_SOCKET_NAME_PREFIX_LEN,
+          sizeof(new->rpaddr.rp_name));
 
   rpmsg_socket_lock(&server->recvlock);
 
diff --git a/net/socket/connect.c b/net/socket/connect.c
index 8b14821f88a..da3bfff4fb4 100644
--- a/net/socket/connect.c
+++ b/net/socket/connect.c
@@ -140,15 +140,7 @@ int psock_connect(FAR struct socket *psock, FAR const struct sockaddr *addr,
   if (ret >= 0)
     {
       FAR struct socket_conn_s *conn = psock->s_conn;
-
-      if (addr != NULL)
-        {
-          conn->s_flags |= _SF_CONNECTED;
-        }
-      else
-        {
-          conn->s_flags &= ~_SF_CONNECTED;
-        }
+      conn->s_flags |= _SF_CONNECTED;
     }
 
   return ret;
diff --git a/net/utils/net_ipchksum.c b/net/utils/net_ipchksum.c
index c9242cc88ea..0bde29b2554 100644
--- a/net/utils/net_ipchksum.c
+++ b/net/utils/net_ipchksum.c
@@ -96,7 +96,7 @@ uint16_t ipv4_upperlayer_chksum(FAR struct net_driver_s *dev, uint8_t proto)
 
   /* Sum IP source and destination addresses. */
 
-  sum = chksum(sum, (FAR uint8_t *)&ipv4->srcipaddr, 2 * sizeof(in_addr_t));
+  sum = chksum(sum, (FAR uint8_t *)&ipv4->srcipaddr, sizeof(in_addr_t));
 
   /* Sum IP payload data. */