From patchwork Mon Mar 19 16:56:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 887799 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=networkplumber.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=networkplumber-org.20150623.gappssmtp.com header.i=@networkplumber-org.20150623.gappssmtp.com header.b="q4MfTjC1"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 404j064Nt2z9sDX for ; Tue, 20 Mar 2018 03:56:54 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967566AbeCSQ4v (ORCPT ); Mon, 19 Mar 2018 12:56:51 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:43003 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967676AbeCSQ4p (ORCPT ); Mon, 19 Mar 2018 12:56:45 -0400 Received: by mail-pl0-f68.google.com with SMTP id w15-v6so10585535plq.9 for ; Mon, 19 Mar 2018 09:56:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8m9ftkKzycoTogqjwvNQzlXCMC/tC1au3WjXGxdjeqk=; b=q4MfTjC1CID4gxOSqtOMaLnxQvPFA6uqC2QMY0R015zLeEGUqdJl2yRRM8P6xKGEaN MijcLsynEc4kj7jSdFvhJiEEwv9qxV4/3timSJXWBw+mF+2iX/wBP5MOgeYy2SUedtiG v38P3l5WffrYpL6ezJuAIdzSthYo22FSyF3Z7a/jRVxmJhE5vEot8Xs96uL2/Ckr81cS 8iSXq35sWn8cWlXxQZ17Hyva+42cqJ8Zq+gSZh75kyhAXT1vx2+z4erO9n+BgWmwEIC4 SdjE3g/0hc+P/SFa9aHvp4BJUaZtDspbu03jZfni36H+H3LP+szIlDwi2h1rHD6K/8fs xi+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8m9ftkKzycoTogqjwvNQzlXCMC/tC1au3WjXGxdjeqk=; b=myCRWSkPMJ2Si8TW9VchwpYWlK1Ff4NQInKtsFxmq88UlF/oy4J8MrL+3FE9JLz2ak v15/6CUW5xm5a5Ny5zVGaeP0GXJrkZ4n+0Wy3M1tiNOYvOxLAJReFyn8DhOrnvDqy3rH MzgzM0rvKy2iBqqCdWzDAb6NDYJ0sdKXCqMjpYzJT6aI9WclvWQDtvsMs9ATv+Bi1hnR p3KGQsw5AzA9QfKA+91tBNt4vGTlWxKWHDsTCrWB99t6XnnBzpkfxG3flgNx0UuA0vps VWAxSz88/9Sq7BxghVNYSA72m62Ih8py9ij/u/tcEUW7YxE3y7P2EouhfzBfmxHrTnyQ BD7A== X-Gm-Message-State: AElRT7FFsEj/qHs2l01sTnlVLq5q/CV4LaU8Yyhjr5TSniFz/VzBqQFT impZltTVZTuCGswATuQxucn4fCGrVCA= X-Google-Smtp-Source: AG47ELvtlEw145ddb5zvsMqeSAl9/f+GLubxRijElXdREQepvL/XM+xWtLbPOA8ib9zx4dKPPLVRKA== X-Received: by 2002:a17:902:b183:: with SMTP id s3-v6mr13097842plr.108.1521478604182; Mon, 19 Mar 2018 09:56:44 -0700 (PDT) Received: from xeon-e3.lan (204-195-71-95.wavecable.com. [204.195.71.95]) by smtp.gmail.com with ESMTPSA id g13sm649759pfi.134.2018.03.19.09.56.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Mar 2018 09:56:43 -0700 (PDT) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 2/5] tunnel: use strlcpy to avoid strncpy warnings Date: Mon, 19 Mar 2018 09:56:35 -0700 Message-Id: <20180319165638.30166-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319165638.30166-1-stephen@networkplumber.org> References: <20180319165638.30166-1-stephen@networkplumber.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fixes warnings about strncpy size by using strlcpy. tunnel.c: In function ‘tnl_gen_ioctl’: tunnel.c:145:2: warning: ‘strncpy’ specified bound 16 equals destination size [-Wstringop-truncation] strncpy(ifr.ifr_name, name, IFNAMSIZ); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Stephen Hemminger Acked-by: David Ahern --- ip/tunnel.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ip/tunnel.c b/ip/tunnel.c index 948d5f7c90f6..abd9fa2ffe0c 100644 --- a/ip/tunnel.c +++ b/ip/tunnel.c @@ -64,7 +64,7 @@ int tnl_get_ioctl(const char *basedev, void *p) int fd; int err; - strncpy(ifr.ifr_name, basedev, IFNAMSIZ); + strlcpy(ifr.ifr_name, basedev, IFNAMSIZ); ifr.ifr_ifru.ifru_data = (void *)p; fd = socket(preferred_family, SOCK_DGRAM, 0); @@ -89,9 +89,9 @@ int tnl_add_ioctl(int cmd, const char *basedev, const char *name, void *p) int err; if (cmd == SIOCCHGTUNNEL && name[0]) - strncpy(ifr.ifr_name, name, IFNAMSIZ); + strlcpy(ifr.ifr_name, name, IFNAMSIZ); else - strncpy(ifr.ifr_name, basedev, IFNAMSIZ); + strlcpy(ifr.ifr_name, basedev, IFNAMSIZ); ifr.ifr_ifru.ifru_data = p; fd = socket(preferred_family, SOCK_DGRAM, 0); @@ -115,9 +115,9 @@ int tnl_del_ioctl(const char *basedev, const char *name, void *p) int err; if (name[0]) - strncpy(ifr.ifr_name, name, IFNAMSIZ); + strlcpy(ifr.ifr_name, name, IFNAMSIZ); else - strncpy(ifr.ifr_name, basedev, IFNAMSIZ); + strlcpy(ifr.ifr_name, basedev, IFNAMSIZ); ifr.ifr_ifru.ifru_data = p; @@ -142,7 +142,7 @@ static int tnl_gen_ioctl(int cmd, const char *name, int fd; int err; - strncpy(ifr.ifr_name, name, IFNAMSIZ); + strlcpy(ifr.ifr_name, name, IFNAMSIZ); ifr.ifr_ifru.ifru_data = p; fd = socket(preferred_family, SOCK_DGRAM, 0);