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 06F4EA04B1 for ; Thu, 5 Nov 2020 13:41:21 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F110AC7E8; Thu, 5 Nov 2020 13:41:19 +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 3493AC7E8 for ; Thu, 5 Nov 2020 13:41:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580076; 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=QiGej2YzJjodXzMUoBSdzXlqSz+0cvedqiNs83nKYCI=; b=gU3wOK5wj0nmRoVFR2OYqWLvTFl0DaJ8jkRpQqsWNW/iQqn9jpcm2t9E/rdV6pv5klzeco 5AW+M96XFbsvxOAc5VfvDpG92ekMYDUt+guJjuqRZ3EdJXWDyCOQ4f+3QFGvFcb2JfaJsD DYU3DkU9LuT3qQd+cxNUzMJ4URQLMvs= 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-538-uVbbbsmyOTSKsKqh-kQWbg-1; Thu, 05 Nov 2020 07:41:13 -0500 X-MC-Unique: uVbbbsmyOTSKsKqh-kQWbg-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 BB03D805EF7; Thu, 5 Nov 2020 12:41:11 +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 6EA8C5C5DE; Thu, 5 Nov 2020 12:41:10 +0000 (UTC) From: Kevin Traynor To: Michal Krawczyk Cc: Igor Chauskin , Guy Tzalik , Stephen Hemminger , dpdk stable Date: Thu, 5 Nov 2020 12:39:30 +0000 Message-Id: <20201105124015.306404-23-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/ena/base: fix release of wait event' 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/dfb132c50eee506eed2507611b08c7fef616f6e2 Thanks. Kevin. --- >From dfb132c50eee506eed2507611b08c7fef616f6e2 Mon Sep 17 00:00:00 2001 From: Michal Krawczyk Date: Thu, 17 Sep 2020 07:30:20 +0200 Subject: [PATCH] net/ena/base: fix release of wait event [ upstream commit f034d4bb973a23e6dd2af8acdc3829b013962e47 ] The wait event is being accessed without making sure it the completion context exists. The check for that is just below, so it could be used for releasing wait even safely. Fixes: 3adcba9a8987 ("net/ena: update HAL to the newer version") Signed-off-by: Michal Krawczyk Reviewed-by: Igor Chauskin Reviewed-by: Guy Tzalik Reviewed-by: Stephen Hemminger --- drivers/net/ena/base/ena_com.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ena/base/ena_com.c b/drivers/net/ena/base/ena_com.c index 19eec493ed..f7a6711d40 100644 --- a/drivers/net/ena/base/ena_com.c +++ b/drivers/net/ena/base/ena_com.c @@ -1483,7 +1483,9 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev) u16 size; - ENA_WAIT_EVENT_DESTROY(admin_queue->comp_ctx->wait_event); - if (admin_queue->comp_ctx) + if (admin_queue->comp_ctx) { + ENA_WAIT_EVENT_DESTROY(admin_queue->comp_ctx->wait_event); ENA_MEM_FREE(ena_dev->dmadev, admin_queue->comp_ctx); + } + admin_queue->comp_ctx = NULL; size = ADMIN_SQ_SIZE(admin_queue->q_depth); -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:54.683715451 +0000 +++ 0023-net-ena-base-fix-release-of-wait-event.patch 2020-11-05 12:38:54.184895976 +0000 @@ -1 +1 @@ -From f034d4bb973a23e6dd2af8acdc3829b013962e47 Mon Sep 17 00:00:00 2001 +From dfb132c50eee506eed2507611b08c7fef616f6e2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f034d4bb973a23e6dd2af8acdc3829b013962e47 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index b4e54318c6..ce239ab164 100644 +index 19eec493ed..f7a6711d40 100644 @@ -25 +26 @@ -@@ -1656,9 +1656,11 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev) +@@ -1483,7 +1483,9 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev) @@ -32,3 +33 @@ - ENA_MEM_FREE(ena_dev->dmadev, - admin_queue->comp_ctx, - (admin_queue->q_depth * sizeof(struct ena_comp_ctx))); + ENA_MEM_FREE(ena_dev->dmadev, admin_queue->comp_ctx);