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 01D27A04DD for ; Wed, 18 Nov 2020 17:36:31 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id ED8645937; Wed, 18 Nov 2020 17:36:29 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 777A14C90 for ; Wed, 18 Nov 2020 17:36:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605717385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HBHSJi5C53yrSa25KD1DY9F2AYr3wimFmYFKk8MyKco=; b=Vm3deEMtVzPV117vAX7RWIKaDqj5wS97ThloAekKGdvsf5cUC4RaSZEGAKNL5+9FtXyp48 ayhs8rRKNRI41sFobzXCcWkm/sZ8tFc9XlxGNV6lIQ4TGm2URpVilec26b+RPeFOhg97lI KswXw3Rjq8hA4Q+Fj1aqV4d7uNiN2do= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-442-y7r9NNT3Oty1YCO6-dO75Q-1; Wed, 18 Nov 2020 11:36:20 -0500 X-MC-Unique: y7r9NNT3Oty1YCO6-dO75Q-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B71CDCE646; Wed, 18 Nov 2020 16:36:18 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id C516E4D734; Wed, 18 Nov 2020 16:36:16 +0000 (UTC) From: Kevin Traynor To: Ferruh Yigit Cc: Raslan Darawsheh , Stephen Hemminger , Raslan Darawsheh , Ajit Khaparde , dpdk stable Date: Wed, 18 Nov 2020 16:34:48 +0000 Message-Id: <20201118163558.1101823-2-ktraynor@redhat.com> In-Reply-To: <20201118163558.1101823-1-ktraynor@redhat.com> References: <20201118163558.1101823-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'net/netvsc: replace compiler builtin overflow check' has been queued to LTS release 18.11.11 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/24/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/2acc31435034fb83e02a99109ed367857ca5aff1 Thanks. Kevin. --- >From 2acc31435034fb83e02a99109ed367857ca5aff1 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Tue, 8 Sep 2020 11:06:42 +0100 Subject: [PATCH] net/netvsc: replace compiler builtin overflow check '__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: 7838d3a6ae7a ("net/netvsc: check for overflow on packet info from host") Reported-by: Raslan Darawsheh Signed-off-by: Ferruh Yigit Acked-by: Stephen Hemminger Tested-by: Raslan Darawsheh Tested-by: Ajit Khaparde (cherry picked from commit d73543b5f46db489c7b6fd2dfc8f905ec7304310) --- 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 fba08b166b..a70bac53d3 100644 --- a/drivers/net/netvsc/hn_rxtx.c +++ b/drivers/net/netvsc/hn_rxtx.c @@ -621,5 +621,5 @@ static void hn_rndis_rx_data(struct hn_rx_queue *rxq, 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; @@ -667,6 +667,6 @@ static void hn_rndis_rx_data(struct hn_rx_queue *rxq, } - 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; -- 2.26.2