From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl0-f68.google.com ([209.85.160.68]:37806 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751485AbeCTU3R (ORCPT ); Tue, 20 Mar 2018 16:29:17 -0400 Received: by mail-pl0-f68.google.com with SMTP id w12-v6so1723081plp.4 for ; Tue, 20 Mar 2018 13:29:16 -0700 (PDT) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 v2 3/9] ip: use strlcpy() to avoid truncation Date: Tue, 20 Mar 2018 13:29:03 -0700 Message-Id: <20180320202909.22166-4-stephen@networkplumber.org> In-Reply-To: <20180320202909.22166-1-stephen@networkplumber.org> References: <20180320202909.22166-1-stephen@networkplumber.org> Sender: netdev-owner@vger.kernel.org List-ID: This fixes gcc-8 warnings about strncpy bounds by using strlcpy instead. Signed-off-by: Stephen Hemminger --- ip/iplink.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ip/iplink.c b/ip/iplink.c index d401311bcad9..cca530eeeb09 100644 --- a/ip/iplink.c +++ b/ip/iplink.c @@ -1114,7 +1114,7 @@ static int do_chflags(const char *dev, __u32 flags, __u32 mask) int fd; int err; - strncpy(ifr.ifr_name, dev, IFNAMSIZ); + strlcpy(ifr.ifr_name, dev, IFNAMSIZ); fd = get_ctl_fd(); if (fd < 0) return -1; @@ -1141,8 +1141,8 @@ static int do_changename(const char *dev, const char *newdev) int fd; int err; - strncpy(ifr.ifr_name, dev, IFNAMSIZ); - strncpy(ifr.ifr_newname, newdev, IFNAMSIZ); + strlcpy(ifr.ifr_name, dev, IFNAMSIZ); + strlcpy(ifr.ifr_newname, newdev, IFNAMSIZ); fd = get_ctl_fd(); if (fd < 0) return -1; @@ -1165,7 +1165,7 @@ static int set_qlen(const char *dev, int qlen) if (s < 0) return -1; - strncpy(ifr.ifr_name, dev, IFNAMSIZ); + strlcpy(ifr.ifr_name, dev, IFNAMSIZ); if (ioctl(s, SIOCSIFTXQLEN, &ifr) < 0) { perror("SIOCSIFXQLEN"); close(s); @@ -1185,7 +1185,7 @@ static int set_mtu(const char *dev, int mtu) if (s < 0) return -1; - strncpy(ifr.ifr_name, dev, IFNAMSIZ); + strlcpy(ifr.ifr_name, dev, IFNAMSIZ); if (ioctl(s, SIOCSIFMTU, &ifr) < 0) { perror("SIOCSIFMTU"); close(s); @@ -1212,7 +1212,7 @@ static int get_address(const char *dev, int *htype) return -1; } - strncpy(ifr.ifr_name, dev, IFNAMSIZ); + strlcpy(ifr.ifr_name, dev, IFNAMSIZ); if (ioctl(s, SIOCGIFINDEX, &ifr) < 0) { perror("SIOCGIFINDEX"); close(s); @@ -1243,7 +1243,7 @@ static int parse_address(const char *dev, int hatype, int halen, int alen; memset(ifr, 0, sizeof(*ifr)); - strncpy(ifr->ifr_name, dev, IFNAMSIZ); + strlcpy(ifr->ifr_name, dev, IFNAMSIZ); ifr->ifr_hwaddr.sa_family = hatype; alen = ll_addr_a2n(ifr->ifr_hwaddr.sa_data, 14, lla); if (alen < 0) -- 2.16.2