diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 2c4c75e360..4ef3dbb697 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -136,7 +136,8 @@ static void setup_commandline_tag(bd_t *bd, char *commandline)
 	params->hdr.size =
 		(sizeof (struct tag_header) + strlen (p) + 1 + 4) >> 2;
 
-	strcpy (params->u.cmdline.cmdline, p);
+	strlcpy (params->u.cmdline.cmdline, p,
+				sizeof(params->u.cmdline.cmdline));
 
 	params = tag_next (params);
 }
diff --git a/drivers/net/ipq806x/ipq_gmac_eth.c b/drivers/net/ipq806x/ipq_gmac_eth.c
index be297d7bcf..e220a5b847 100644
--- a/drivers/net/ipq806x/ipq_gmac_eth.c
+++ b/drivers/net/ipq806x/ipq_gmac_eth.c
@@ -849,7 +849,7 @@ int ipq_gmac_init(ipq_gmac_board_cfg_t *gmac_cfg)
 
 		ipq_gmac_mii_clk_init(ipq_gmac_macs[i], clk_div_val, gmac_cfg);
 
-		strncpy((char *)ipq_gmac_macs[i]->phy_name, gmac_cfg->phy_name,
+		strlcpy((char *)ipq_gmac_macs[i]->phy_name, gmac_cfg->phy_name,
 					sizeof(ipq_gmac_macs[i]->phy_name));
 		bb_nodes[i] = malloc(sizeof(struct bitbang_nodes));
 		if (bb_nodes[i] == NULL)