From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ferruh Yigit Subject: [PATCH] kni: fix build with gcc 8.1 Date: Tue, 19 Jun 2018 13:08:55 +0100 Message-ID: <20180619120855.78207-1-ferruh.yigit@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: dev@dpdk.org, stable@dpdk.org To: Ferruh Yigit Return-path: List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Error observed when CONFIG_RTE_KNI_KMOD_ETHTOOL config option is enabled. build error: In function ‘strncpy’, inlined from ‘igb_get_drvinfo’ at .../dpdk/build/build/kernel/linux/kni/igb_ethtool.c:814:2: .../include/linux/string.h:246:9: error: ‘__builtin_strncpy’ output may be truncated copying 31 bytes from a string of length 42 [-Werror=stringop-truncation] return __builtin_strncpy(p, q, size); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixed by reducing the adapter->fw_version size and adjusting strncpy limit size. Cc: stable@dpdk.org Signed-off-by: Ferruh Yigit --- kernel/linux/kni/ethtool/igb/igb.h | 2 +- kernel/linux/kni/ethtool/igb/igb_ethtool.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/linux/kni/ethtool/igb/igb.h b/kernel/linux/kni/ethtool/igb/igb.h index 8aa2a3088..5e798ae83 100644 --- a/kernel/linux/kni/ethtool/igb/igb.h +++ b/kernel/linux/kni/ethtool/igb/igb.h @@ -592,7 +592,7 @@ struct igb_adapter { int int_mode; u32 rss_queues; u32 vmdq_pools; - char fw_version[43]; + char fw_version[32]; u32 wvbr; struct igb_mac_addr *mac_table; #ifdef CONFIG_IGB_VMDQ_NETDEV diff --git a/kernel/linux/kni/ethtool/igb/igb_ethtool.c b/kernel/linux/kni/ethtool/igb/igb_ethtool.c index 064528bcf..0b8b25ff1 100644 --- a/kernel/linux/kni/ethtool/igb/igb_ethtool.c +++ b/kernel/linux/kni/ethtool/igb/igb_ethtool.c @@ -812,7 +812,7 @@ static void igb_get_drvinfo(struct net_device *netdev, strncpy(drvinfo->version, igb_driver_version, sizeof(drvinfo->version) - 1); strncpy(drvinfo->fw_version, adapter->fw_version, - sizeof(drvinfo->fw_version) - 1); + sizeof(drvinfo->fw_version)); strncpy(drvinfo->bus_info, pci_name(adapter->pdev), sizeof(drvinfo->bus_info) -1); drvinfo->n_stats = IGB_STATS_LEN; drvinfo->testinfo_len = IGB_TEST_LEN; -- 2.17.1