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 D4311A0093 for ; Tue, 19 May 2020 15:08:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CD5461D696; Tue, 19 May 2020 15:08:39 +0200 (CEST) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 749311D687 for ; Tue, 19 May 2020 15:08:38 +0200 (CEST) Received: by mail-wm1-f68.google.com with SMTP id w64so3475515wmg.4 for ; Tue, 19 May 2020 06:08:38 -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=ea7/niAfa/1VJiXfa9hjnyLzhICgPTakWZoKB0Qggfw=; b=D/esmp4n9jyBP2dQavdAwvhuK+GiMEcdMZ55sgDhKfCtarnU2RBZUrmsUV/GaiJibF Z21RLEKfj5WapIZ95SibOzJoUFOLjhofDFfE+RqlRzLGxEJoE4V6JmzgEQj6mRLGrR3g 0MURr8LLU/VW5abMZ93oY+/Mephc5f65cHxxbhgKPurCLdV8Yr9r4dmlx5jn6wpkDVM1 CFIvWQ5LVgaiszofKguJcS42HqvRnjhCXpmkt6PJB1xaclwxBGZqWG1MDaQRkmO7nuZ6 5QuttCgs0ArcKjKa7gIjv1JQS444X7V8Faojd8lXtZ1swuQ0acloRZUiXzZYsSjLPiNW bUoQ== 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=ea7/niAfa/1VJiXfa9hjnyLzhICgPTakWZoKB0Qggfw=; b=dOb2pm8OtISANWzLbhDKYnFdg5yWTwj8hPb2pbh0eMafvk6utxPiJGPMAmEp5yVmdy SqVgnxgCvRxlDaZeYAjpvTYQJYktNkNkbCFmbQU6PLkhegevTj7afBcfsuZ8MxWiGi0c mXN0Gf9IwMnyQpWhcNYjkDtQqG43LZq4PgOObBZm7PHvdQPddZCSvtw37FW+o9Pg2TJy lo//hwsvBBuR3UVJ5XGByvqZFdk6CXe29GMaprBqLv/T35ShZkC7V9/QPt7cLVQP52+G NxOCyIvkt1Lk1ZW2Lh1+lnnAOfrtdxhwGSAgGt6PPPB2KttuC8osF2/vbXL8uPT2Q294 qNOQ== X-Gm-Message-State: AOAM533iQqHRlgduY1sQuEBhI4bk+kYCy+FTtcCDCXuUuCD074C5tXif vLMmQYIQHsz/E7d4dqYXG/o= X-Google-Smtp-Source: ABdhPJyQTu0fIwXnBncNITALsvtmIUfiv69kGd8npmNuBACQ1MIQB4h7VZMz5UQUvCJdPkI1Cxo4IA== X-Received: by 2002:a1c:7d93:: with SMTP id y141mr5616269wmc.34.1589893718151; Tue, 19 May 2020 06:08:38 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id m6sm19884024wrq.5.2020.05.19.06.08.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:08:37 -0700 (PDT) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Heinrich Kuhn , dpdk stable Date: Tue, 19 May 2020 14:03:08 +0100 Message-Id: <20200519130549.112823-53-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/nfp: fix dangling pointer on probe failure' has been queued to stable release 19.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/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 46825a9e5926f2034af399a71a7260a1b496b9b0 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Tue, 7 Apr 2020 19:37:27 +0800 Subject: [PATCH] net/nfp: fix dangling pointer on probe failure [ upstream commit 9d5996c01de06fd0c03bc74d58c44f8c29fe7a97 ] When nfp_pf_create_dev() is cleaning up, it does not correctly set the dev_private variable to NULL, which will lead to a double free. Fixes: ef28aa96e53b ("net/nfp: support multiprocess") Signed-off-by: Yunjian Wang Acked-by: Heinrich Kuhn --- drivers/net/nfp/nfp_net.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c index afcf072339..b6ff5ecd7d 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c @@ -3451,9 +3451,10 @@ nfp_pf_create_dev(struct rte_pci_device *dev, int port, int ports, probe_failed: rte_free(port_name); /* free ports private data if primary process */ - if (rte_eal_process_type() == RTE_PROC_PRIMARY) + if (rte_eal_process_type() == RTE_PROC_PRIMARY) { rte_free(eth_dev->data->dev_private); - + eth_dev->data->dev_private = NULL; + } rte_eth_dev_release_port(eth_dev); return retval; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:46.671499911 +0100 +++ 0053-net-nfp-fix-dangling-pointer-on-probe-failure.patch 2020-05-19 14:04:44.192647937 +0100 @@ -1,13 +1,14 @@ -From 9d5996c01de06fd0c03bc74d58c44f8c29fe7a97 Mon Sep 17 00:00:00 2001 +From 46825a9e5926f2034af399a71a7260a1b496b9b0 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Tue, 7 Apr 2020 19:37:27 +0800 Subject: [PATCH] net/nfp: fix dangling pointer on probe failure +[ upstream commit 9d5996c01de06fd0c03bc74d58c44f8c29fe7a97 ] + When nfp_pf_create_dev() is cleaning up, it does not correctly set the dev_private variable to NULL, which will lead to a double free. Fixes: ef28aa96e53b ("net/nfp: support multiprocess") -Cc: stable@dpdk.org Signed-off-by: Yunjian Wang Acked-by: Heinrich Kuhn @@ -16,7 +17,7 @@ 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c -index bce4d96468..2460ee1992 100644 +index afcf072339..b6ff5ecd7d 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c @@ -3451,9 +3451,10 @@ nfp_pf_create_dev(struct rte_pci_device *dev, int port, int ports,