From patchwork Tue Mar 20 20:29:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 888415 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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="0DFg1Ncb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 405Pfm47Wpz9ryk for ; Wed, 21 Mar 2018 07:29:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751539AbeCTU3S (ORCPT ); Tue, 20 Mar 2018 16:29:18 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:45458 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751269AbeCTU3O (ORCPT ); Tue, 20 Mar 2018 16:29:14 -0400 Received: by mail-pl0-f68.google.com with SMTP id n15-v6so1715211plp.12 for ; Tue, 20 Mar 2018 13:29:14 -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=l72ZjGiZ5FotRL5KPrXM2WdONwjyd6cnLTL0rt4WfcA=; b=0DFg1Ncb3JzMro+RsYSY022Wf0K4uJRkQcFebRSOspVu6/dsAL/Pmr/TPXYauTTxrG aJIbIGCbMgDdrRVsq2v0hYOcJpiappmzgEqPoeZ0/MAStbsKbA7Ulu1bGOxxu8Jkclt5 XFEIdlaKp7GBML/l2PI99BvQuEQ1zbzk5k2XPj6a50cbFf/0aEXmNBj0VbVDzzdnQfvY Qz+SzoIPJ1nXCyR3xVim7pV709jC+Wv959NyzTpJ2Vzr9tNmVO6KQ3qwZ9fBVw5jKLhU op+CsMXG5q0j3/j1FXg/+EKJMXydAxwXu68JuCHpRIkVYo8/iP7YY1YFHhhzjkr/h65r 1JZA== 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=l72ZjGiZ5FotRL5KPrXM2WdONwjyd6cnLTL0rt4WfcA=; b=D0bz4vK+6w52xm2IxbBxiInIjYNRZh8sa2ym4E+H4V5aJ+ibkzEyRxSD+LVYtKqiG/ 67F0Zn/V3tlfkPF6U6l2wjRVL6X/5XBlePV3ffANVj1ClY1TvIXXd2RuCAB5BVIAjgBP DD8C49ISAWCsp+pqTFpFb2cVn9aFRQWe4UNttaK/A39iZxEgta42fgfNbWUnNQWiF8cC AeWi5OfQZ25Hy3VF62QAkV7pNX1ekf49CEFKh6J8fT7y/vl+fMxy1iS8g3OT2AlKyTVZ NYqS/ukwT2fzJ0kWV1d82ynqs4+fq8xisz54rGOiDmStBxHsgBUSbwSnb0v8eL0igD0g klRQ== X-Gm-Message-State: AElRT7FlBMC6kZ+IMfjYOXKSK+xrlj76+y8TwAHuy7xodFInKUXz3CMk UIeSlPxIx+iXmULsNdVjls8nJ3eB1lk= X-Google-Smtp-Source: AG47ELsUrRLb7FJumAJ2soNx/pn4ZWnGulnEm76vdavUcTH4+ENXzm4mRjx1RJOxPbQlg/rJsPVqsw== X-Received: by 2002:a17:902:6b0c:: with SMTP id o12-v6mr18298536plk.295.1521577753370; Tue, 20 Mar 2018 13:29:13 -0700 (PDT) Received: from xeon-e3.lan (204-195-71-95.wavecable.com. [204.195.71.95]) by smtp.gmail.com with ESMTPSA id u68sm5343597pfu.167.2018.03.20.13.29.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Mar 2018 13:29:12 -0700 (PDT) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 v2 1/9] bridge: avoid snprint truncation on time Date: Tue, 20 Mar 2018 13:29:01 -0700 Message-Id: <20180320202909.22166-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180320202909.22166-1-stephen@networkplumber.org> References: <20180320202909.22166-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 This fixes new gcc warning about possible string overflow. mdb.c: In function ‘__print_router_port_stats’: mdb.c:61:11: warning: ‘%.2i’ directive output may be truncated writing between 2 and 7 bytes into a region of size between 0 and 4 [-Wformat-truncation=] "%4i.%.2i", (int)tv.tv_sec, ^~~~ Note: already fixed in iproute2-next. Signed-off-by: Stephen Hemminger --- bridge/mdb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bridge/mdb.c b/bridge/mdb.c index 58c20b82b8a6..659cac3ff20a 100644 --- a/bridge/mdb.c +++ b/bridge/mdb.c @@ -55,7 +55,7 @@ static void __print_router_port_stats(FILE *f, struct rtattr *pattr) __jiffies_to_tv(&tv, rta_getattr_u32(tb[MDBA_ROUTER_PATTR_TIMER])); if (jw_global) { - char formatted_time[9]; + char formatted_time[32]; snprintf(formatted_time, sizeof(formatted_time), "%4i.%.2i", (int)tv.tv_sec, @@ -184,7 +184,7 @@ static void print_mdb_entry(FILE *f, int ifindex, struct br_mdb_entry *e, __jiffies_to_tv(&tv, rta_getattr_u32(tb[MDBA_MDB_EATTR_TIMER])); if (jw_global) { - char formatted_time[9]; + char formatted_time[32]; snprintf(formatted_time, sizeof(formatted_time), "%4i.%.2i", (int)tv.tv_sec, From patchwork Tue Mar 20 20:29:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 888423 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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="fGClpZUX"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 405PgR4gbJz9ryG for ; Wed, 21 Mar 2018 07:29:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751843AbeCTU3w (ORCPT ); Tue, 20 Mar 2018 16:29:52 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:38422 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751475AbeCTU3P (ORCPT ); Tue, 20 Mar 2018 16:29:15 -0400 Received: by mail-pl0-f65.google.com with SMTP id m22-v6so1724695pls.5 for ; Tue, 20 Mar 2018 13:29:15 -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; bh=TVRtkO4LwDrgQVoVkq4F9VLxhfOXVVXI6aGKkA+hRp8=; b=fGClpZUXpjnVt0XFwjfT5HLA0JylTd5QhJ8PSMZDZtJs82Ode9PrjUrJsmUPrfDtqd J1bW1afP0ShepZcto0Ujn8MhcyhfhFyoi8o9+5ygS22C/xkgZUrFRvniw3IB1eoeEr2a vZIDIFMmyi7l8uOjlK7FUnTOId9cllYClgvo7g8fcSVB5mi2v5CUhiH6fUTf1wnR/LZK qr+9LWz/9EirN1P2SYsnHf3skEsI5/UKbgJ44JZEzAvHQVvo2k2xbQIU8u3z1yO2kN5R 6q1PWnJbXRoTW6n++3KuWm8I793anIqeDRXvtTZ51L9in73f8b92SpbLdC1hSS+aNxVT kv4g== 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; bh=TVRtkO4LwDrgQVoVkq4F9VLxhfOXVVXI6aGKkA+hRp8=; b=cD+l3aPMvi/9k5+Q01VUfaVoO0FmKvzWGzKEiW4hUvOWr9AenfHKW5/mi3AnRS0K4E Nk8txLVCCAotI/0/gbNzMsaED3JtqZ5/7NiE8I+oxfBtrk+zZeWkMn0dsOjwmXIBFjtS /rUxUnCKVELsrBjaGPU8bx4HoKjyEdt/9UGtU0+RmSltmawaQfDZos0pZZJbX0apwWWX qsU803owcHOWE7cOisBNrfltnB2VXEg/NciWWCzOx1CrVNOzy3VeeCJdMziaKLBNp7aI LHg7UjxqUTZq8exV4HpeMRqkWIbzdb86yqpqgCmz34b3n2ou+WFpbq+TZeDFemD5R/aY J3tQ== X-Gm-Message-State: AElRT7FwWSpKGt9dHJ+5+1rPsUo7qtgO1hveqPnlDJdGHpEeRW/K/HLN 1qTIEkAKxtnMv/XJxAFbXE8VKVBodDY= X-Google-Smtp-Source: AG47ELuDuNYWAxeMPXGEyKciECy6kbudYHzE3QknEaABARhk7m0r2NaHD2BvkEqQmRIIaDfYbKYkZg== X-Received: by 2002:a17:902:bc8b:: with SMTP id bb11-v6mr4015835plb.370.1521577754820; Tue, 20 Mar 2018 13:29:14 -0700 (PDT) Received: from xeon-e3.lan (204-195-71-95.wavecable.com. [204.195.71.95]) by smtp.gmail.com with ESMTPSA id u68sm5343597pfu.167.2018.03.20.13.29.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Mar 2018 13:29:13 -0700 (PDT) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 v2 2/9] pedit: fix strncpy warning Date: Tue, 20 Mar 2018 13:29:02 -0700 Message-Id: <20180320202909.22166-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180320202909.22166-1-stephen@networkplumber.org> References: <20180320202909.22166-1-stephen@networkplumber.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Newer versions of Gcc warn about string truncation. Fix by using strlcpy. Signed-off-by: Stephen Hemminger --- tc/m_pedit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tc/m_pedit.c b/tc/m_pedit.c index 26549eeea899..8577f875a7c0 100644 --- a/tc/m_pedit.c +++ b/tc/m_pedit.c @@ -111,7 +111,7 @@ reg: noexist: p = calloc(1, sizeof(*p)); if (p) { - strncpy(p->id, str, sizeof(p->id) - 1); + strlcpy(p->id, str, sizeof(p->id)); p->parse_peopt = pedit_parse_nopopt; goto reg; } From patchwork Tue Mar 20 20:29:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 888422 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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="j6zswZUg"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 405PgP0RmTz9ryG for ; Wed, 21 Mar 2018 07:29:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751824AbeCTU3v (ORCPT ); Tue, 20 Mar 2018 16:29:51 -0400 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) 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; bh=fU0CWc4CJQmOyuINyZ+up9UMHIf2X7UcdhhmEGEtz9o=; b=j6zswZUgS1h4pEpShHdBB24bt7sju/XM8J3VnADNnXlwRhWNQuX/c/7MmFl2x0X7WL DTBxT1Rr3eXc9XRKADxDs8OqpQCiZFnCr/xOTlFnCZDgqLZe2AKC2getXqWzfn0OYuh1 6ej9mPQ42mScfj9V++cUKqfwxVp79FZwHmGfsLtmPq+VMZ0ubEgWvzg7BT9WErbMEfFl XldurhuZ5TyI5FUVucBp4R2M3bErMdCeBRD6OvQglkTRpkUAFL3lhCnpjhOKqaVz0tZU Lh0Mg9bdruS4Eh1BwWSFrjEu8SAnwPk5WYh8n9aGgPTSu0KjxJpnEoAEa3PxAJXGpYjC oqgA== 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; bh=fU0CWc4CJQmOyuINyZ+up9UMHIf2X7UcdhhmEGEtz9o=; b=DOB5qsXmHdLBwPU+V4QI6r8NDcvquIxkwASxiho5G4PTNjbQkcAzrvLXyQY0LroBAW q0dWSNZ+taFUCX2zInClirGpzw6uGYgtqb1Uf03r5MEA5KM5RUGQ7uyVgUHerWMaUluy p7kJw362oLRVETcYnRZ44NiJ5CH4cqI6TZqJOZ6UtpHBqhYv4Ya6kW0D0ZGD2Tc05jfr eQ7T/ZSu/hnn+4lnCWfB7xaaviDsLqRI93ZE8QhJNftgdEEi8Hy8KVKto+umenRHezc7 ExNTkMAtGVBqpfZN/XkUShAjXqXelA16oMkRRQcnmzwT/1DPXsL9f349ajEbfADoEUYT 9njg== X-Gm-Message-State: AElRT7GyUxdtOBL1anDCA90/0PrG92RXYef3LSNqfw9hgJZoCzOP/lAI k2psFVktEheQ13bcxid+EsZB/CFaNyk= X-Google-Smtp-Source: AG47ELvPLza6XtbpbH1LjQ8IaXorFv6RVOINux9ZfXFLesyCk8GOjqJlj/UmvRP0XJO72gle8orqkQ== X-Received: by 2002:a17:902:b903:: with SMTP id bf3-v6mr18367619plb.316.1521577756074; Tue, 20 Mar 2018 13:29:16 -0700 (PDT) Received: from xeon-e3.lan (204-195-71-95.wavecable.com. [204.195.71.95]) by smtp.gmail.com with ESMTPSA id u68sm5343597pfu.167.2018.03.20.13.29.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Mar 2018 13:29:15 -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> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180320202909.22166-1-stephen@networkplumber.org> References: <20180320202909.22166-1-stephen@networkplumber.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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) From patchwork Tue Mar 20 20:29:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 888416 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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="Vteg/YgY"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 405Pfq3Kgqz9ryG for ; Wed, 21 Mar 2018 07:29:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751552AbeCTU3V (ORCPT ); Tue, 20 Mar 2018 16:29:21 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:35893 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751531AbeCTU3S (ORCPT ); Tue, 20 Mar 2018 16:29:18 -0400 Received: by mail-pg0-f66.google.com with SMTP id i14so1094350pgv.3 for ; Tue, 20 Mar 2018 13:29:18 -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=K/32FXUPPtKCGNypobqOyvg6y/4ksXdGEFpWF6dPK4A=; b=Vteg/YgY9dHe+xYVxF6C7hGe7z8pP7zJ0b1knwVHA3EGmcr7qUsdCI62xhR9EucTjq VffuVA1L4dNgS3jqvmPu3dgDwvQk/3pWLGuYH1+xUS9prAEET1qNq44nuujBa+xoigX4 O2OHyuLEzrUoOg27EZoj6K9rjAGpVzHJM62wZ/6FIZL/8GF2fq9bi4O81WZ36q6B40uX OMj4XnhYR90hfUilHpU8YqlxnGon5AWqOs0Uc9RrEpUx2tGvBTpAUp2XC9u8QF5a8PPX m3VgQC87zD/RQsSi/+zdQgfEes77ZPsxBFRSXKnwU8VYWXKUufnNM/t78zT43ylhNDcr hsNQ== 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=K/32FXUPPtKCGNypobqOyvg6y/4ksXdGEFpWF6dPK4A=; b=Q1LHoxD0j60BOdCiIJt/Uojd+UPJ+ChMuXd9O2LdCIipwA6auh0SCuKVAaAoGAFQSH MTHLsU1kf0sMdB/e6An3H2B4YGSxreLCpqfMwWbiBfT1wGROqGel2tc3XJfolEOfGJ4s rAE+GxgLSHz5mjDSjBt+In+7lIkgIrM+N3xIijNu9TWOO8jiWVa2slbf4qiO5SpNSiT1 iI0ZUaYJecYHeXm1qBHPpDFqHsgn3+N6MQa8563LKW1cPEYaptdvRmx4zk5xgmLbpJV+ l2WHgRTHmaplEVRql1YjFsZAWkB8OVi+Z5W6GMvhjOlQa/zWuGxbKQqLj4Wehd0qJfcK 4HLw== X-Gm-Message-State: AElRT7GtYIMoecQg8C5uD/TQ6UOlnBGDpYZAW846AEUH5gMXLtGTp+BT GQNZjDawAdqZahrJ0NJDyW882RU+iWM= X-Google-Smtp-Source: AG47ELuHUh+5JhVobjN2J8my7+PZLpe+lt2fVrsty4G/sRJTW/3RwnBqGoCZsDIO26frp7BeR5GODA== X-Received: by 10.99.107.6 with SMTP id g6mr13255163pgc.109.1521577757786; Tue, 20 Mar 2018 13:29:17 -0700 (PDT) Received: from xeon-e3.lan (204-195-71-95.wavecable.com. [204.195.71.95]) by smtp.gmail.com with ESMTPSA id u68sm5343597pfu.167.2018.03.20.13.29.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Mar 2018 13:29:16 -0700 (PDT) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 v2 4/9] tunnel: use strlcpy to avoid strncpy warnings Date: Tue, 20 Mar 2018 13:29:04 -0700 Message-Id: <20180320202909.22166-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180320202909.22166-1-stephen@networkplumber.org> References: <20180320202909.22166-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 --- 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); From patchwork Tue Mar 20 20:29:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 888417 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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="eYg0Yjdb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 405Pfv4dGbz9ryG for ; Wed, 21 Mar 2018 07:29:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751637AbeCTU30 (ORCPT ); Tue, 20 Mar 2018 16:29:26 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34206 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751269AbeCTU3U (ORCPT ); Tue, 20 Mar 2018 16:29:20 -0400 Received: by mail-pf0-f193.google.com with SMTP id j20so1114358pfi.1 for ; Tue, 20 Mar 2018 13:29:19 -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; bh=NHBbPKS+ucKKID8UdO1+AMpYCKN9Bu0iQ+ZXU+SNaH0=; b=eYg0YjdbGlQLufR+HvYoHUb+TqXQ8VK/QoT27py7tzs3vcnIeq3W+p9afLJ3Ad5Nx8 DFe2csbQpPG7Kwa1jXdK4CKKv9JAAvNeZNPpqA7UJjNWMp64lW9vZfa6jYldYabXL+WV RCVLZQa4lxd6fWG/uYcRKXA5NcbeWZCGB472TWY0ChDvgJmolpYbglrv+wkjCauWYJt/ VrsDv876OqkLEHL5F0hx9wA3TxMG4eQNBhKm8dmQgOKtOPTHt2uKSRuGBx+7FAxez9Y+ ndMWchF2ks4EHKQ5760IvI55BCrt31CsuSmsoUSd6VL9hma6QOSd8+IJTF3300oxpgSo biXQ== 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; bh=NHBbPKS+ucKKID8UdO1+AMpYCKN9Bu0iQ+ZXU+SNaH0=; b=ZaJQJApXcrKzacDFb5OSXlJZ2DrYBk6YLGuUTIB6VQ0wCkMcfb9sylPXycTZnPgD1G tyD2AkWuj1vBr4Z2GEXDWlFF9xqTYwDHxUPzU+eqYdOcf16/jRyAxKThrQPnqrV6ihpE QMOBkGWa02SAh+iWVr2ee62MTervlx4/MDgZ+cmZShpF4jfWRzi3iwCHnOA/YWbPJDbG 8N2VL+UIq1xtN/+8S0tRrqSuITm4dr5edawy5piICk69bpl+c2x+aCijHew8+Tr88kGW yr+HDS3aTVXCWOdyKiOhPDjPF1OhCSHE+HeQL31SNF4kPgIg2oV9N0kk1vQuxe9wPnzu Fizg== X-Gm-Message-State: AElRT7GJ/9Ay2rt4u9Z5thCt6fDrB2hlz1xyKSJhOqHalbbJInbwqj9b M5r86ePTvSM9t5qj/OzX4eLHHJVA8OE= X-Google-Smtp-Source: AG47ELu0Sn9qf0dnMsHkNN9AAVFQnWCEnZyv4Gc+s0TSgq3CHfwfVTgCFFmEKfkbZXFn9VjkEvAesg== X-Received: by 10.99.102.132 with SMTP id a126mr12789119pgc.385.1521577759110; Tue, 20 Mar 2018 13:29:19 -0700 (PDT) Received: from xeon-e3.lan (204-195-71-95.wavecable.com. [204.195.71.95]) by smtp.gmail.com with ESMTPSA id u68sm5343597pfu.167.2018.03.20.13.29.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Mar 2018 13:29:17 -0700 (PDT) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 v2 5/9] namespace: fix warning snprintf buffer Date: Tue, 20 Mar 2018 13:29:05 -0700 Message-Id: <20180320202909.22166-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180320202909.22166-1-stephen@networkplumber.org> References: <20180320202909.22166-1-stephen@networkplumber.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It is possible that user could request really long namespace name and overrun the path buffer. Signed-off-by: Stephen Hemminger --- lib/namespace.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/namespace.c b/lib/namespace.c index 6f3356d0fa08..682634028587 100644 --- a/lib/namespace.c +++ b/lib/namespace.c @@ -23,7 +23,8 @@ static void bind_etc(const char *name) struct dirent *entry; DIR *dir; - snprintf(etc_netns_path, sizeof(etc_netns_path), "%s/%s", NETNS_ETC_DIR, name); + snprintf(etc_netns_path, sizeof(etc_netns_path), "%s/%s", + NETNS_ETC_DIR, name); dir = opendir(etc_netns_path); if (!dir) return; @@ -33,7 +34,8 @@ static void bind_etc(const char *name) continue; if (strcmp(entry->d_name, "..") == 0) continue; - snprintf(netns_name, sizeof(netns_name), "%s/%s", etc_netns_path, entry->d_name); + snprintf(netns_name, sizeof(netns_name), + "%s/%s", etc_netns_path, entry->d_name); snprintf(etc_name, sizeof(etc_name), "/etc/%s", entry->d_name); if (mount(netns_name, etc_name, "none", MS_BIND, NULL) < 0) { fprintf(stderr, "Bind %s -> %s failed: %s\n", From patchwork Tue Mar 20 20:29:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 888418 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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="RfRuoKey"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 405Pfz3mhyz9ryG for ; Wed, 21 Mar 2018 07:29:31 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751673AbeCTU3a (ORCPT ); Tue, 20 Mar 2018 16:29:30 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:36792 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751545AbeCTU3V (ORCPT ); Tue, 20 Mar 2018 16:29:21 -0400 Received: by mail-pf0-f193.google.com with SMTP id 68so1114123pfx.3 for ; Tue, 20 Mar 2018 13:29:21 -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; bh=nnLJQEDOzYbZUxBtzXd+9qiIZgsIjardHeEVqAfmwGk=; b=RfRuoKeyG8Glc/vlKuPiGk0ja+Znc2oK5Do0HNtU2qkDOUAY9Sx67LRDCavA3yHf69 d54frjhsyZy6eBSxpV10qJwcs1f+IfJK16am/BhUf6Y9FLCRJolzoR/uu1DIjSm5xDI6 UOxAB4ieaqrOXsyw3+OUYWmSNIand+OWBuhPiIoqV0wloqfpGfXyBNJMtQXbuHmPu59o GZF/eaEYoFFE4RzDckYVMy+lFoeeCvFG1Bpev2Ax0x5tR8bpYc/3uuAJT2RqSpqnQ9O1 b+CSYy04VYecehAYxNTze5xPSqbU58gePon1dx1p7gkMuRgMUs2g+gs0YWEQo54PnHf0 34Ng== 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; bh=nnLJQEDOzYbZUxBtzXd+9qiIZgsIjardHeEVqAfmwGk=; b=DvGhThWhqvBu5D7RJc1KiJ1CG4CKnPu1U2i01dUyt2/LuLCt80Kd6PcT/w1OPfbUIz D9iEwJm35+duxNbdbCKtlsuQGxOvRH+o2xVkJXmKxVZbO83+0F9ESprbGs67c6fc01+j d8XBq8mxYDiKNnU6/zc11PQhn+ooiMHhx0ExQUzPi2X8/nckQmAbUataugKxnu8pF5Hn y31p6678fV397cHtqjXV80yAnHPaqy+AbiUHCEXGfuPAdiEGStLDrMQjJFazuCpwn7it hFcaevwP3yRJF2zMfPNIT2ukSk1p1oJL0G61HtE5PvEN1RYsivzPlMIMJspujE7W7h5M elow== X-Gm-Message-State: AElRT7E7WPNUJQTftxNDqk50GDE++udQjXtD3ynTh9cdavxcInMz6ed2 0ZRTyNnn5kr5E2WP8HkgYKonyjq84MI= X-Google-Smtp-Source: AG47ELtD7DCRnJ+TYIhEVSe3lB5oxK+5sB6SzRRVdTeNUbJWdig5qEO1L41bTGjfkKHCOLDcd65cnA== X-Received: by 10.99.184.1 with SMTP id p1mr10412263pge.96.1521577760506; Tue, 20 Mar 2018 13:29:20 -0700 (PDT) Received: from xeon-e3.lan (204-195-71-95.wavecable.com. [204.195.71.95]) by smtp.gmail.com with ESMTPSA id u68sm5343597pfu.167.2018.03.20.13.29.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Mar 2018 13:29:19 -0700 (PDT) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 v2 6/9] tc_class: fix snprintf warning Date: Tue, 20 Mar 2018 13:29:06 -0700 Message-Id: <20180320202909.22166-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180320202909.22166-1-stephen@networkplumber.org> References: <20180320202909.22166-1-stephen@networkplumber.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Size buffer big enough to avoid any possible overflow. Signed-off-by: Stephen Hemminger --- tc/tc_class.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tc/tc_class.c b/tc/tc_class.c index 1b214b82c702..91802518bb27 100644 --- a/tc/tc_class.c +++ b/tc/tc_class.c @@ -219,7 +219,7 @@ static void graph_cls_show(FILE *fp, char *buf, struct hlist_head *root_list, char cls_id_str[256] = {}; struct rtattr *tb[TCA_MAX + 1]; struct qdisc_util *q; - char str[100] = {}; + char str[300] = {}; hlist_for_each_safe(n, tmp_cls, root_list) { struct hlist_node *c, *tmp_chld; @@ -242,7 +242,8 @@ static void graph_cls_show(FILE *fp, char *buf, struct hlist_head *root_list, graph_indent(buf, cls, 0, 0); print_tc_classid(cls_id_str, sizeof(cls_id_str), cls->id); - sprintf(str, "+---(%s)", cls_id_str); + snprintf(str, sizeof(str), + "+---(%s)", cls_id_str); strcat(buf, str); parse_rtattr(tb, TCA_MAX, (struct rtattr *)cls->data, From patchwork Tue Mar 20 20:29:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 888419 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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="XaDhXr5n"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 405Pg22TFVz9ryG for ; Wed, 21 Mar 2018 07:29:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751718AbeCTU3d (ORCPT ); Tue, 20 Mar 2018 16:29:33 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:35325 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751557AbeCTU3W (ORCPT ); Tue, 20 Mar 2018 16:29:22 -0400 Received: by mail-pl0-f65.google.com with SMTP id p9-v6so1729724pls.2 for ; Tue, 20 Mar 2018 13:29:22 -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; bh=oJF0GdXJe4Cf22aOn4cdgVoVfC+fCE+IuO1Q2rHLCs0=; b=XaDhXr5n42WRprH4tS/zQAtQ25EbNPwbpJk3X9G/5qhV7VgDOXRaZtcCRVST/Tc4TW lRQ7YTxqBDbc8CKzLy0KXKuk9pdip/vdgeE2QUokSMdIfsHwhi928zUH06oiIsEiSXok 52MuUWZ0+xsJlBxTx1NKusM86iIOoIC+eCujhgWDnGACcbEYLqswl0UWZkjE0M2DYRed /E6EOSXPPnglYfgUQNbQrtG/SzCq1qvCUpDCZPI28T1vqqdVVog9kSTk2RaCe2fycWj6 qo21AF3kuYu2o/nT1AoYqNNHmY//uvncDSN97rNuRGI01pLY5kx0oHU1QYPCpL0nMQwh CzjA== 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; bh=oJF0GdXJe4Cf22aOn4cdgVoVfC+fCE+IuO1Q2rHLCs0=; b=PUkt3cNv+MRpd7AJ5dxjk217IunJSJp5lJ+k3zuyYtRoPmr4z5sd2z5SghzlmkZ0mY 5lSHTmtjr857+i051+PqDi6N/M3/7k+D9ONyqV+lSUxRaKvUkx77XboBgTGvwhfTWA8/ VrOsqoCIyH7+dx5b3VeyJg3CBdwpGZkSd5DZRiprTNzX+XMJwKppWyfk+y9sicPPvOSu eRE/nZV9+xZDKcaZIDfL99HYm58JndR881EeQxAaPPI6ulyobM8GZL9dE2B1bxr+9B3n emiFFkCg2BiDaPzm073VY+bjfK0d4k5/eBMwUZ3p2d9F1RfVzob8MPZVejhVA8i1mPKU SdEA== X-Gm-Message-State: AElRT7GUpYxqvKrm8E9rS++/BJtEJRbnEUK7cQdvTcfIJSwegEgkXoZR QdqWA2jMIR2tZjldUTpeX8nKLBx6BSw= X-Google-Smtp-Source: AG47ELsNSdTrAHVPTQi2dPOfQhXsDAGD4/NTVHelNdYFTtFzGX+OoAcqv45dGgic+Ivh4EYkzz6rhQ== X-Received: by 2002:a17:902:67cd:: with SMTP id g13-v6mr14236777pln.171.1521577761917; Tue, 20 Mar 2018 13:29:21 -0700 (PDT) Received: from xeon-e3.lan (204-195-71-95.wavecable.com. [204.195.71.95]) by smtp.gmail.com with ESMTPSA id u68sm5343597pfu.167.2018.03.20.13.29.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Mar 2018 13:29:20 -0700 (PDT) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 v2 7/9] ematch: fix possible snprintf overflow Date: Tue, 20 Mar 2018 13:29:07 -0700 Message-Id: <20180320202909.22166-8-stephen@networkplumber.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180320202909.22166-1-stephen@networkplumber.org> References: <20180320202909.22166-1-stephen@networkplumber.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fixes gcc 8 warning about possible snprint overflow Signed-off-by: Stephen Hemminger --- tc/m_ematch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tc/m_ematch.c b/tc/m_ematch.c index d2bb5c380382..0d66dc682314 100644 --- a/tc/m_ematch.c +++ b/tc/m_ematch.c @@ -161,7 +161,7 @@ static struct ematch_util *get_ematch_kind(char *kind) static struct ematch_util *get_ematch_kind_num(__u16 kind) { - char name[32]; + char name[513]; if (lookup_map(kind, name, sizeof(name), EMATCH_MAP) < 0) return NULL; From patchwork Tue Mar 20 20:29:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 888420 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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="IbogRPOF"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 405Pg45r3Cz9ryG for ; Wed, 21 Mar 2018 07:29:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751745AbeCTU3f (ORCPT ); Tue, 20 Mar 2018 16:29:35 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:40698 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751595AbeCTU3Y (ORCPT ); Tue, 20 Mar 2018 16:29:24 -0400 Received: by mail-pl0-f67.google.com with SMTP id x4-v6so1716395pln.7 for ; Tue, 20 Mar 2018 13:29:23 -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; bh=HyzqJnKIhFtUXITooZASnR3D16Uap9EHw6T7fPK3JO0=; b=IbogRPOFJXw62W684+Z3aTxNE/QErImx2uTMSnhiwQVne2ni1KYWE3OZvdjU4kJVI5 h7t0RkkjZq58IrIMilDLM7V8i5oTa2nDLyLNmMqMxNLwll69ZP+xfnzgN1C783L5UJge Ldfu1728ky0y0tnnVMt53lv76IH4QgR4dj4BVPt3CuNJKUSLGuEkGGnenAeI8Z04cLLj zEo6K8gOQTQTkvkjoFIKPX4kc8gIiJOb45YFZZDWBGIjmLf94oGm9HZucsViz+QONFW1 QQuGEcOOzBrXVpPimCQDSEVn9BMHlCqi3PysXQgr571l8OUnh2L4HLfa7SdL6G08mynh 7dRQ== 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; bh=HyzqJnKIhFtUXITooZASnR3D16Uap9EHw6T7fPK3JO0=; b=pPYyDtHQ4Q/8PgO5l8+DTWTpSzzrr7kpaEmpp6ELz20UL3OTLqac3OD8oxnvzz9bO9 jCpt0HmwHiwJJxbIWRsnuOTx4XuZwUTTdDdDPDH8Mezj0pxDNK/krAIZfpfA1wzWseHA ayl3eGz0y4o9x+/aNStlJ5RZ3fI5Py2jRDBw+LBQFGWGyqluxwZoXJSbvRr0bqNqplXW 4o1HD28GGYuAamf2tucYS3tAHpMI7ND03uQrZEiTja5GJCBG1OPpim7ADp9aKzeL6nU7 E+Tv0jwfzsvMICYjElwpTrqmoquJqrkyScqZEthP/RVIHFT7YORohUDIofEeRf3/Oagh P/RQ== X-Gm-Message-State: AElRT7Gop7ZrUnLrHFo9cMR7zq5ES3PEMJ0YyRcgr1XpJIe5GQKv1wXM z2HB1v86hYY2B9mWdspSYoZ6XJh1uqA= X-Google-Smtp-Source: AG47ELtFvcI0e3Y1OudJ63NoTwhJQKncawGbhuAJe7yLu5ZApZCp6oTHHkzngGBTWBrtB8Pg2RSH5Q== X-Received: by 2002:a17:902:5501:: with SMTP id f1-v6mr17684270pli.50.1521577763211; Tue, 20 Mar 2018 13:29:23 -0700 (PDT) Received: from xeon-e3.lan (204-195-71-95.wavecable.com. [204.195.71.95]) by smtp.gmail.com with ESMTPSA id u68sm5343597pfu.167.2018.03.20.13.29.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Mar 2018 13:29:22 -0700 (PDT) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 v2 8/9] misc: avoid snprintf warnings in ss and nstat Date: Tue, 20 Mar 2018 13:29:08 -0700 Message-Id: <20180320202909.22166-9-stephen@networkplumber.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180320202909.22166-1-stephen@networkplumber.org> References: <20180320202909.22166-1-stephen@networkplumber.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Gcc 8 checks that target buffer is big enough. Signed-off-by: Stephen Hemminger --- misc/nstat.c | 4 ++-- misc/ss.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/misc/nstat.c b/misc/nstat.c index a4dd405d43a9..433a1f483be3 100644 --- a/misc/nstat.c +++ b/misc/nstat.c @@ -178,12 +178,12 @@ static int count_spaces(const char *line) static void load_ugly_table(FILE *fp) { - char buf[4096]; + char buf[2048]; struct nstat_ent *db = NULL; struct nstat_ent *n; while (fgets(buf, sizeof(buf), fp) != NULL) { - char idbuf[sizeof(buf)]; + char idbuf[4096]; int off; char *p; int count1, count2, skip = 0; diff --git a/misc/ss.c b/misc/ss.c index e087bef739b0..a03fa4a7c174 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -4032,7 +4032,7 @@ static int netlink_show_one(struct filter *f, if (!pid) { done = 1; - strncpy(procname, "kernel", 6); + strncpy(procname, "kernel", 7); } else if (pid > 0) { FILE *fp; From patchwork Tue Mar 20 20:29:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 888421 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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="jx/0Z2u8"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 405Pg74gC6z9ryG for ; Wed, 21 Mar 2018 07:29:39 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751770AbeCTU3i (ORCPT ); Tue, 20 Mar 2018 16:29:38 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:36761 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751628AbeCTU3Z (ORCPT ); Tue, 20 Mar 2018 16:29:25 -0400 Received: by mail-pl0-f65.google.com with SMTP id 61-v6so1729789plf.3 for ; Tue, 20 Mar 2018 13:29:25 -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; bh=/YjvGvMeOpu2Bbxk70vuYg69v4Dt0kEvfIk7Yq9jlK0=; b=jx/0Z2u8FIfzsamP/rohARzQF9TcGE/LQHyLHePwcNbiKCX+2U/u92myHFgC0Fsw7+ IepJwCJMpTxSBTO0QEEt43OsgjD7OAnmyllbIjsndans8ElgO23XMlS8CkFWAFmwThq8 WjE1q0ylsMxfzntvXMw4pWkePRFLmSKP3kw8x6Qf0oEhXkhB1chddmWvkALduasSxpNW UNhJmKWGsaWjg+xxOtRukvdm7D7GrRS6r1K8PfqT5yhhOn9Sz4zcs5DjTJoiSP23Y2eq H3d1nJ/ggk/glwVQ8n0/AV6aG8OSCX1ZltcxWHCMSjN9POISiUJ3Saxwpytt0jsfmlbV naPw== 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; bh=/YjvGvMeOpu2Bbxk70vuYg69v4Dt0kEvfIk7Yq9jlK0=; b=mVcH6GAXebIN+BQoQLtBRluHCgGJzRqNbKwLDbhv0clIlApnKD4Q7x7xUSMmZD5NgD d3tCkEdZNdGt/odFlmyS4buxAHgwXYxMYmGDLDHMelpbJnDyqNoSt6rqc2M9Z2X5KqgE Xafppt7PJZ9YrIIrWtc5Lz2KVYJzJubI5bpHkYTYPKp1judtEwCb3JM/O4qupgoAb7gW MnhOTnqV+SX9EUlJqEuwsT7KWzDxXnQR/iqbdI6X9l3/T2U2kuWpniKuZuvVITs48RG0 7ztQXoew/WDcr1hjcQQivwHTjqkQToEJVF8a+cbte8J05OlHh6Ime19XdfjTbNIX7+27 7Hhw== X-Gm-Message-State: AElRT7FKDWhBTmP8HhEJRiB8+0n/sLR8yGSXdqlodN330PuEQQkKnwTa 8IOer1Qi/b8inxjruWOSQlprwlx8wuk= X-Google-Smtp-Source: AG47ELu9z/kFFzG8aty9AK/AcJH1lNhvCC0VJJNG6oi7JFb/A0xUjfv9eaLhnydQYfpGt4F+lS5B+g== X-Received: by 2002:a17:902:63:: with SMTP id 90-v6mr18251321pla.125.1521577764341; Tue, 20 Mar 2018 13:29:24 -0700 (PDT) Received: from xeon-e3.lan (204-195-71-95.wavecable.com. [204.195.71.95]) by smtp.gmail.com with ESMTPSA id u68sm5343597pfu.167.2018.03.20.13.29.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Mar 2018 13:29:23 -0700 (PDT) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 v2 9/9] bpf: avoid compiler warnings about strncpy Date: Tue, 20 Mar 2018 13:29:09 -0700 Message-Id: <20180320202909.22166-10-stephen@networkplumber.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180320202909.22166-1-stephen@networkplumber.org> References: <20180320202909.22166-1-stephen@networkplumber.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use strlcpy to avoid cases where sizeof(buf) == strlen(buf) Signed-off-by: Stephen Hemminger Acked-by: Daniel Borkmann --- lib/bpf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bpf.c b/lib/bpf.c index c38d92d87759..04bc5a5685d5 100644 --- a/lib/bpf.c +++ b/lib/bpf.c @@ -2593,7 +2593,7 @@ bpf_map_set_send(int fd, struct sockaddr_un *addr, unsigned int addr_len, char *amsg_buf; int i; - strncpy(msg.aux.obj_name, aux->obj, sizeof(msg.aux.obj_name)); + strlcpy(msg.aux.obj_name, aux->obj, sizeof(msg.aux.obj_name)); memcpy(&msg.aux.obj_st, aux->st, sizeof(msg.aux.obj_st)); cmsg_buf = bpf_map_set_init(&msg, addr, addr_len); @@ -2682,7 +2682,7 @@ int bpf_send_map_fds(const char *path, const char *obj) return -1; } - strncpy(addr.sun_path, path, sizeof(addr.sun_path)); + strlcpy(addr.sun_path, path, sizeof(addr.sun_path)); ret = connect(fd, (struct sockaddr *)&addr, sizeof(addr)); if (ret < 0) { @@ -2715,7 +2715,7 @@ int bpf_recv_map_fds(const char *path, int *fds, struct bpf_map_aux *aux, return -1; } - strncpy(addr.sun_path, path, sizeof(addr.sun_path)); + strlcpy(addr.sun_path, path, sizeof(addr.sun_path)); ret = bind(fd, (struct sockaddr *)&addr, sizeof(addr)); if (ret < 0) {