From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D1E6243CAD for ; Thu, 14 Mar 2024 01:10:56 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CC23F40297; Thu, 14 Mar 2024 01:10:56 +0100 (CET) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mails.dpdk.org (Postfix) with ESMTP id 7E41642E40 for ; Thu, 14 Mar 2024 01:10:54 +0100 (CET) Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-33e966f56c7so351309f8f.0 for ; Wed, 13 Mar 2024 17:10:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710375054; x=1710979854; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gCXdus4J4+3Crv2kSlZE9Iay+5pyWBF6es9BmqVW2GU=; b=GkEDDtzAQurmSITDscDAbpxVNYjEbwZxJSK/Q7ldnELe8DUW6ltd7o7JyyK/pJfPbd AdaQRfcwmq+iuaNH/Cp+qDlHYtp/gEzMq3ef8kofVWW6whPSXs6qGDhGI0sDgIsi6ZZC sDr75Yif6TT2/IPPDX1HXlycNX4kBDFGfKIo4/yWrluloTEjX6wypnmNzfNBV8Tq4YMU X2Tl/Cmbe8zV6zoSQn7uAp4U0lywisdtqnm2Wd8IA6Chv5sn1RqNm0lyQ5/vDyrhMu7e 0Ar15AwT5lFYeyweriETDX0it52qT4VZy3kExzfKm1z/mtum2DiFnvw/EqYyam6iSWOg cbJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710375054; x=1710979854; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gCXdus4J4+3Crv2kSlZE9Iay+5pyWBF6es9BmqVW2GU=; b=xJinyb2KCUd5qt8M7Lk6CWyez4774ZcFx9VNhfD6y9u5/uuC2HQY3RaHIuHg3mWrD/ QAnzR41xIi/6fYlgTq+JsxWhYj/4+sMj+TBj2AzBQMyDvm+BwLkJ9kOU1WAilT5WbG3G bHSgm3vW3uJeVOXUceyiZUtlXc86XW8Xf6zsmReUAqPA08/k/1HltcwmQCZ4yoV/UsKE dStbrBbYrcE4Y9a1yiEok3U5gzUREFy2HFUh/V19cEnX15NYqSGBXfoLQszR2MfhU3iH db+4SeoZQvBlQIZH+nERDv46El7s+NqNfilBCwRrXkYC0HgkajN/r+t+jjE9L5EKD5Z1 Vhog== X-Forwarded-Encrypted: i=1; AJvYcCVRgaEMTY45yjgCoz51TJosKzS2USoi7ufufAVXisQsI2fX1SbUjx/Enjnh4DJ9waBUgSRrDa0zGgC/f+vBN28= X-Gm-Message-State: AOJu0YweNd9at4Q6zhhs1BHF9B3O9CftZNdSlKNBkHel8j936wlaYG0P BCF92P1J3h/IjT9IhfgJ1rLOEgtD8vieIYNo9a0WiDwK0g1I76pXyqD9ZGyj X-Google-Smtp-Source: AGHT+IHiYHctIU/IeqRZP9yDNzWcmXW4QWnAz0icDcW8F7SvnUd2icBL1L6Ak3WKOJjuikRplXlwdQ== X-Received: by 2002:a05:6000:ece:b0:33e:bb67:9596 with SMTP id ea14-20020a0560000ece00b0033ebb679596mr85862wrb.64.1710375054080; Wed, 13 Mar 2024 17:10:54 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id by1-20020a056000098100b0033d9f0dcb35sm286267wrb.87.2024.03.13.17.10.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 17:10:53 -0700 (PDT) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Ajit Khaparde , Somnath Kotur , dpdk stable Subject: patch 'net/bnxt: fix null pointer dereference' has been queued to stable release 22.11.5 Date: Thu, 14 Mar 2024 00:09:15 +0000 Message-Id: <20240314000957.2810803-19-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240314000957.2810803-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-102-luca.boccassi@gmail.com> <20240314000957.2810803-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 22.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/16/24. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/100e77a19e563d9d50c7eec92bb85e4244a7d31e Thanks. Luca Boccassi --- >From 100e77a19e563d9d50c7eec92bb85e4244a7d31e Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Wed, 7 Feb 2024 01:19:02 -0800 Subject: [PATCH] net/bnxt: fix null pointer dereference [ upstream commit 68eeafdef4db7362ff5307995b670a98f65f2493 ] In the recent changes to rte_eth_dev_release_port() the library sets eth_dev->data to NULL at the end of the routine. This causes a NULL pointer dereference in the bnxt_rep_dev_info_get_op() and bnxt_representor_uninit() routines when it tries to validate parent dev. Add code to handle this. Fixes: 6dc83230b43b ("net/bnxt: support port representor data path") Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt_reps.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/net/bnxt/bnxt_reps.c b/drivers/net/bnxt/bnxt_reps.c index 4e09cd3e4a..f700adb629 100644 --- a/drivers/net/bnxt/bnxt_reps.c +++ b/drivers/net/bnxt/bnxt_reps.c @@ -32,6 +32,14 @@ static const struct eth_dev_ops bnxt_rep_dev_ops = { .flow_ops_get = bnxt_flow_ops_get_op }; +static bool bnxt_rep_check_parent(struct bnxt_representor *rep) +{ + if (!rep->parent_dev->data->dev_private) + return false; + + return true; +} + uint16_t bnxt_vfr_recv(uint16_t port_id, uint16_t queue_id, struct rte_mbuf *mbuf) { @@ -266,12 +274,12 @@ int bnxt_representor_uninit(struct rte_eth_dev *eth_dev) PMD_DRV_LOG(DEBUG, "BNXT Port:%d VFR uninit\n", eth_dev->data->port_id); eth_dev->data->mac_addrs = NULL; - parent_bp = rep->parent_dev->data->dev_private; - if (!parent_bp) { + if (!bnxt_rep_check_parent(rep)) { PMD_DRV_LOG(DEBUG, "BNXT Port:%d already freed\n", eth_dev->data->port_id); return 0; } + parent_bp = rep->parent_dev->data->dev_private; parent_bp->num_reps--; vf_id = rep->vf_id; @@ -539,11 +547,12 @@ int bnxt_rep_dev_info_get_op(struct rte_eth_dev *eth_dev, int rc = 0; /* MAC Specifics */ - parent_bp = rep_bp->parent_dev->data->dev_private; - if (!parent_bp) { - PMD_DRV_LOG(ERR, "Rep parent NULL!\n"); + if (!bnxt_rep_check_parent(rep_bp)) { + /* Need not be an error scenario, if parent is closed first */ + PMD_DRV_LOG(INFO, "Rep parent port does not exist.\n"); return rc; } + parent_bp = rep_bp->parent_dev->data->dev_private; PMD_DRV_LOG(DEBUG, "Representor dev_info_get_op\n"); dev_info->max_mac_addrs = parent_bp->max_l2_ctx; dev_info->max_hash_mac_addrs = 0; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-14 00:09:21.633428274 +0000 +++ 0019-net-bnxt-fix-null-pointer-dereference.patch 2024-03-14 00:09:20.589614745 +0000 @@ -1 +1 @@ -From 68eeafdef4db7362ff5307995b670a98f65f2493 Mon Sep 17 00:00:00 2001 +From 100e77a19e563d9d50c7eec92bb85e4244a7d31e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 68eeafdef4db7362ff5307995b670a98f65f2493 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 3a4720bc3c..edcc27f556 100644 +index 4e09cd3e4a..f700adb629 100644