From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id F2778A04B5; Thu, 10 Sep 2020 00:05:19 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 91DBC1BF8E; Thu, 10 Sep 2020 00:05:19 +0200 (CEST) Received: from mail-oi1-f196.google.com (mail-oi1-f196.google.com [209.85.167.196]) by dpdk.org (Postfix) with ESMTP id B5DF41DB8 for ; Thu, 10 Sep 2020 00:05:18 +0200 (CEST) Received: by mail-oi1-f196.google.com with SMTP id w16so3975379oia.2 for ; Wed, 09 Sep 2020 15:05:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=XAPaKjwAibja/5eDx2dC7abJDxt59SHJYo2m9VM0auE=; b=SPo6SVSg9HN5B3QgofidOEvGOGrt98JLJ/dXT8rDpScLx+TGTFXMiRYOlDeAa8wfEa 57p37iU2U+x1nxv09cC5mu/V5pGHZwRFz4CSi3Y+JA/FWVTMRhcNVQP7DHNAX/5sHgLd CwwrkTBaTQcQmy9bqz0gSKfwkrXce0TXhUgHo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=XAPaKjwAibja/5eDx2dC7abJDxt59SHJYo2m9VM0auE=; b=Cs86nMzDnZXeZzD+gd1mBGyUUazMzzL9DIYQMBnx6L17y2Vw6UcAy713eWVOSVoIoL zaN9+/0CrlKUaN2Eh207eJXY+GI/Fig9GdCm+zx9ERGS1mrj3U57Knh1Lkot6IjDHtpL GOr5yeNghytiG91UVhCjmD3iDHVZDULrB1gUmQDEK66s7PYVZ2bvLkLQrITI2FxG0Gk3 fRjko3P7wadz9PRp/nxHrKF0GMdHMg53/a8aSJUrFNLm2iTkZ04Q8Uz5TWu76w+DRQWx VYU42Ntn8hJ0RMvUpJXAWkZ8MxuaJV2TXs6eWyMnUkdCMq3XlgJcDxWzCsy1MMwElP4h /Kdg== X-Gm-Message-State: AOAM530RzCiKOKi7H5wiocGNDbrsXmXlrqmYBlpalfeR5chOPHI/w0Jj m2wNFtXaDaYaND1Ln+0XyYKycfzXUjq568auYiJChg== X-Google-Smtp-Source: ABdhPJzl42TOxcuDISog3GEkjSvwHTO4f1lLBZ2vH3Cws7VjDnKkfiQJFVkNyCg0cZ0lAtXNXm0ARa50NLJUf4ad2vU= X-Received: by 2002:aca:f417:: with SMTP id s23mr1984876oih.168.1599689117907; Wed, 09 Sep 2020 15:05:17 -0700 (PDT) MIME-Version: 1.0 References: <20200908100642.1197765-1-ferruh.yigit@intel.com> In-Reply-To: <20200908100642.1197765-1-ferruh.yigit@intel.com> From: Ajit Khaparde Date: Wed, 9 Sep 2020 15:05:01 -0700 Message-ID: To: Ferruh Yigit Cc: dpdk-dev , Stephen Hemminger , "K. Y. Srinivasan" , Haiyang Zhang , Long Li , Raslan Darawsheh Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: Re: [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" On Tue, Sep 8, 2020 at 3:07 AM Ferruh Yigit wrote: > '__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: Ajit Khaparde > --- > 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)) > -- > 2.25.4 > >