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 898D5A04B5 for ; Tue, 3 Dec 2019 19:28:04 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 75DB11BE84; Tue, 3 Dec 2019 19:28:04 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id C95781B994 for ; Tue, 3 Dec 2019 19:28:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575397682; 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=hbpSuR52p6BnIT+hT7KViaAMZTKUN66e+gHdsk3ipPc=; b=L3QSzW+xikOqhB3nlJUObIV3nLALIO8VCo2y1E8sgQIOD4It0LQWBoweGFxYFlKjVlOymH uTyr3lEdlir3fq96Qb2OHtOhGpNV2sXipXnU4i3Z351zi4oC84JgTVJ/NTJgRuv074U61t MQFpCpXOx0h6PI/sFAqlVsrvgUm1ooI= 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-247-mry1Hj_cP86uMXuS_Q0iUQ-1; Tue, 03 Dec 2019 13:27:59 -0500 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 38E011883521; Tue, 3 Dec 2019 18:27:58 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-10.ams2.redhat.com [10.36.117.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 643545C3FA; Tue, 3 Dec 2019 18:27:57 +0000 (UTC) From: Kevin Traynor To: Rahul Lakkireddy Cc: dpdk stable Date: Tue, 3 Dec 2019 18:26:24 +0000 Message-Id: <20191203182714.17297-15-ktraynor@redhat.com> In-Reply-To: <20191203182714.17297-1-ktraynor@redhat.com> References: <20191203182714.17297-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: mry1Hj_cP86uMXuS_Q0iUQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/cxgbe: fix null access when allocating CLIP entry' has been queued to LTS release 18.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 LTS release 18.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 12/10/19. 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 rebasi= ng (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/86a24c5b7f3f7c1211= 6ab95b6aa67fe6c3463805 Thanks. Kevin. --- >From 86a24c5b7f3f7c12116ab95b6aa67fe6c3463805 Mon Sep 17 00:00:00 2001 From: Rahul Lakkireddy Date: Sat, 28 Sep 2019 02:00:02 +0530 Subject: [PATCH] net/cxgbe: fix null access when allocating CLIP entry [ upstream commit 41b5a4a655b07680b355f3e518380a73b4c03f65 ] Pass correct arguments to CLIP allocation code to avoid NULL pointer dereference. Fixes: 3f2c1e209cfc ("net/cxgbe: add Compressed Local IP region") Signed-off-by: Rahul Lakkireddy --- drivers/net/cxgbe/cxgbe_filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/cxgbe/cxgbe_filter.c b/drivers/net/cxgbe/cxgbe_fil= ter.c index 2eee7166c..461b71ebe 100644 --- a/drivers/net/cxgbe/cxgbe_filter.c +++ b/drivers/net/cxgbe/cxgbe_filter.c @@ -1052,5 +1052,5 @@ int cxgbe_set_filter(struct rte_eth_dev *dev, unsigne= d int filter_id, =09if (chip_ver > CHELSIO_T5 && fs->type && =09 memcmp(fs->val.lip, bitoff, sizeof(bitoff))) { -=09=09f->clipt =3D cxgbe_clip_alloc(f->dev, (u32 *)&f->fs.val.lip); +=09=09f->clipt =3D cxgbe_clip_alloc(dev, (u32 *)&fs->val.lip); =09=09if (!f->clipt) =09=09=09goto free_tid; --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-03 17:29:52.696450260 +0000 +++ 0015-net-cxgbe-fix-null-access-when-allocating-CLIP-entry.patch=092019-= 12-03 17:29:51.714750703 +0000 @@ -1 +1 @@ -From 41b5a4a655b07680b355f3e518380a73b4c03f65 Mon Sep 17 00:00:00 2001 +From 86a24c5b7f3f7c12116ab95b6aa67fe6c3463805 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 41b5a4a655b07680b355f3e518380a73b4c03f65 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index cc8774c1d..3b7966d04 100644 +index 2eee7166c..461b71ebe 100644 @@ -21 +22 @@ -@@ -1053,5 +1053,5 @@ int cxgbe_set_filter(struct rte_eth_dev *dev, unsign= ed int filter_id, +@@ -1052,5 +1052,5 @@ int cxgbe_set_filter(struct rte_eth_dev *dev, unsign= ed int filter_id,