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 A7B94A0A0E for ; Mon, 10 May 2021 18:18:27 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A1FB840140; Mon, 10 May 2021 18:18:27 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2050.outbound.protection.outlook.com [40.107.243.50]) by mails.dpdk.org (Postfix) with ESMTP id 84D8C40140 for ; Mon, 10 May 2021 18:18:26 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IFUBJTzssGy8gWFJWw/If5MRv+8b6gERhAjYrzaoly48XZSttKUOftH6+QaNwwQVDXF8XGssqDWjD+OqXIV8DgT/4xSGo11A0cHBHYjTrd8BIkuDu9JJFcTvNhc4bGi1XHdl6B+TwlRpbxgYJ+KBSk48KAFcvtNpQG8JccYjrYiYM361BQlZfYo3q693918bz/nibnbLMfUzpSnUNKi7TUTAzI1oORh5gjmsKB0ZjI83StgeYS1A3wDFQTNGgoRn9MgGqQ7zC1Yam/AR7MjshJ9smLpSjDyu/O64RlcKN8zAAgN+K93bqOtVUcPBB0oYnAzg2OAMs+rqQyKOhVrUOQ== 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=jrimOL3r2PKXdra++TvbV84/VlFM0fyDVEkSarMqv4k=; b=TG67NqejR4NGmGB2U1GZvhvMQSs0nZDnzq/uzgkpajWhQnhw969QK5xL4dNxpSkAWiAV61IIjB2iDwHfaoYMoT0SrzIW4Mx5L6L4koCLwHu01EU2bbxikurTSU4lUUa0jkvJrkg+LZKLO3GW5rNohWh0xNafLvZCezqTj0UNhuPcRvJarj8htgGC/cARYdCK8duH9+cXNlhDSgSZoQVQd+hjSy0DSYk6nTUKV6k4CeTS8JZLe0CtyhGWjvFF8fN9OxASvmxPWmDaAntIJQcOjozcsGAoDxk4GHJiZNzXfWJ77E3k1cPkCL+8PoYI5VdcltrTBJrGTlI755o4f3+H7g== 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=jrimOL3r2PKXdra++TvbV84/VlFM0fyDVEkSarMqv4k=; b=pO67JTG5ODHFD/ywLLAs36RUHc4x+oceTe0XagR8QhCC5z8GAzWneYDcQGww/LbZaCbigjWMzPsgwabRgvP79jbMn/jtT9BTQHQdjTvCSp7jCtSzzRClH30svb9W7h7ngQp6bwsVpMiFPlQyECFXX/o+Nl9NA5gYcjZlgpigVYTIZjBP8XxKNabVGKdSYIB3zhFLFAFm1yL9FTYmKMqbCy5gNaIxGvtV4k5wJ7+2jEBpGa+YdLcYLTdT2G+iBiLRy5aY6+4NCOipJ80GfM8cii8y1Huz5KkZFwRN//jpuL9YrD83g5QHHMJ5Awrb8VCu20Rl/T4v87Hesw23upBOFw== Received: from DM5PR21CA0009.namprd21.prod.outlook.com (2603:10b6:3:ac::19) by BY5PR12MB4209.namprd12.prod.outlook.com (2603:10b6:a03:20d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Mon, 10 May 2021 16:18:25 +0000 Received: from DM6NAM11FT047.eop-nam11.prod.protection.outlook.com (2603:10b6:3:ac:cafe::d9) by DM5PR21CA0009.outlook.office365.com (2603:10b6:3:ac::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.0 via Frontend Transport; Mon, 10 May 2021 16:18:24 +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 DM6NAM11FT047.mail.protection.outlook.com (10.13.172.139) 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:24 +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:21 +0000 From: Xueming Li To: Chengchang Tang CC: Luca Boccassi , Min Hu , Ferruh Yigit , dpdk stable Date: Tue, 11 May 2021 00:01:42 +0800 Message-ID: <20210510160258.30982-153-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: a67ea9ca-f86b-450c-5052-08d913cf3cc4 X-MS-TrafficTypeDiagnostic: BY5PR12MB4209: 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: BUxEJZN3SKbCr/CDQrDUtuTtDHE35fES9FBUxESukywC5NBwtLfA02Om/IMeB8aRqjAgzOwlkRjbD4iEdbmDbLxHHaYxbdVL12SFRjeA5vME5ytFbpOnZGNcXSaxNmIuo4z+YkUZW1CpproOcXyK5tjhAh9GPLs6PyVshahhgwL1cWGZ9YlvveeFvo0BbP3lwnG2RvqtJ0TvSJEhka9qpOGJk3rADUUhhIZENePzQiv6tAgL5OEB6m/WMoEI6y1dBRSr9SUzaYkU3MGHhG9JPGmY1dCL17HvXUIS/fX1328rGP5kl961cCwyQXxtVkjWLNHQ8Qzgk4eJOO1CgoRQviXvFiNLZFJnlHph8SWwB/sX3GG8qfBrLKnZhD+y0vnovFL8ROyNq0VruULVbk/tYb/rowva/EZ6T1IE7ZfqCQyGQyZin23cVkWnenqglRaVm7POWfTuYocbl4eXVqepbNkfg/7pQ/fkpz+0MG0tHz6R0EjPN00AL/9UYFqxOTWr97GTKa+aFiUlAIFpReFhmk1ygEos4rr7bpZNxt/q+0pLeENRSCNgUvbDJtuaYvw43ahIxRcIoHD9QH3wnF8d5Esjuz7TC6uMYrtBDplw3d71SlCN3ca4erYV7/KzkJNAqEjC4Gd/K/Rnn5F7o41WJ1/VQblY6EDn/seAaeVOCGpMjmbQRQEmrYIGM/z8+b4GUSAy811FTla7EBIXdM4/MLxzKuOGqug75Hkr+kyPIL6C6MDATlFu1dr5RSSpLGIkFWSYvD2jqHEqkyBAP2pTEQ== 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)(376002)(346002)(39860400002)(136003)(396003)(46966006)(36840700001)(36756003)(83380400001)(8676002)(5660300002)(55016002)(36860700001)(426003)(53546011)(186003)(15650500001)(336012)(6916009)(316002)(2906002)(26005)(478600001)(16526019)(36906005)(2616005)(6286002)(86362001)(4326008)(6666004)(54906003)(82740400003)(1076003)(70586007)(47076005)(82310400003)(8936002)(356005)(7636003)(70206006)(966005)(7696005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:18:24.7193 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a67ea9ca-f86b-450c-5052-08d913cf3cc4 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: DM6NAM11FT047.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4209 Subject: [dpdk-stable] patch 'ethdev: validate input in EEPROM 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/a096b11ef5d59f17380a8b97a4d6cfe92d114356 Thanks. Xueming Li --- >From a096b11ef5d59f17380a8b97a4d6cfe92d114356 Mon Sep 17 00:00:00 2001 From: Chengchang Tang Date: Fri, 2 Apr 2021 10:58:50 +0800 Subject: [PATCH] ethdev: validate input in EEPROM info Cc: Luca Boccassi [ upstream commit 18239da4ac2155582d91d4ccb8ed8b2193193534 ] This patch adds validity check of input pointer in EEPROM dump API. Fixes: 7a3f27cbf59b ("ethdev: add access to specific device info") Signed-off-by: Chengchang Tang Signed-off-by: Min Hu (Connor) Reviewed-by: Ferruh Yigit --- lib/librte_ethdev/rte_ethdev.c | 4 ++++ lib/librte_ethdev/rte_ethdev.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index 3e3a5bd8cf..8a3c999010 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -5284,6 +5284,8 @@ rte_eth_dev_get_eeprom(uint16_t port_id, struct rte_dev_eeprom_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_eeprom, -ENOTSUP); @@ -5296,6 +5298,8 @@ rte_eth_dev_set_eeprom(uint16_t port_id, struct rte_dev_eeprom_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->set_eeprom, -ENOTSUP); diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h index 1cd1ef9d54..3ec7e9a6b3 100644 --- a/lib/librte_ethdev/rte_ethdev.h +++ b/lib/librte_ethdev/rte_ethdev.h @@ -4348,6 +4348,7 @@ int rte_eth_tx_burst_mode_get(uint16_t port_id, uint16_t queue_id, * - (0) if successful. * - (-ENOTSUP) if hardware doesn't support. * - (-ENODEV) if *port_id* invalid. + * - (-EINVAL) if bad parameter. * - (-EIO) if device is removed. * - others depends on the specific operations implementation. */ @@ -4378,6 +4379,7 @@ int rte_eth_dev_get_eeprom_length(uint16_t port_id); * @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.573855000 +0800 +++ 0154-ethdev-validate-input-in-EEPROM-info.patch 2021-05-10 23:59:26.590000000 +0800 @@ -1 +1 @@ -From 18239da4ac2155582d91d4ccb8ed8b2193193534 Mon Sep 17 00:00:00 2001 +From a096b11ef5d59f17380a8b97a4d6cfe92d114356 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 18239da4ac2155582d91d4ccb8ed8b2193193534 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 3fe200d508..6b5cfd696d 100644 +index 3e3a5bd8cf..8a3c999010 100644 @@ -23 +25 @@ -@@ -5312,6 +5312,8 @@ rte_eth_dev_get_eeprom(uint16_t port_id, struct rte_dev_eeprom_info *info) +@@ -5284,6 +5284,8 @@ rte_eth_dev_get_eeprom(uint16_t port_id, struct rte_dev_eeprom_info *info) @@ -32 +34 @@ -@@ -5324,6 +5326,8 @@ rte_eth_dev_set_eeprom(uint16_t port_id, struct rte_dev_eeprom_info *info) +@@ -5296,6 +5298,8 @@ rte_eth_dev_set_eeprom(uint16_t port_id, struct rte_dev_eeprom_info *info) @@ -42 +44 @@ -index 1ad7cda27d..3b773b6dd0 100644 +index 1cd1ef9d54..3ec7e9a6b3 100644 @@ -45,2 +47 @@ -@@ -4435,6 +4435,7 @@ int rte_eth_dev_get_eeprom_length(uint16_t port_id); - * @return +@@ -4348,6 +4348,7 @@ int rte_eth_tx_burst_mode_get(uint16_t port_id, uint16_t queue_id, @@ -49 +49,0 @@ -+ * - (-EINVAL) if bad parameter. @@ -50,0 +51 @@ ++ * - (-EINVAL) if bad parameter. @@ -53 +54,3 @@ -@@ -4453,6 +4454,7 @@ int rte_eth_dev_get_eeprom(uint16_t port_id, struct rte_dev_eeprom_info *info); + */ +@@ -4378,6 +4379,7 @@ int rte_eth_dev_get_eeprom_length(uint16_t port_id); + * @return @@ -56 +58,0 @@ - * - (-ENODEV) if *port_id* invalid. @@ -57,0 +60 @@ + * - (-ENODEV) if *port_id* invalid. @@ -60 +62,0 @@ - */