diff --git a/drivers/stemodem/caif_rtnl.c b/drivers/stemodem/caif_rtnl.c
index 1a42c144..584c5a4a 100644
--- a/drivers/stemodem/caif_rtnl.c
+++ b/drivers/stemodem/caif_rtnl.c
@@ -85,7 +85,7 @@ static void parse_newlink_param(struct ifinfomsg *msg, int size,
 		if (attr->rta_type == IFLA_IFNAME &&
 				ifname != NULL) {
 
-			strncpy(ifname, RTA_DATA(attr), IF_NAMESIZE);
+			strncpy(ifname, RTA_DATA(attr), IF_NAMESIZE - 1);
 			ifname[IF_NAMESIZE-1] = '\0';
 			break;
 		}
diff --git a/drivers/stemodem/gprs-context.c b/drivers/stemodem/gprs-context.c
index fb279c5a..c2284806 100644
--- a/drivers/stemodem/gprs-context.c
+++ b/drivers/stemodem/gprs-context.c
@@ -29,6 +29,7 @@
 #include <stdio.h>
 #include <errno.h>
 
+#include <ell/ell.h>
 #include <glib.h>
 
 #include <ofono/log.h>
@@ -147,7 +148,7 @@ static void rtnl_callback(int ifindex, const char *ifname, void *user_data)
 		return;
 	}
 
-	strncpy(gcd->interface, ifname, sizeof(gcd->interface));
+	l_strlcpy(gcd->interface, ifname, sizeof(gcd->interface));
 	gcd->ifindex = ifindex;
 	gcd->created = TRUE;
 }