queue-4.19/e1000e-fix-wformat-truncation-warnings.patch

   1 From 92af2e861f9716b589840c9f0eb1da8adf7af6c5 Mon Sep 17 00:00:00 2001
   2 From: Florian Fainelli <f.fainelli@gmail.com>
   3 Date: Thu, 21 Feb 2019 20:09:28 -0800
   4 Subject: e1000e: Fix -Wformat-truncation warnings
   5
   6 [ Upstream commit 135e7245479addc6b1f5d031e3d7e2ddb3d2b109 ]
   7
   8 Provide precision hints to snprintf() since we know the destination
   9 buffer size of the RX/TX ring names are IFNAMSIZ + 5 - 1. This fixes the
  10 following warnings:
  11
  12 drivers/net/ethernet/intel/e1000e/netdev.c: In function
  13 'e1000_request_msix':
  14 drivers/net/ethernet/intel/e1000e/netdev.c:2109:13: warning: 'snprintf'
  15 output may be truncated before the last format character
  16 [-Wformat-truncation=]
  17      "%s-rx-0", netdev->name);
  18              ^
  19 drivers/net/ethernet/intel/e1000e/netdev.c:2107:3: note: 'snprintf'
  20 output between 6 and 21 bytes into a destination of size 20
  21    snprintf(adapter->rx_ring->name,
  22    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  23      sizeof(adapter->rx_ring->name) - 1,
  24      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  25      "%s-rx-0", netdev->name);
  26      ~~~~~~~~~~~~~~~~~~~~~~~~
  27 drivers/net/ethernet/intel/e1000e/netdev.c:2125:13: warning: 'snprintf'
  28 output may be truncated before the last format character
  29 [-Wformat-truncation=]
  30      "%s-tx-0", netdev->name);
  31              ^
  32 drivers/net/ethernet/intel/e1000e/netdev.c:2123:3: note: 'snprintf'
  33 output between 6 and 21 bytes into a destination of size 20
  34    snprintf(adapter->tx_ring->name,
  35    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  36      sizeof(adapter->tx_ring->name) - 1,
  37      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  38      "%s-tx-0", netdev->name);
  39      ~~~~~~~~~~~~~~~~~~~~~~~~
  40
  41 Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
  42 Signed-off-by: David S. Miller <davem@davemloft.net>
  43 Signed-off-by: Sasha Levin <sashal@kernel.org>
  44 ---
  45  drivers/net/ethernet/intel/e1000e/netdev.c | 4 ++--
  46  1 file changed, 2 insertions(+), 2 deletions(-)
  47
  48 diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
  49 index 3ba0c90e7055..e3945469b5c8 100644
  50 --- a/drivers/net/ethernet/intel/e1000e/netdev.c
  51 +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
  52 @@ -2106,7 +2106,7 @@ static int e1000_request_msix(struct e1000_adapter *adapter)
  53         if (strlen(netdev->name) < (IFNAMSIZ - 5))
  54                 snprintf(adapter->rx_ring->name,
  55                          sizeof(adapter->rx_ring->name) - 1,
  56 -                        "%s-rx-0", netdev->name);
  57 +                        "%.14s-rx-0", netdev->name);
  58         else
  59                 memcpy(adapter->rx_ring->name, netdev->name, IFNAMSIZ);
  60         err = request_irq(adapter->msix_entries[vector].vector,
  61 @@ -2122,7 +2122,7 @@ static int e1000_request_msix(struct e1000_adapter *adapter)
  62         if (strlen(netdev->name) < (IFNAMSIZ - 5))
  63                 snprintf(adapter->tx_ring->name,
  64                          sizeof(adapter->tx_ring->name) - 1,
  65 -                        "%s-tx-0", netdev->name);
  66 +                        "%.14s-tx-0", netdev->name);
  67         else
  68                 memcpy(adapter->tx_ring->name, netdev->name, IFNAMSIZ);
  69         err = request_irq(adapter->msix_entries[vector].vector,
  70 --
  71 2.19.1
  72