From patchwork Tue Sep 8 10:06:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ferruh Yigit X-Patchwork-Id: 76908 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id E251BA04AA; Tue, 8 Sep 2020 12:07:09 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7A2141B9B7; Tue, 8 Sep 2020 12:07:09 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 7C8DE2BAB for ; Tue, 8 Sep 2020 12:07:07 +0200 (CEST) IronPort-SDR: EeRO3Y4s/bMtrRM4eBXurpdmO2c5n3Kz0JtQfFwS8pm0AtCYvU267IaauPAbaMWYWHZYtt3DNe owBxIjYYo2oQ== X-IronPort-AV: E=McAfee;i="6000,8403,9737"; a="158129213" X-IronPort-AV: E=Sophos;i="5.76,405,1592895600"; d="scan'208";a="158129213" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Sep 2020 03:07:06 -0700 IronPort-SDR: 0OgBYtbzuUkmfFrs/YWHyNB/oNp0VNCbz3L716OrvcPFjys6pm8LXiUjrGh+cNqPEFmen4hIuI c3OhVIcvkGag== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,405,1592895600"; d="scan'208";a="505007992" Received: from silpixa00399752.ir.intel.com (HELO silpixa00399752.ger.corp.intel.com) ([10.237.222.180]) by fmsmga005.fm.intel.com with ESMTP; 08 Sep 2020 03:07:04 -0700 From: Ferruh Yigit To: dev@dpdk.org, Stephen Hemminger , "K. Y. Srinivasan" , Haiyang Zhang , Long Li Cc: Ferruh Yigit , Raslan Darawsheh Date: Tue, 8 Sep 2020 11:06:42 +0100 Message-Id: <20200908100642.1197765-1-ferruh.yigit@intel.com> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH] net/netvsc: replace compiler builtin overflow check 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" '__builtin_add_overflow' added to gcc in version 5, earlier versions causing build error, like gcc 4.8.5 in RHEL7. Replaced compiler builtin check with arithmetic check. Fixes: cabb3c0f29f1 ("net/netvsc: check for overflow on packet info from host") Reported-by: Raslan Darawsheh Signed-off-by: Ferruh Yigit Tested-by: Raslan Darawsheh Tested-by: Ajit Khaparde Acked-by: Stephen Hemminger --- drivers/net/netvsc/hn_rxtx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c index d8d3f07f56..3e8d3b407d 100644 --- a/drivers/net/netvsc/hn_rxtx.c +++ b/drivers/net/netvsc/hn_rxtx.c @@ -666,7 +666,7 @@ static void hn_rndis_rx_data(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb, void *data, uint32_t dlen) { - unsigned int data_off, data_len, total_len; + unsigned int data_off, data_len; unsigned int pktinfo_off, pktinfo_len; const struct rndis_packet_msg *pkt = data; struct hn_rxinfo info = { @@ -712,8 +712,8 @@ static void hn_rndis_rx_data(struct hn_rx_queue *rxq, goto error; } - if (__builtin_add_overflow(data_off, data_len, &total_len) || - total_len > pkt->len) + /* overflow check */ + if (data_len > data_len + data_off || data_len + data_off > pkt->len) goto error; if (unlikely(data_len < RTE_ETHER_HDR_LEN))