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 84335A04DD for ; Wed, 28 Oct 2020 11:53:18 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0DB5FC9F6; Wed, 28 Oct 2020 11:53:17 +0100 (CET) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 46492CA1C for ; Wed, 28 Oct 2020 11:53:15 +0100 (CET) Received: by mail-wr1-f65.google.com with SMTP id n6so5117145wrm.13 for ; Wed, 28 Oct 2020 03:53:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=P93x2012dUH0x9mRSLmbkOkfJL6/jZljt+zdMD/G9To=; b=Fe9fhqo5AfVudLtGxcbvUaoQVwQhQnrmymZe5tfLcuzpgRhQo5l9+7YckgTOyA+aMs LzM7rsmR+2PpSHDzMIXjW0K1Pt7lGMcXZVBOiMqoka1da2s0n64a8hEx/TTIoSYp0uS/ vpfXTy7aSyHkNgCe1r4meiqEgBjpvFimXIqqBXM4LzgiMYVS2mw/guU103Zoe9il2JRg 3ikmGMkvZgbEjmFiMf0UK7VHbm0SGPnuRK7bJaUO9obpf1fce+PypDZWC696eXaTNKPt pbqFncp5yW5vCw3a67J3T9Udqga8SEB+Lbx1+lnU08C3xyR0O+MggdMhYLaRWK+1F/+H kPzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=P93x2012dUH0x9mRSLmbkOkfJL6/jZljt+zdMD/G9To=; b=O113aRjSgE0bUvyoJbIrtVF6QGmy7oh6lywpnDJAABRVBqH4L6faxGsTujMlD9nIjc bR6SwjU7+x8iktd8nTY0YZT3jX8FpoLeHXJkDr1NA/NJOjQjDvSZpCAcga39hk/+DUFH SZBJpdrl6AR+xFQKsqV42tKPWQiXfWrOg7SkbiRutzSreXNe/NMVyokUHUxTNz7KJrCA JcvSy7u+aTS5PiHExRtjZUkDUo6NKA9CETk3yZk9bMQgXxoKsFkXK4nZZ21oQgyl14E7 0t2/aO1bCV8lewgnni1YR+85nGViSrIAjyVTLuetj+nlJiyq7vz68avKe/RvJUgSvvPB 25mA== X-Gm-Message-State: AOAM531+X9AR00cjF1DHIEdhZu6dvuBFK46JDTAqGWu6b/jHao3a+O+z /wR25ScEbtl1nKliQGPUodkE9beKXzQJgUvX X-Google-Smtp-Source: ABdhPJxexmzUHYf+fai88e81w5Fl1iJxsQrpRLScaIHvZEVCLYlhv9Pr9D+XJTZaacLDZK9likoX8g== X-Received: by 2002:adf:e94b:: with SMTP id m11mr8078025wrn.35.1603882395024; Wed, 28 Oct 2020 03:53:15 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id b63sm5829019wme.9.2020.10.28.03.53.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:53:14 -0700 (PDT) From: luca.boccassi@gmail.com To: Chas Williams <3chas3@gmail.com> Cc: dpdk stable Date: Wed, 28 Oct 2020 10:44:54 +0000 Message-Id: <20201028104606.3504127-135-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net: check segment pointer in raw checksum processing' has been queued to stable release 19.11.6 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 stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/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. Thanks. Luca Boccassi --- >From 501b711ce2d8f2b688b7a857d57a242e453fe30e Mon Sep 17 00:00:00 2001 From: Chas Williams <3chas3@gmail.com> Date: Thu, 1 Oct 2020 06:22:44 -0400 Subject: [PATCH] net: check segment pointer in raw checksum processing [ upstream commit d98b0fc1af6c3c752304f3910da1d97a57ddd53b ] If the overall pkt_len and segment lengths are out of agreement, it is possible for the seg to be NULL after the loop. Add assert to check this condition in debug builds. Otherwise, return failure. Fixes: c442fed81bb9 ("net: add function to calculate checksum in mbuf") Signed-off-by: Chas Williams <3chas3@gmail.com> --- lib/librte_net/rte_ip.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h index 0897da744c..d34c0611f0 100644 --- a/lib/librte_net/rte_ip.h +++ b/lib/librte_net/rte_ip.h @@ -225,6 +225,9 @@ rte_raw_cksum_mbuf(const struct rte_mbuf *m, uint32_t off, uint32_t len, break; off -= seglen; } + RTE_ASSERT(seg != NULL); + if (seg == NULL) + return -1; seglen -= off; buf = rte_pktmbuf_mtod_offset(seg, const char *, off); if (seglen >= len) { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:15.933488722 +0000 +++ 0135-net-check-segment-pointer-in-raw-checksum-processing.patch 2020-10-28 10:35:11.704832968 +0000 @@ -1,14 +1,15 @@ -From d98b0fc1af6c3c752304f3910da1d97a57ddd53b Mon Sep 17 00:00:00 2001 +From 501b711ce2d8f2b688b7a857d57a242e453fe30e Mon Sep 17 00:00:00 2001 From: Chas Williams <3chas3@gmail.com> Date: Thu, 1 Oct 2020 06:22:44 -0400 Subject: [PATCH] net: check segment pointer in raw checksum processing +[ upstream commit d98b0fc1af6c3c752304f3910da1d97a57ddd53b ] + If the overall pkt_len and segment lengths are out of agreement, it is possible for the seg to be NULL after the loop. Add assert to check this condition in debug builds. Otherwise, return failure. Fixes: c442fed81bb9 ("net: add function to calculate checksum in mbuf") -Cc: stable@dpdk.org Signed-off-by: Chas Williams <3chas3@gmail.com> --- @@ -16,7 +17,7 @@ 1 file changed, 3 insertions(+) diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h -index bb55ebb6fa..8382d0fac7 100644 +index 0897da744c..d34c0611f0 100644 --- a/lib/librte_net/rte_ip.h +++ b/lib/librte_net/rte_ip.h @@ -225,6 +225,9 @@ rte_raw_cksum_mbuf(const struct rte_mbuf *m, uint32_t off, uint32_t len,