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 C6474A04B1 for ; Thu, 5 Nov 2020 13:42:20 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BF93C593A; Thu, 5 Nov 2020 13:42:19 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id B068FC80C for ; Thu, 5 Nov 2020 13:42:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580136; 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=z74Uh3vYsnQM0sudUEc8kRObIo1QblYewT3xMtLJr1E=; b=MbnsBlPMXpB0uk12j0P3PFwHdsfftYG21h9hQhg8RPES5+7AUtlepXUoQeRpPPYyxoFubb mlmvt1m0nTaBbhKk7O1+9LMCEfnCCAx3/xCQXYN1At9LMKpUDzLlb9HU327pNFX/uxRSsq PJ/5P/HDedfR8lmSVS06jadFEfAcGJE= 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-485-RM-klkMlOS2yBYlK-FCqvA-1; Thu, 05 Nov 2020 07:42:13 -0500 X-MC-Unique: RM-klkMlOS2yBYlK-FCqvA-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 736788049F0; Thu, 5 Nov 2020 12:42:12 +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 9422E5C5DE; Thu, 5 Nov 2020 12:42:11 +0000 (UTC) From: Kevin Traynor To: Chas Williams <3chas3@gmail.com> Cc: dpdk stable Date: Thu, 5 Nov 2020 12:40:05 +0000 Message-Id: <20201105124015.306404-58-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-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: check segment pointer in raw checksum processing' 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/10/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/b3aabfa59d6e71962b72892e7e704f661d7d01e3 Thanks. Kevin. --- >From b3aabfa59d6e71962b72892e7e704f661d7d01e3 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 a589a702af..0370b4be60 100644 --- a/lib/librte_net/rte_ip.h +++ b/lib/librte_net/rte_ip.h @@ -218,4 +218,7 @@ rte_raw_cksum_mbuf(const struct rte_mbuf *m, uint32_t off, uint32_t len, off -= seglen; } + RTE_ASSERT(seg != NULL); + if (seg == NULL) + return -1; seglen -= off; buf = rte_pktmbuf_mtod_offset(seg, const char *, off); -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:55.510488177 +0000 +++ 0058-net-check-segment-pointer-in-raw-checksum-processing.patch 2020-11-05 12:38:54.257896033 +0000 @@ -1 +1 @@ -From d98b0fc1af6c3c752304f3910da1d97a57ddd53b Mon Sep 17 00:00:00 2001 +From b3aabfa59d6e71962b72892e7e704f661d7d01e3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d98b0fc1af6c3c752304f3910da1d97a57ddd53b ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index bb55ebb6fa..8382d0fac7 100644 +index a589a702af..0370b4be60 100644 @@ -22 +23 @@ -@@ -226,4 +226,7 @@ rte_raw_cksum_mbuf(const struct rte_mbuf *m, uint32_t off, uint32_t len, +@@ -218,4 +218,7 @@ rte_raw_cksum_mbuf(const struct rte_mbuf *m, uint32_t off, uint32_t len,