From patchwork Wed Feb 21 21:20:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Khaparde X-Patchwork-Id: 136982 X-Patchwork-Delegate: ajit.khaparde@broadcom.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5D3E143B67; Wed, 21 Feb 2024 22:21:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0D89940C35; Wed, 21 Feb 2024 22:21:13 +0100 (CET) Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) by mails.dpdk.org (Postfix) with ESMTP id 5029940A67 for ; Wed, 21 Feb 2024 22:21:10 +0100 (CET) Received: by mail-qt1-f182.google.com with SMTP id d75a77b69052e-42a9c21f9ecso35148401cf.0 for ; Wed, 21 Feb 2024 13:21:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1708550469; x=1709155269; darn=dpdk.org; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=pGelwZX894N5zKkxoAL62ocdSU97N1oXPKsMERWAB6s=; b=EDdAI8xFGNIjh9k1i90aTL/LwBxcRoXWwR/EcQx1tFgPuugw0nKt51dGi6i9J2Udyu TTe0ItCzQ0Kaht7qsAo1/y93na1beNZPSfQyDrYm7Cx43oJwJ9YJ7ke28zRC4dIHRDCE MLqTQMClzehUkFoPfHDNpsG2rJZmsUaj9j1Vs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708550469; x=1709155269; h=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=pGelwZX894N5zKkxoAL62ocdSU97N1oXPKsMERWAB6s=; b=Max2DIhiDJI+QCj5i+A38x9862A+vQVsyra765WcysoDv4L+MiRgMeizSjJAJFbey0 JlTa7TEgCKKqnX+uGM4AYlwk5q8LDXGPzlWpe93pLguDPW7DlHHKcEXUH4bkCNCSe32P svmkTMYOfWSiIIGMZJwZjPGSQbj6h1NGZKn4tlNjmPFdlpWxGneciY51osaWP5otpj4S njCh5hwC2MERDczFtRHWwKRQaf6NgrOuSFrTH7u16Tx75iVAu7uIdObl7zK4r7U7ntd1 ZckzoyWa6buGhYz0g2WD5Jg73rvTN0Tl/eIgNF0srHjmyyIchbKYYi01fSZxDtEu2XGc EXtg== X-Gm-Message-State: AOJu0Yxtk5Vhpryh/n9ARPfyPA7fJSM5ddzIPJB7C0IPbIvsaQmWdlF9 0emgbxent8ohjCnz15TguCAkWrN8Oy0tvE4pEwrzx/1AxRmGlOSSif+LvLbQeC+gMjd0LkvKsKf 3/tUg5qguswnfAnNUzgfLaNm3kMBovq4aXSkL49n61kqgthcJ1X68cDR/7hWFscbOdYK/v5QgfR PUo+r0Gma3/aKOmMioNmhWIHC06KVY X-Google-Smtp-Source: AGHT+IF+nWf0cW02yBSu/TAbagCu7+lbsNKu7hIU8yrt9Biuq+Ccs9xMws5jqoFWBLK4ePVpKokdYw== X-Received: by 2002:ac8:7f10:0:b0:42e:43f0:cffd with SMTP id f16-20020ac87f10000000b0042e43f0cffdmr1379217qtk.67.1708550469259; Wed, 21 Feb 2024 13:21:09 -0800 (PST) Received: from C02GC2QQMD6T.wifi.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id 20-20020ac84e94000000b0042bff97d9a3sm4743467qtp.40.2024.02.21.13.21.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 13:21:08 -0800 (PST) From: Ajit Khaparde To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, Kalesh AP , stable@dpdk.org, Somnath Kotur Subject: [PATCH 05/10] net/bnxt: fix a null pointer dereference Date: Wed, 21 Feb 2024 13:20:40 -0800 Message-Id: <20240221212044.27209-6-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240221212044.27209-1-ajit.khaparde@broadcom.com> References: <20240221212044.27209-1-ajit.khaparde@broadcom.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Kalesh AP 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") Cc: stable@dpdk.org 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 3a4720bc3c..edcc27f556 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;