From patchwork Thu Feb 22 19:47:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Khaparde X-Patchwork-Id: 137052 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 4B4C343B84; Thu, 22 Feb 2024 20:48:56 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8D9AF4114B; Thu, 22 Feb 2024 20:48:18 +0100 (CET) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mails.dpdk.org (Postfix) with ESMTP id 8DEF540F16 for ; Thu, 22 Feb 2024 20:48:15 +0100 (CET) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-6da202aa138so1438227b3a.2 for ; Thu, 22 Feb 2024 11:48:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1708631294; x=1709236094; 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=a51DT2jv0BM6AC4zoBvx4ZYrIe6U+0OBYgL5FKNnFSA=; b=LZXqBAX+PzoJkfsV1vmAuFEfuo2tpz8+ICYu5HqLTson+dQSE69w+Sg0Tb5rcRpWhc Z+DGJ3iwB9pz5XhWvJL18YpwHv3+TNZ7MmUOuF1e8Yn6rAqzekMFPUwGzKXo5+edM/Lk Cmd2Nex+l4dS8WUH+vAuZ9CiOxR45azU9mJ0k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708631294; x=1709236094; 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=a51DT2jv0BM6AC4zoBvx4ZYrIe6U+0OBYgL5FKNnFSA=; b=Eq5GwXwwkNfV9qQTRQ+Np/uJmYBnS72zoHV5HP8RhFDjlvRuqcyLbmXU6GJDfkX6kX 5efp2K6jjdoVap7l27IbKR0Gh67Li0BquPNs9ONtiO4Fr+AfyKVj6NJOg9+uWn4enEU2 fLDDNND8R5WYEF59iPVZjB3iUvhiKbPhy/NQqjSKcToDYHnY11QzjQ51Rve9WEvS/QoT x6LWWpQJxxCZkp2/S0nPlj/GjLXIxok3eF+WBEhxzFUbirBAuyD6/4zaL3todtXfe5u+ 5umfcxYO5M1jOeOFjJyxsatWdIfHGiT6ph7wsugPYtCYkrC2AAQWTRVaPf1nt1F3leij RigQ== X-Gm-Message-State: AOJu0Yx+REnBOdL/ZXLlkGhGHDEmmstt6e1kbtAKGtE3kCTNQPO1Kiho f/i767KU2nS9S77ToL6HJwUPG++p87Xz9q+D2QQAOFqyvZF+e+o0H77XOmlFiwdKnptvu3oaZuc lbkeblAHqW9LRRS9fHzBE4vmhwFE8kDfnhUfp7RUHEdGm3lpz+KhnJXCDiXNj8h+nwPt23P50Ac wdbX0ta2T7c5TVFmzD7ODJ2wnN5bb+ X-Google-Smtp-Source: AGHT+IEZ4DXkA8qBnd9MREr/uM0hcG3ihog/uF8smB1slpTdcx9Erbi9ffWGDXCwTUmQUTZEtBY66g== X-Received: by 2002:a05:6a00:ccc:b0:6e4:d354:160a with SMTP id b12-20020a056a000ccc00b006e4d354160amr2349606pfv.1.1708631292560; Thu, 22 Feb 2024 11:48:12 -0800 (PST) Received: from C02GC2QQMD6T.wifi.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id gu12-20020a056a004e4c00b006e025e1fa61sm9538452pfb.14.2024.02.22.11.48.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 11:48:11 -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 v2 05/10] net/bnxt: fix a null pointer dereference Date: Thu, 22 Feb 2024 11:47:55 -0800 Message-Id: <20240222194800.80648-6-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240222194800.80648-1-ajit.khaparde@broadcom.com> References: <20240221212044.27209-1-ajit.khaparde@broadcom.com> <20240222194800.80648-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;