From patchwork Mon Feb 4 07:02:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Poornima, PallantlaX" X-Patchwork-Id: 50123 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3753C1B12B; Mon, 4 Feb 2019 08:04:10 +0100 (CET) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id 40CF91B12A; Mon, 4 Feb 2019 08:04:08 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Feb 2019 23:04:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,559,1539673200"; d="scan'208";a="119771813" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga007.fm.intel.com with ESMTP; 03 Feb 2019 23:04:05 -0800 Received: from wgcvswdev001.ir.intel.com (wgcvswdev001.ir.intel.com [10.102.246.100]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id x14745mC013201; Mon, 4 Feb 2019 07:04:05 GMT Received: from wgcvswdev001.ir.intel.com (localhost [127.0.0.1]) by wgcvswdev001.ir.intel.com with ESMTP id x1473TKp000463; Mon, 4 Feb 2019 07:03:29 GMT Received: (from ppoornix@localhost) by wgcvswdev001.ir.intel.com with ? id x1473THj000459; Mon, 4 Feb 2019 07:03:29 GMT From: Pallantla Poornima To: dev@dpdk.org Cc: reshma.pattan@intel.com, ferruh.yigit@intel.com, Pallantla Poornima , stable@dpdk.org Date: Mon, 4 Feb 2019 07:02:38 +0000 Message-Id: <1549263758-32677-1-git-send-email-pallantlax.poornima@intel.com> X-Mailer: git-send-email 1.7.0.7 In-Reply-To: References: Subject: [dpdk-dev] [PATCH] kni: fix sprintf with snprintf X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" sprintf function is not secure as it doesn't check the length of string. More secure function snprintf is used. Fixes: 3fc5ca2f63 ("kni: initial import") Fixes: b9ee370557 ("kni: update kernel driver ethtool baseline") Cc: stable@dpdk.org Signed-off-by: Pallantla Poornima --- kernel/linux/kni/ethtool/igb/igb_ethtool.c | 41 +++++++++++-------- kernel/linux/kni/ethtool/igb/igb_main.c | 12 ++++-- .../linux/kni/ethtool/ixgbe/ixgbe_ethtool.c | 30 ++++++++------ 3 files changed, 50 insertions(+), 33 deletions(-) diff --git a/kernel/linux/kni/ethtool/igb/igb_ethtool.c b/kernel/linux/kni/ethtool/igb/igb_ethtool.c index b6bddc025..d82ecec41 100644 --- a/kernel/linux/kni/ethtool/igb/igb_ethtool.c +++ b/kernel/linux/kni/ethtool/igb/igb_ethtool.c @@ -2115,39 +2115,48 @@ static void igb_get_strings(struct net_device *netdev, u32 stringset, u8 *data) p += ETH_GSTRING_LEN; } for (i = 0; i < adapter->num_tx_queues; i++) { - sprintf(p, "tx_queue_%u_packets", i); + snprintf(p, ETH_GSTRING_LEN, "tx_queue_%u_packets", i); p += ETH_GSTRING_LEN; - sprintf(p, "tx_queue_%u_bytes", i); + snprintf(p, ETH_GSTRING_LEN "tx_queue_%u_bytes", i); p += ETH_GSTRING_LEN; - sprintf(p, "tx_queue_%u_restart", i); + snprintf(p, ETH_GSTRING_LEN, "tx_queue_%u_restart", i); p += ETH_GSTRING_LEN; } for (i = 0; i < adapter->num_rx_queues; i++) { - sprintf(p, "rx_queue_%u_packets", i); + snprintf(p, ETH_GSTRING_LEN, "rx_queue_%u_packets", i); p += ETH_GSTRING_LEN; - sprintf(p, "rx_queue_%u_bytes", i); + snprintf(p, ETH_GSTRING_LEN, "rx_queue_%u_bytes", i); p += ETH_GSTRING_LEN; - sprintf(p, "rx_queue_%u_drops", i); + snprintf(p, ETH_GSTRING_LEN, "rx_queue_%u_drops", i); p += ETH_GSTRING_LEN; - sprintf(p, "rx_queue_%u_csum_err", i); + snprintf(p, ETH_GSTRING_LEN, "rx_queue_%u_csum_err", i); p += ETH_GSTRING_LEN; - sprintf(p, "rx_queue_%u_alloc_failed", i); + snprintf(p, ETH_GSTRING_LEN, "rx_queue_%u_alloc_failed", + i); p += ETH_GSTRING_LEN; - sprintf(p, "rx_queue_%u_ipv4_packets", i); + snprintf(p, ETH_GSTRING_LEN, "rx_queue_%u_ipv4_packets", + i); p += ETH_GSTRING_LEN; - sprintf(p, "rx_queue_%u_ipv4e_packets", i); + snprintf(p, ETH_GSTRING_LEN, + "rx_queue_%u_ipv4e_packets", i); p += ETH_GSTRING_LEN; - sprintf(p, "rx_queue_%u_ipv6_packets", i); + snprintf(p, ETH_GSTRING_LEN, "rx_queue_%u_ipv6_packets", + i); p += ETH_GSTRING_LEN; - sprintf(p, "rx_queue_%u_ipv6e_packets", i); + snprintf(p, ETH_GSTRING_LEN, + "rx_queue_%u_ipv6e_packets", i); p += ETH_GSTRING_LEN; - sprintf(p, "rx_queue_%u_tcp_packets", i); + snprintf(p, ETH_GSTRING_LEN, "rx_queue_%u_tcp_packets", + i); p += ETH_GSTRING_LEN; - sprintf(p, "rx_queue_%u_udp_packets", i); + snprintf(p, ETH_GSTRING_LEN, "rx_queue_%u_udp_packets", + i); p += ETH_GSTRING_LEN; - sprintf(p, "rx_queue_%u_sctp_packets", i); + snprintf(p, ETH_GSTRING_LEN, "rx_queue_%u_sctp_packets", + i); p += ETH_GSTRING_LEN; - sprintf(p, "rx_queue_%u_nfs_packets", i); + snprintf(p, ETH_GSTRING_LEN, "rx_queue_%u_nfs_packets", + i); p += ETH_GSTRING_LEN; } /* BUG_ON(p - data != IGB_STATS_LEN * ETH_GSTRING_LEN); */ diff --git a/kernel/linux/kni/ethtool/igb/igb_main.c b/kernel/linux/kni/ethtool/igb/igb_main.c index 0b4faeae5..e6765b4dd 100644 --- a/kernel/linux/kni/ethtool/igb/igb_main.c +++ b/kernel/linux/kni/ethtool/igb/igb_main.c @@ -679,16 +679,20 @@ static int igb_request_msix(struct igb_adapter *adapter) q_vector->itr_register = hw->hw_addr + E1000_EITR(vector); if (q_vector->rx.ring && q_vector->tx.ring) - sprintf(q_vector->name, "%s-TxRx-%u", netdev->name, + snprintf(q_vector->name, sizeof(q_vector->name), + "%s-TxRx-%u", netdev->name, q_vector->rx.ring->queue_index); else if (q_vector->tx.ring) - sprintf(q_vector->name, "%s-tx-%u", netdev->name, + snprintf(q_vector->name, sizeof(q_vector->name), + "%s-tx-%u", netdev->name, q_vector->tx.ring->queue_index); else if (q_vector->rx.ring) - sprintf(q_vector->name, "%s-rx-%u", netdev->name, + snprintf(q_vector->name, sizeof(q_vector->name), + "%s-rx-%u", netdev->name, q_vector->rx.ring->queue_index); else - sprintf(q_vector->name, "%s-unused", netdev->name); + snprintf(q_vector->name, sizeof(q_vector->name), + "%s-unused", netdev->name); err = request_irq(adapter->msix_entries[vector].vector, igb_msix_ring, 0, q_vector->name, diff --git a/kernel/linux/kni/ethtool/ixgbe/ixgbe_ethtool.c b/kernel/linux/kni/ethtool/ixgbe/ixgbe_ethtool.c index f2ded19e9..50e568ee2 100644 --- a/kernel/linux/kni/ethtool/ixgbe/ixgbe_ethtool.c +++ b/kernel/linux/kni/ethtool/ixgbe/ixgbe_ethtool.c @@ -1182,41 +1182,45 @@ static void ixgbe_get_strings(struct net_device *netdev, u32 stringset, p += ETH_GSTRING_LEN; } for (i = 0; i < adapter->num_tx_queues; i++) { - sprintf(p, "tx_queue_%u_packets", i); + snprintf(p, ETH_GSTRING_LEN, "tx_queue_%u_packets", i); p += ETH_GSTRING_LEN; - sprintf(p, "tx_queue_%u_bytes", i); + snprintf(p, ETH_GSTRING_LEN, "tx_queue_%u_bytes", i); p += ETH_GSTRING_LEN; } for (i = 0; i < adapter->num_rx_queues; i++) { - sprintf(p, "rx_queue_%u_packets", i); + snprintf(p, ETH_GSTRING_LEN, "rx_queue_%u_packets", i); p += ETH_GSTRING_LEN; - sprintf(p, "rx_queue_%u_bytes", i); + snprintf(p, ETH_GSTRING_LEN, "rx_queue_%u_bytes", i); p += ETH_GSTRING_LEN; } if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) { for (i = 0; i < MAX_TX_PACKET_BUFFERS; i++) { - sprintf(p, "tx_pb_%u_pxon", i); + snprintf(p, ETH_GSTRING_LEN, "tx_pb_%u_pxon", + i); p += ETH_GSTRING_LEN; - sprintf(p, "tx_pb_%u_pxoff", i); + snprintf(p, ETH_GSTRING_LEN, "tx_pb_%u_pxoff", + i); p += ETH_GSTRING_LEN; } for (i = 0; i < MAX_RX_PACKET_BUFFERS; i++) { - sprintf(p, "rx_pb_%u_pxon", i); + snprintf(p, ETH_GSTRING_LEN, "rx_pb_%u_pxon", + i); p += ETH_GSTRING_LEN; - sprintf(p, "rx_pb_%u_pxoff", i); + snprintf(p, ETH_GSTRING_LEN, "rx_pb_%u_pxoff", + i); p += ETH_GSTRING_LEN; } } for (i = 0; i < adapter->num_vfs; i++) { - sprintf(p, "VF %d Rx Packets", i); + snprintf(p, ETH_GSTRING_LEN, "VF %d Rx Packets", i); p += ETH_GSTRING_LEN; - sprintf(p, "VF %d Rx Bytes", i); + snprintf(p, ETH_GSTRING_LEN, "VF %d Rx Bytes", i); p += ETH_GSTRING_LEN; - sprintf(p, "VF %d Tx Packets", i); + snprintf(p, ETH_GSTRING_LEN, "VF %d Tx Packets", i); p += ETH_GSTRING_LEN; - sprintf(p, "VF %d Tx Bytes", i); + snprintf(p, ETH_GSTRING_LEN, "VF %d Tx Bytes", i); p += ETH_GSTRING_LEN; - sprintf(p, "VF %d MC Packets", i); + snprintf(p, ETH_GSTRING_LEN, "VF %d MC Packets", i); p += ETH_GSTRING_LEN; } /* BUG_ON(p - data != IXGBE_STATS_LEN * ETH_GSTRING_LEN); */