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 889A0A0A0E for ; Mon, 10 May 2021 18:18:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 80BEB410F8; Mon, 10 May 2021 18:18:24 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2052.outbound.protection.outlook.com [40.107.212.52]) by mails.dpdk.org (Postfix) with ESMTP id A4A1D410FE for ; Mon, 10 May 2021 18:18:23 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KkwWsxsolgii7Ck3P40nANcaybssRDlVS51vJsqz0WAMoNGsvAMNJJ3lVFcQ63rWOijH/qVS7Wra7bfSfztLdiigro7rmjOz/nmNJKjO/x54tkdRdzWnY+gYdifZHdo2136GAbwkHpXYL6XkACnRNSouNvRpXM2K3ISDZxlo8UuXRWPiImR4Ka+VWkPpUPjEaa3qJYa0Z1PkaXI0udatmwEJcoJtsO9IX/v40TQuRlo7887oVSJhUkj+4vOw0ZBTyUXeuIaUVVEkcZni2GAu/LYoYJjqlDo6MfQIt6LxQnb2S7M5S5vGWvoF6Xwx633PIYfGGW5wMmbnPTeRjO3pPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=b93Rh7GGo1iJfq5TfpjBbQQ5hzrFNwdfGJ4Hm3/TGXE=; b=XS3tWKwTrdaAT9onb6sHAsR08bh0k9CJ8xTvnN/Z3VBLAb+sQB40bItP8MBToV/Jp/HABz/EiDiyCihuCM2kjMghgzBW3SWREei2X8o8y4H8wA6RwPwJ55R+VIWpmZ0cR8TPoqWiOPJsHM4kEMV9YYemdLsyMI5cDKYKL/ruBiOn0ScV56nsWm35R9RR64sZc8k5CXvnGtxKvrlSUoea1r9u4VR+NbjtiNjmcPyf/TkxCpVXCSAYv/vjKYolLU3N02dE8MEkg2no+XWF6xn7EiPehGxZdv3DkMdbMeLOhTsKZwiJ9oET0caVeUyY6/uvTj1C7193XCv4jgjh5NDxXQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=b93Rh7GGo1iJfq5TfpjBbQQ5hzrFNwdfGJ4Hm3/TGXE=; b=Nhjc8n8vx/xmJp7mWcYG8LxYSWVLLVz8NdTq6/c++Mft4cFEfOCwBemvcz/SzoF8CCMFpA0C+fPBk0sk6bLf/J5rDjjGthEH5wtIJXa/J+g5Q6C80Q6tVNGHKE5BmmhdYS40f/WdxoTZ2qublxN2lI9+svgc98nMD9mTtEAMwGvaOgr0FMb8u/Unf/72fU1cx06pSd1xX48QhWwG2cS8ZSsJwxiDSLQy6ifNk4uJ0Ye7+kaiGZYNDtoFTsXKcI1IIoOutohVfitQbsNN2EfDx0b/lUPf6gAYKcPofQzInF0nyRGpmbl4s2f0CDsQyO8rKJQdbB2RMHnLTqHWY8wcjw== Received: from DM6PR07CA0053.namprd07.prod.outlook.com (2603:10b6:5:74::30) by BN9PR12MB5081.namprd12.prod.outlook.com (2603:10b6:408:132::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.26; Mon, 10 May 2021 16:18:22 +0000 Received: from DM6NAM11FT060.eop-nam11.prod.protection.outlook.com (2603:10b6:5:74:cafe::a7) by DM6PR07CA0053.outlook.office365.com (2603:10b6:5:74::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:18:22 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT060.mail.protection.outlook.com (10.13.173.63) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:18:22 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:18:19 +0000 From: Xueming Li To: Chengchang Tang CC: Luca Boccassi , Min Hu , Ferruh Yigit , dpdk stable Date: Tue, 11 May 2021 00:01:41 +0800 Message-ID: <20210510160258.30982-152-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 79194ef8-8327-4a67-7cca-08d913cf3b31 X-MS-TrafficTypeDiagnostic: BN9PR12MB5081: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PNJUKNv8n3DlkOMy8mc89m+hn29NhFXtqV4ZUMF6PbL6UCWkM6id1x57GYm9JzlloYiauGC715+/kszE4HQtYRVBNZUDNVyMXt3k9Joz2kzfqrEV9vEI48FcKvNzHof+6b7nHRr2htNdKj/70cB+uwwL1DcLLJAeegyX3aCQuk/fKgvNhV2b3a/Oks09JKwtCLZW6Hrw+HV0S/8vhbGjIdw/iLoTe+tlOQLjNXIV8Xca74yeFu6ThgU92QRb9XEYPE+cGYbYCjFHlT0mRukXivuCgpsk67f3ED5JjS/NI9NuSSTlra4UmKSh7sys0/MYZ0WmLltJ1ASo1sRUGqOKhZ5YdTiISgR9ONpXEQ3ZzDnNaR5SDLiMJMU6dRk915zWvjaNT8D7k7Av8afNE7e9xtb/NCe1OW2JOZ04E9uIwaCsBgfS+V7ToX9LOMBVVpYNMotkt5Wyi2hihfo9Dbx8qgy+uCDKD/4lbv0yhYLm1mIi2FEc1mx18ffen9HzGJM+o3mBvCjbPzG2TYcDlr3+D691f4OJi9alAmKAY7oKeKMGKuepma6tvxPqxvGaS94RX0fVrTcpnM4nToAbK09PFDHccEZiw+183J06G5scjLDtMCsbDKJl3kP2GXOb/yVXSQOi4yZvlDrkXzHOY1kF1+ODNeTXgjvEJIN0DWvpo5VihRF60POK0BIDR7THjOI4oJtc0OPmYEfBMO4aQ73E4t7C36EGrjRV29ilYC3Ku3t5PCO0mLHbJ1LTgS5J+M+cnT735HaLoYNFHZaUwokaBQ== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(396003)(136003)(346002)(39860400002)(376002)(36840700001)(46966006)(6666004)(2616005)(6286002)(1076003)(36756003)(53546011)(4326008)(47076005)(2906002)(478600001)(5660300002)(86362001)(6916009)(54906003)(356005)(7696005)(82740400003)(316002)(36860700001)(36906005)(7636003)(83380400001)(186003)(16526019)(966005)(8676002)(70586007)(55016002)(70206006)(82310400003)(336012)(26005)(15650500001)(426003)(8936002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:18:22.0823 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 79194ef8-8327-4a67-7cca-08d913cf3b31 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT060.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5081 Subject: [dpdk-stable] patch 'ethdev: validate input in register info' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.2 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/12/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/963fcacd9561f8f666878d7128228c3822b0ea9a Thanks. Xueming Li --- >From 963fcacd9561f8f666878d7128228c3822b0ea9a Mon Sep 17 00:00:00 2001 From: Chengchang Tang Date: Fri, 2 Apr 2021 10:58:49 +0800 Subject: [PATCH] ethdev: validate input in register info Cc: Luca Boccassi [ upstream commit 94af45f4005ee0c3152db45a3669bec5238a3c10 ] This patch adds validity check of input pointer in regs dump API. Fixes: 7a3f27cbf59b ("ethdev: add access to specific device info") Fixes: 936eda25e8da ("net/hns3: support dump register") Signed-off-by: Chengchang Tang Signed-off-by: Min Hu (Connor) Reviewed-by: Ferruh Yigit --- drivers/net/hns3/hns3_regs.c | 5 ----- lib/librte_ethdev/rte_ethdev.c | 2 ++ lib/librte_ethdev/rte_ethdev.h | 1 + 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c index 3d2e66a594..d725f14001 100644 --- a/drivers/net/hns3/hns3_regs.c +++ b/drivers/net/hns3/hns3_regs.c @@ -322,11 +322,6 @@ hns3_get_regs(struct rte_eth_dev *eth_dev, struct rte_dev_reg_info *regs) uint32_t *data; int ret; - if (regs == NULL) { - hns3_err(hw, "the input parameter regs is NULL!"); - return -EINVAL; - } - ret = hns3_get_regs_length(hw, &length); if (ret) return ret; diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index 8e34c874ac..3e3a5bd8cf 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -5258,6 +5258,8 @@ rte_eth_dev_get_reg_info(uint16_t port_id, struct rte_dev_reg_info *info) struct rte_eth_dev *dev; RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + if (info == NULL) + return -EINVAL; dev = &rte_eth_devices[port_id]; RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->get_reg, -ENOTSUP); diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h index 760214efb8..1cd1ef9d54 100644 --- a/lib/librte_ethdev/rte_ethdev.h +++ b/lib/librte_ethdev/rte_ethdev.h @@ -4395,6 +4395,7 @@ int rte_eth_dev_get_eeprom(uint16_t port_id, struct rte_dev_eeprom_info *info); * @return * - (0) if successful. * - (-ENOTSUP) if hardware doesn't support. + * - (-EINVAL) if bad parameter. * - (-ENODEV) if *port_id* invalid. * - (-EIO) if device is removed. * - others depends on the specific operations implementation. -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:30.546710300 +0800 +++ 0153-ethdev-validate-input-in-register-info.patch 2021-05-10 23:59:26.590000000 +0800 @@ -1 +1 @@ -From 94af45f4005ee0c3152db45a3669bec5238a3c10 Mon Sep 17 00:00:00 2001 +From 963fcacd9561f8f666878d7128228c3822b0ea9a Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 94af45f4005ee0c3152db45a3669bec5238a3c10 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index d53c132b1e..5d15613c67 100644 +index 3d2e66a594..d725f14001 100644 @@ -25 +27 @@ -@@ -484,11 +484,6 @@ hns3_get_regs(struct rte_eth_dev *eth_dev, struct rte_dev_reg_info *regs) +@@ -322,11 +322,6 @@ hns3_get_regs(struct rte_eth_dev *eth_dev, struct rte_dev_reg_info *regs) @@ -38 +40 @@ -index bb195abe70..3fe200d508 100644 +index 8e34c874ac..3e3a5bd8cf 100644 @@ -41 +43 @@ -@@ -5286,6 +5286,8 @@ rte_eth_dev_get_reg_info(uint16_t port_id, struct rte_dev_reg_info *info) +@@ -5258,6 +5258,8 @@ rte_eth_dev_get_reg_info(uint16_t port_id, struct rte_dev_reg_info *info) @@ -51 +53 @@ -index f5bbc10b68..1ad7cda27d 100644 +index 760214efb8..1cd1ef9d54 100644 @@ -54 +56 @@ -@@ -4403,6 +4403,7 @@ int rte_eth_get_monitor_addr(uint16_t port_id, uint16_t queue_id, +@@ -4395,6 +4395,7 @@ int rte_eth_dev_get_eeprom(uint16_t port_id, struct rte_dev_eeprom_info *info);