From patchwork Thu Mar 14 07:05:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 138338 X-Patchwork-Delegate: ferruh.yigit@amd.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 2179143CAB; Thu, 14 Mar 2024 08:06:05 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 648C542E37; Thu, 14 Mar 2024 08:06:03 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2109.outbound.protection.outlook.com [40.107.220.109]) by mails.dpdk.org (Postfix) with ESMTP id A54E642E00; Thu, 14 Mar 2024 08:06:01 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z4kmivl3GXJw0207BI1H4W3P1APismT9vGc4TN63LcTqwXJB0Ji4R8wX5EZ+hJxJIvPTkCYERNeNivX/3l59PQOaMaMiUuL9pzQIMe0R3+YIUMC+zCLuvYK2qyjdXt4fUPeiICvoyun6GM6q1Nr+oHL86UzmctyLB8t2Z4PzXH5ofkRm6S8+Tz9vKILQ6vSODV/DCbAPmV8tGO6yiM8jwxz4lDD9nZDT93d+/U5R1LMEHEoOSdQqXdR9ah+A6dhP5VWe92XcE4K8VF935T0+bH7Q3LYHpD0S8Zws1GsDA27V3BJlW4aQHz9Upb3XDAU2D35mh/xXTGCGBW3ipHBhAw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1uLu2HW35M23tAbofZLr54h/j0u98gr94LoPFBLAaO4=; b=Wjje3v0RMFaF8r+vqOQSSPBvT2nXhdHiB2dS/0ONML6Py/SDuPgeXWFIY7A8GFv9GJiLPAl2F90/Fxd5/XFrkdTxBVRXG2ucZRVlMOyDjTBwghDIHqAd1EyaybUkdD5uu2WdOY/dDJxhmjBvHghYy8mV3pfb4dr3nJtpBozPSk6BR+XdWao9lhmLfTfZXdtuZg0lREC32CJAnnqeqMXfekeIbayrP/Wxv1hoLnHj4s0L9fVyBBoVfOFEDZxB7RRqRUTP3AG/8C42kDy6/4DLjCmGlj6UHJX/259SwiGhYP6DESeuH9wqCqFeX6zeDT9Lxsyu/cQ1TKxUrydaSmqgiA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1uLu2HW35M23tAbofZLr54h/j0u98gr94LoPFBLAaO4=; b=JVb2MiCu1qL9oEUE6BRrbOVcNKzxtDknHwkx1ohV3RpbDUWzG2l8srT8642jZQNvm7Gk5uE3+azhUfbA7QgrO+d9cUN7BwtBjMO0iDBCLldKCfoRGkkGww51gM+3XD8/1qNc7UhTebSzqFtJVo6JECselGfwfR3grtae6WlmpFw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by DS0PR13MB6235.namprd13.prod.outlook.com (2603:10b6:8:115::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.21; Thu, 14 Mar 2024 07:05:58 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e%5]) with mapi id 15.20.7362.035; Thu, 14 Mar 2024 07:05:58 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , long.wu@corigine.com, stable@dpdk.org, Peng Zhang Subject: [PATCH 1/8] net/nfp: fix return value check Date: Thu, 14 Mar 2024 15:05:29 +0800 Message-Id: <20240314070536.3169210-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240314070536.3169210-1-chaoyong.he@corigine.com> References: <20240314070536.3169210-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR06CA0191.apcprd06.prod.outlook.com (2603:1096:4:1::23) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DS0PR13MB6235:EE_ X-MS-Office365-Filtering-Correlation-Id: 055c2a7c-8ea7-4e3c-0d75-08dc43f532c2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b9DwJBrw5hA+7GYZAkuTbTpMqaLReWd4my/UkmyfdejKO69gCEv9tJJCnYBED7Gp4o0LqV3C9D3be7kHEYw1uNqWtuSB9Pry0x3a2Pns0HPbPiyM9KzVpQrFonOFYWkQ7+hkcKhuTxo4ZDeAAbTXrYB2rmvH5QXLZ7vsUGaPAvl0h7SNj8UNElN4iGlbQzkCHb02M51CnTe2OOYfKpc285V1rtmOgdisjAu79RFI8ZXgE8jx/1wJaLWZq9lfEie/5531FdXfdkIUa+XAQim62KkI6UR3wyxOI0qn6hS8Xg4srdde/hdPs2pPiGNt0rnKA++HXlyNpTn5rZAJb/cem7/tUKLpueIOaUnyDpjzGkLQvTfTK3/mS6tXeMOufts9JnY0OIhgiCC6NEU/oIPyeM02BH9LCvH0UQ5WlIt4sZIb1Gm933JTOzEgNFER1cXkYU+dzV6H5WjYq4UR8f7hXrx3ECl9uLtj/Wp6X+5bhK3syZBv6C/Nw9InWdmcp+V/BnfFYTEGUWY+pwBu4KxRNNfBY4KHZ4lfeBPwQPgihMbKO0evqDV9nYF5ksb2Ok0O9VaSKkrfiFqlnkJzIVkk9dlSy/CvJ66B9zjZRXTFUtN4M5Xm6RVgRcuvqQwI8SNyVoG/AXEuSdRnn2cquFJciV3AImWj7mOm5zCKfO0ostf3qd30d0cQSZ2TFkbd5GqXhxC1SiY7HNJsokUlZEpHSC3xY4R1ED1jKfAJ0NDg2Nc= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376005)(52116005)(1800799015)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VPOaA8OF11vpHpKsci1xhJqHksnekKZ+QqM8Ajvd2POIDV1QB8nWEiBxuLu4S5ug2D0pJyuXreypuaCHqwCwlWUlAhulnje8cL6PWUNPb5i/tHObxOdyeENBwr7NeF/GgSlYoG2LZM4o1sO3yDlzBtLgEdSzu5V2hWNNE7ZiInt0eKXXy4Z4oOuIbOMnO5VMUI2xaG+iDA5eVEOpD0/gq8lSVS8OOAYlhFTYWxExsdMd24FVgqOM1iRQqcoeLRhCETyldv9RkbJy9O6H3Uur3FXLwXjvLvr55f+1jcCPgEH/ISF9HTvaR/IysZtNQSCFDn/jTG6Fzdi6y+jlIs7Tk0ieTlDbQr8eHhxRtMhDDDzi/Lf4GX0PAwQ1uO/Otw26+e8wII/N53vXjGobj6HWz4jkOn8EzysxdgY07IZ5cAZevumhbZI7c7uvX/c60C/iqCa8loNgnuTdLeZQh8YsJ+ow1Xc08aMLNxComl4IqhJmCaejfEVOS2ha+3BkaHunMwwnPG8ss3/MXRSgB1UlUZz4hd22uNamkUCxmys9GLtbJoXs5ka/nRZT6kk3ufCQ4aC2lgbkfDSZ2oytEN7Lzdp/tJ+oQWHd3lQKh6Vrjqujdb8G5IHprIJj5IhP8Xnv4QBnJsTsqgmI1Ml1FjhgXKdeGvy02XbHSEmoNMu7jm9oSatyo3nR/UjIVnnay4tI9mdEw0MEtorU0/KH3+sVcBoFY8lf+mRke9Eoejffmo7/djBgtf2a/OZpa9v/IWlrIhhLOUbqd4U5HpjG6oCc4symLChn0eaZbCo0xHXTuziIySalcOOFaC3A4K1/X8tfPNPLYYV6AOOFwKgsxJz6Nk12ldhNjJ0F7IUsbEfxwolVOfV/tu/h/c6x8lCB1ZIQESvyo/2frZqoDxTfV8MGfQBh19rXqXPU5HUS/659rcQoK3bepwWvPIo+zC4oCZCA0E/f7DHfrnuPFGRb8wNLN8dKatbHSl5s0zAugdt65BTeyF8ze24eAESXa6UUtgDGTRhj2GzJcTQJ4VFvgUlEZpZA21luYmrnQCyH5BD+vYYOZwyPyr6CPbHyLpZfVVpBYAIYuTSEGHPP2XrX/8baZf7GmbNnAmcY/2XY4iDbY9rq4BrEQp/QHzw44oMYHLLcGDwMVoVa2U6xjfFo0H7GmYCIPpCc3PKk5Ag2PNfFdJEEdqZvk2RYtWBn1q0PgHpDsmyrcnkC9lkonAmmblOIErWFptYFb1bKGoPhZl4XF4mwfA/tzjGO198YQikO5xXB7fGY8RBB+TMqgz+w52SxsvlpUnaFW2iJc+Qhu3rTuLKp5jWSnAKB3NvBXOEWgBtEZblY/StKOHsr/qngHm/AWy7LEvrPQby9dROClHpNDaqRVikl/mgnadVQ8ac9V/u3SOjX8S7Iy188a6FZi9DVAn9dtlnPDRW2HBgPcGu/YCX39btS62hKeCutD85Gc2XxZn1wHi/OgpaaWHEiNmvTly3JTfjHZo4Aui/4yjDZcJw2heitMcS7jS6704y4ZETCZPEAZXDEYNM4obMpMmS5VDV9ya56w5wmDiCdjzSrB9D+B/Z1HnzGs94Qo0+UOHOSzEWN7d4QMATUojIljfw+Ug== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 055c2a7c-8ea7-4e3c-0d75-08dc43f532c2 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2024 07:05:58.0491 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: m2R42fkl5HMNGn7BuYOK3l1EispmfOBTpwAqMQ6pLphxiKu8AEztGJsqFUP7cynV2p3Uw0qFvjHo2w2z9cTnHysjDJqz6l3o3TRK+kQwRxk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR13MB6235 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 CI found calling 'rte_eth_switch_domain_free()' without checking return value. Coverity issue: 414936 Fixes: 20eaa8e2ebae ("net/nfp: free switch domain ID on close") Cc: long.wu@corigine.com Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_flower.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index 97219ff379..303f6bd3f6 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -793,7 +793,8 @@ nfp_uninit_app_fw_flower(struct nfp_pf_dev *pf_dev) rte_free(app_fw_flower->pf_hw); nfp_mtr_priv_uninit(pf_dev); nfp_flow_priv_uninit(pf_dev); - rte_eth_switch_domain_free(app_fw_flower->switch_domain_id); + if (rte_eth_switch_domain_free(app_fw_flower->switch_domain_id) != 0) + PMD_DRV_LOG(WARNING, "Failed to free switch domain for device"); rte_free(app_fw_flower); } From patchwork Thu Mar 14 07:05:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 138339 X-Patchwork-Delegate: ferruh.yigit@amd.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 4F68243CAB; Thu, 14 Mar 2024 08:06:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5CDB242E4C; Thu, 14 Mar 2024 08:06:06 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2093.outbound.protection.outlook.com [40.107.220.93]) by mails.dpdk.org (Postfix) with ESMTP id 1AAAA42E0E; Thu, 14 Mar 2024 08:06:02 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K4bRI+MWVhR+URdPCKmFLmiOr4VmqkH8L0GqcbCZY9hKz89YFWYXEQfgPQguIKTu3RFw+AaWcQcNtZ7V9c5YMEpRycjkpUsDkKJIUKXOwPIrhVj9V0IJRalAbhw/k4b4+qnGzhdz8fb3RK0LC6UXm/McrGyES4FVMjYpDoncP2O+FH/TPoCfyEthdqtv9gSwcUaPrRoKiYBfPRMhHJ4MqYD6xO6buCuyYVmQhOK7MUnsOjWkNkeJe4x1z+O6lJfPxBKllECLc+//MAnSgv0VKKNeMORZtmIyinvrlnRGjAHQNUDhBWuVi1ApP68ql5ySrmu542B/ozZfQG787Ns2Ow== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=JaFGoOiIoNM8JGn8TyVkhQw/RM+1oIucUqEJ23jhcSA=; b=ROXc5A8D8RJPvGLIphXBV2I0yIutM+T1QQieHc5YvdgufzPq+XTe/O2QePID7r4viErYrkIlQqnXFJsVxpO3HmYwrtSChWH5SnlwRK/2L1ITV5C6/xGJ3sA3B6B7k78du85r8B+1IV+haSWn+YyggxG+w33Br7j2hL6NQdwvwe6pE35+oe1kcKytDlGt9/YGcFdzafjip5bY3CNMLbrq3mV0OQO4+xu12js8a3WCG/QFfAFGm4pDOWcAPpQmZXBThmLgK9bLq/iK5LZls/R2QSpodlvhAg8dVOzubjyatmxendUTyDpzKoABffsjRruk9XW6My2hJWfum6xwUrecZQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JaFGoOiIoNM8JGn8TyVkhQw/RM+1oIucUqEJ23jhcSA=; b=c27EmblkK3Vt91dXQkfT7CcCMbPfQIKlTCf9AJJqP1yuqNOM+YjsQawmTECf+3UudT+QDLitxEpYuWjmB9Yk9djD6hZZn7xDF+yrFlwt60O2trRutjro7vbthdU59zLYYSN6JdRk0WXddph45AmntxqcVjSN1POZ7Qd/pwkd4S0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by DS0PR13MB6235.namprd13.prod.outlook.com (2603:10b6:8:115::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.21; Thu, 14 Mar 2024 07:06:01 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e%5]) with mapi id 15.20.7362.035; Thu, 14 Mar 2024 07:06:01 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , long.wu@corigine.com, stable@dpdk.org, Peng Zhang Subject: [PATCH 2/8] net/nfp: fix string overflow Date: Thu, 14 Mar 2024 15:05:30 +0800 Message-Id: <20240314070536.3169210-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240314070536.3169210-1-chaoyong.he@corigine.com> References: <20240314070536.3169210-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR06CA0191.apcprd06.prod.outlook.com (2603:1096:4:1::23) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DS0PR13MB6235:EE_ X-MS-Office365-Filtering-Correlation-Id: b9eca307-873a-49a3-00ff-08dc43f53445 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M8lpKUUDEZxtTdui8BnZJF84x72Bxt8gQ+pZFh6QEbCBD6meChB8c3uY4cQZynT6Dg397ZHyF3usvYe1c5T9QiW/7JP6fdHeHn+RIP3IxpZKa4fvJGsbb/f9vwJR78prJI0SqJ7h1u+bCgVflBCBslBWybQ599UhrASIiL4ZIcqwhUbWRtYf5V9sTyVtZbCPEU53NP5izuMRGYxt3tVi4OunPvnyHKMW9zOzb63PvBVF29NErKI+SVgU8QpDG66vlHEjr06UDa73RyjCAeE3yQ5D8ICayjX5ACW9EckVwy/7EQu+EplQe+jgLrIneIFYKjTDN8DgmEw6gm9lPnebUPj1ERgJF0gRPCE/d2NrS7xfQNoHFmBuzHWr56DqXCKat6P/3yFu5isA6jFs6aE2dBzg6CVTkBTk8lrHbCsfb90eYYarBVPn16yDgftI5H0lhTU4WebEw6oB2ldDVR+7w+xhY3rb4uAl5g2TlmAgfNv+zbWWfjgi/F8wQ0QEEAMBfIKoN8CFai50mwZ/AMPVmrQRw7qSoN9kB4X6dadDup/TNQY9luSaFXXJ0IbLnHLISC5nV1B5N0x+nwiEU/XzpHAGXq4/dZa2Nn5bVKWvGdBe1UaojGJnkweZxCz1q4I/nx5WYOJM1I7TJVQGWJLwcZRYtpZm70LGLRpicBBNqilLC5+KZSMtprQHMCKR5QzADYE+l1quWnXV3KRIXsUR5g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376005)(52116005)(1800799015)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BC3OIR09O27L3ek4Dw6HtuazxF2PRR+mP9r5TfUxblcyDu678qf5VXHwDkIg/0O04iGhj5gGmJ3DqdOQlGA87u1jbmLrNsyHf7B6dfcWVj8fbnE983VQDJlp/jZkeM3InCJ4CEJk5stOOqeOXaGiwP8+bF7rMPvvVN7XBXpiMWeSEw/kV6D5tgTSw03rO+bn4BjwnArPPHU2IqIqaY6fj5lhuQTu9Qcg2iqeAKphQA5dwVB1Elnsfm2HLON/8viwcW1cNOhjBYKss7+g/A+RWqh+nKL/8SA8WnQxn7oScvOTcEVWWh8DyS+922R6TD7EZhd/TlrWEDpc7OvqfKwoJtgGfMOrYUUA7Wt9rWJGBO/EgO/XsJIBm+rR/VMiFhr+y5HnWNRAlZvSA7kFle6GPVUVo06My6n5H3B4A/DlJmwIgX6m3ot9WR6jzAuF7QYXcabk0p3sL+iklG9YFcTzmZ2Edj9CXnlMjy4w2Tn+TFrnyGQ6uRvPq9yNVRszwDLhQX1MJjJy9JyUOJ9gwe/PfZtxaoWq/bfSoAWVp3KrFTe41vreXtcbQBaW62tviqgUqevUbtKZRhOG+idRYNTgUxuj5bZN1P4EndUgEcDmExSImrZE9vIytrprmH+NBYoP+0nawaymsUxOmZSSc9SI+ZfgiJs3PiDW1C7JkXf4x0D+RzTWJuJoX7xWgmJaZJsg4cGcg4hm2YhK+rSJfHpvKiCbsAMLXDhqFh77qtYheKeXIJuCQKicdmOK+axEgt0Y8GuOICObXP7vaue/swMt0StXVeSTDN8EZU1OgtTQiq2F93EjL+8auDWHtn+pFylvRMfSb4ymcdg/QTOk6ZFqqBHh57HpPjPX+AN4hPWybvPhnOz33ujFk/Gj+ygcZACYoKkP+BskB12S7N3Vhpd+Q10HZrwlI3hfNrtvnM15sSY6oAzQeGHIf9gdCaXSukb98FTLaQwfR4lQc+A5AmLc1zxf09BXmkJg5pObO5VSEKcvSVOilGAiZNfL5QusywQukR1J+zNQV3HW/65kYPO96OinEC0QN/QHT9uGRm8h3DJaD1AlQ1iygc9AIMWHholForKbkb67Zv62dwXzXnrwSR/kW3nyousy1FNvrWW6HkXzkIVdioTlw/3SH3aJu0Wf/DI2AAPkDISMRmc5ramFL2xMdL4mXL7r2ywZrJPK+ou/Kz1XIX4IjRmTYzaq+kNG6em/I3A0q2lF/4RcqJu4j4v2pZfw8eQ1aGM7yoGJWAg0yBSuYBJEy+uSKlJHx93Df09BbzD6mmln2LQauD5tf3BjvUKzdFDHSQ6wkL22jZ9sI1h7LYni8MVKyXWxUtCGWysCq57AWWlyQUWmEaxpyppLcFwz2zbilPHAxNj/SgmS+00NDfaL21yiKHQxk8nFydMHwYlvTYidSgMTZThN3Xkdu8CIDV8j5ODs/tVnyNuUWVMpJn0NZSaUri5YY2stORKLwAOfEE7ommrdtP3x+j3lDZWUJrXVuI6GmvX010AyDBDskVnRcjwo7k9XHSidRK5JNWsRLRRAKw+bFbR2aGATGFYkvZrWOvaVTS9SxNW6bKCLnNHV3dmadjJH0IXDlHmneNjOEXMsUHr7kjnzCg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: b9eca307-873a-49a3-00ff-08dc43f53445 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2024 07:06:00.6865 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: BBJUQ16StR4DiFE+eQDB6ziaBNBZAKzSeLcqRLdoQNaXBbBbaBH34S3LRrJ2qrS4VcHBhKMz0WgMF2fL+9tKKa7MTrVJV/R0O4Ph3M5h19A= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR13MB6235 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 CI found in the logic of 'nfp_sync_pci_inner_handle_alloc()', use 'strcpy()' may cause string overflow, fix it by use 'rte_strlcpy()'. Coverity issue: 414937 Fixes: 6b4273a03779 ("net/nfp: add synchronization module") Cc: long.wu@corigine.com Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfpcore/nfp_sync.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfpcore/nfp_sync.c b/drivers/net/nfp/nfpcore/nfp_sync.c index 8bc38d6585..686cdf8eb1 100644 --- a/drivers/net/nfp/nfpcore/nfp_sync.c +++ b/drivers/net/nfp/nfpcore/nfp_sync.c @@ -9,6 +9,7 @@ #include #include #include +#include #include "nfp_logs.h" @@ -266,7 +267,7 @@ nfp_sync_pci_inner_handle_alloc(struct nfp_sync *sync, for (i = 0; i < NFP_SYNC_PCI_MAX; i++) { if (strlen(sync->pci[i].pci_name) == 0) { pci_avail_id = i; - strcpy(sync->pci[pci_avail_id].pci_name, pci_name); + rte_strlcpy(sync->pci[pci_avail_id].pci_name, pci_name, PCI_PRI_STR_SIZE); goto common_alloc; } } From patchwork Thu Mar 14 07:05:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 138340 X-Patchwork-Delegate: ferruh.yigit@amd.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 E323B43CAB; Thu, 14 Mar 2024 08:06:23 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5235A42E63; Thu, 14 Mar 2024 08:06:08 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2091.outbound.protection.outlook.com [40.107.220.91]) by mails.dpdk.org (Postfix) with ESMTP id 58E7042E4C; Thu, 14 Mar 2024 08:06:05 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LDWyOIln7N3LB21pb0oSBR+vnptxZZ5yPTXlxypOOB9u4OrY1j/Q0Ohdu1+L0erFOPlBv2IvvQDvZGDK/vcAxX/zyP2OpFGdu1rxY5yP0UXCooJlcUpBYEJEdDzSyUtAgCuFJO6vTepKAxSy8kC4YG/cTQmYTbK+3lMtekx2m6ByEoasZk+kI1pYBY9O3r5UbGTKeq/ovepgEzAo/0XKtePdr8/pD/Pmg8wUt7kZ9H67IF/lsJtWlkO9w7HGZ7FT8KdHUXzpQ80JB//sPC4uT40lwjiMDXDQlTi72dUfELwRswB6ExfFMl34iQfPijchipzEd66KYFYGO0YzjLAytA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lYyea+SHyUtstUQBTNwuiaui4P6HKzoY2nH6zaWhB4k=; b=c1XW57fOa+0p8bRBDq4GR1pY685/iZ1cn0+WOG+0rKTyJiJMaKiOOvCisB5SBC92w5/InVzc2sagPsAvaCbq/JjyKj237GUebgsvCiqZiibGbZcxJ+0RWE/vsP6dxWO+FZEWLdV7fwhqAfIGU0stSpGVotzqEwOBca6MPom4axEV/BA8sh4rKMNxcvNKDknaq8KOgkQq7I5LR9/CBBi+yqu+dNOn+ZJtj5JZ0w6HEUyXdQJ2b54UyXbsg+eqsrxcrFx4qZ+sF7f3LoiUZEOh1vyvQJH0VoljGKuGOkolr9Gr95mi6CbxUCDpLY8DgmeiNB7pqS0bTTnUkiJk6LmcXQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lYyea+SHyUtstUQBTNwuiaui4P6HKzoY2nH6zaWhB4k=; b=PkVElaXqgFMhWUf3bwq+5RV2Mul38KwPCUiPDUEKzS6RFGzh8e6gkVyjpDl0ctzP1iVGZjjZjYTMkgVoOdGDhPIhTtNQV4rcgJUPtvreoLcEV9nbiABAD0c36+kGa97VP/WKp7J1hahfPwPRNSaQqGe4uDk/HRAAaFY21ElrwZw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by DS0PR13MB6235.namprd13.prod.outlook.com (2603:10b6:8:115::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.21; Thu, 14 Mar 2024 07:06:03 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e%5]) with mapi id 15.20.7362.035; Thu, 14 Mar 2024 07:06:03 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , stable@dpdk.org, Long Wu , Peng Zhang Subject: [PATCH 3/8] net/nfp: fix unreachable control flow Date: Thu, 14 Mar 2024 15:05:31 +0800 Message-Id: <20240314070536.3169210-4-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240314070536.3169210-1-chaoyong.he@corigine.com> References: <20240314070536.3169210-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR06CA0191.apcprd06.prod.outlook.com (2603:1096:4:1::23) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DS0PR13MB6235:EE_ X-MS-Office365-Filtering-Correlation-Id: fd7aa263-f6d1-43f4-b5c1-08dc43f535d9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: phrayM7vJkD0MqsmdWg82EtEUNKF8zBhc9vH7GyDr5uzG/qgRjLA4OYKy/RYjwcDJt8/uNmxTkXn1hkMzuQgBhEvyjVEqpdNAVtbv3Wc37Eb3rnfBG9ion9clsC8h6vfT/m0wv7HUoAH7IrtT2xD40b8Cf8TmQHwRHZr0bSjEMdysEmCQmEfGqWtOQl/z52VB2tJXb7E0i6eJvXOljMM0VyVPR1h+5BCZRbJ3QJZuPXAibUdC7sHMIaH4dpFOr5pOEFU0c3xJTZt58pbQTeJpFh0/ys27pOsSXqp6/exB6OX869l4g0wgf7VwckET/5qvtLx4WJI6sbhwDd2bMJR3TVAla8TGxrp2wLG3yz6W6rOToWZ4F4WczGcydYWdPtEKA2UE4jyFzncOSeycIJZR3jttOajt/I9iOH+DB2v2Ql9ZIwFd6+6dESC7q4SqrQJCtH38ZVaQRguQH0xZf4IQNLAi230l1WJo7a5InHpJwr/PB5H7w2x8WyZJ2ipXVQXxZlNL8H6hTAdvzTBSHmX273Px7VfHyRGra6Udethyp/VXiwfKJrsR8X2ZnkB/HHZHFKgc/nU78ufKyMJ+vJSiIIwkV/oUyWMUeaXU+yThTnyhMNB0j2OcaYn/Bdp+SJvSl3tTSz82usaROUKMoY6SHAMYIdIP3HgCKnrBBTuZqyA8LL7+qUpwANOxYjaCusTnQja8+1AB7m8y5uTvl93ug== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376005)(52116005)(1800799015)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uSGeRxeooDHqb+dN4NHOIdjjCCBymT7RK2rrWASM9OA4Xkvjnkl9aGRRdRzN9YtaJIfcUSF36wNPp6ENVfF8AitW1I9INM6+rQoQFQ6N0c/uQcPmajgvnUxVE0ih8hRW5+6kdYnIhBYvztHbGB9ezz4Tl8/k6X+VBLTANPg/DnCx5uqsWDIiHrR04iUsfXPr+k2aJ/W9sN/lYnsaQOXmG7B72hAXI3+BWR1s29n98ez0rxIShVOLZK5P1snejCsvZCooFXXd1nMIA5YZCu5tqqGgtOyDMVMdUYftVjSVsdG2s43hlC5bIbeqFQJlpW+mhLcSj7POosbTrO8P9NGZovEpe51xIpuUaeWUhRzZnhpDUaJjsakjGj+nuKFpi/gzXxCstmuoQqZGv4VtDpzuT0cYzNpNv9hcjUoQxf7IY2RYtBbGsn7ylHjXW8W7lupKVlWUxuiGMQhaUdDv8C0knrNSq/HBuT6XA8nV0h8KrmBDXXaOHId8Cfa5pa46f8LibK5Hvh7ocWo/VDMiRUQ8nax2UPfT83VT6IC33i3Y6i/ZkEsAsHdOao0WB67ESbwZoLLgSbaKPR0sdYm1sWiP9uAPNtFkhpvu5c/uBHb0cTzdb2hMImCWhZwCG12ZyV5ZcyI2Dj5erCWlA+wUYpLclpizhb4bzY3prQpfNvHopgltsqKqAFeK9EM8HzcnwKgQdibi9qt+bU6GgeK9o2U/BtA9FoUI0o0J18vG7vb+OahvW13tQIGroeJzrrtUTj0DNc0q7YOsrIwRuQeNKuzw/M9gwDR5TjywfwRgBAoF02QBZjNxK822WQalOM/xo+k95brFEeiQIum+A/4sOlSvvpjpTAhXU1uz38kqfSv9kuDrKonax35czDl3hLJTU+zP15itUuael7WK1SNJZ/UTB5oj54w3KEeNyrQbrtbJD/lL2yI6l31d+sfsPrA7/Aantb+EU/0j7GRQ73Y+sJVWT6rbYiUoLLXSE+D4VoyeXh3gZqNRdT/9+Zc5ch37Ko2UhFiydiFZn5LVUZTI0Jq4keeGS+hXgknfRkn+BKeSTENezqGBpJZ0yqyNR3DOyuOvD+vIe7i+eDjAObrT2bYMpysd/SWB8k3iQqdZw0r1Nm9KQEpyv8bpARegzmSFtq8HtMVQqG+W5FP/Hz786diLTxEcmvHQgMFpDCSF64ddt2jT3H/mUQgnaurEohcurAwneCdjZ+6kKcZFdUyvUoYyfbbZ9+unpdq7sgtLZAyP+6Xg/erV6M4yEGWpAxfJzraUh839fBwzlLjSsuVZfRsOGuqZUt9KOPMAk4lbSUNe7Lkz0+/RQ8ACRETqfLG0Ce+H/xozTsdsAbBdrjhrPNlgaKNXfxhO+Np9XoadUzjc8VKEwKFoFJGj5d+Kql19yPLd9R/N+oq5AIdqDVoGN6RjYRATxOj2iTA/i7z04uY7z5Q5m37Wlr4iDocGP2VuYwsCyT+enbf7oIN8tXxk67tjAqC91+rq0XJq6WsLy2XgErYYdXBJ2ZN0KADhLUISbrSm5buXTG7iMclY3XVnCUT1kYXJgIBfef4Q/jVXESPioFko72NNZbUVVC1QBMzKSQvbcVV7easfoqcSXdA1+0PrvA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: fd7aa263-f6d1-43f4-b5c1-08dc43f535d9 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2024 07:06:03.2254 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ftSGTXyTNxGeKaC+f+qlmAToBLIwch85biSXwLWLdGAtVWmK/ErbS4b2BeihbaI9kWZ8DwfXcXby4RJ2EuvD/AEomzMi7Hk0UAo5b+seYyk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR13MB6235 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 CI found there has unreachable control flow, fix it by remove the missing delete 'return' statement. Coverity issue: 414938 Fixes: 369945667251 ("net/nfp: fix resource leak for device initialization") Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 31c54a595c..568de1d024 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -936,7 +936,6 @@ nfp_net_init(struct rte_eth_dev *eth_dev) err = nfp_net_tlv_caps_parse(eth_dev); if (err != 0) { PMD_INIT_LOG(ERR, "Failed to parser TLV caps"); - return err; goto free_area; } From patchwork Thu Mar 14 07:05:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 138341 X-Patchwork-Delegate: ferruh.yigit@amd.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 DFFFD43CAB; Thu, 14 Mar 2024 08:06:32 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0FDD142E6A; Thu, 14 Mar 2024 08:06:10 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2135.outbound.protection.outlook.com [40.107.220.135]) by mails.dpdk.org (Postfix) with ESMTP id 5985642E43; Thu, 14 Mar 2024 08:06:07 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tteuo/H6JCSkit4O1AJqEIDFRqwNS4JHAudIinkuy1nFFEG7ASSin71vqUbu7tCrmIV/wkq+nT17dtw3gTaO8RzW0z08/w2COQ08dDCb0HiOux/2exMmRl6IFP3VbO6g3nUTxq6UT2ZHOAMhRE38EX0RFEDDNM0l1M8RvLxZEwDCWoWqgjkkwEVtjo5/SjmuBhBnKmmy+eSeWB/aiqBd/e89092+XDDuAe5uPiiR6+LlkvD2ZZzKv9RePThlZnHK2YD7kgKNTIsvI50qlXqPoEXd8i+MzxlFHX2iZzm4whftLj/N/qwA1BMVlLUrmyl/Kj9I5e4S4s1qGVEaybFMyw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=q2k0o8X3XoDCy1bJmuMyk4XMbq2IWTeaBJNFmegDzN8=; b=nvOwZK7utCI+7GXIStxb40vpJzmxyoSILEBk3uojqK6SG/6GOgA6+hMr36jztHsMFPLO/fBGdDP8Gq9Uip/BlvL6n3BEAIPKDFIJs2eVxgrNy4jiKejx59r/6iWxyc+CAr9v3cqlbIYxOT2GjJchSlTf8sJqnm4As3uniQf6VSbCDTV45OFWqJcpfbCSxCHWOJ4O50Ig69qGrEIUdADcuXJtPAphoKUE5pZd4U3cl8vn8TNvHIh2/YkzuIZSYGjPvCtSynn3GH2wPjX0tOaXC83VeLOpwnCpH+ZnoJGH5RWtUNOWhoJL7RRq1OFXhkZvpoh8IHHHq0Ff4+ALbfMK6w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=q2k0o8X3XoDCy1bJmuMyk4XMbq2IWTeaBJNFmegDzN8=; b=S7bwp6nwK6OiNTnp3g9C/FvSBBMLCvlxpm0SPHDaw7fgTiLQutiCqBLSpdBG9neriAvuxNs3cT/19nfW2SAk0HrzAPWVipe9PsL77Wymjoy1Dz9HCtCwOlLgaVJhKDkOOy6ZdwSyP7l7lQghxFLhOdrpzc0VLCDRCMQefx/vSiw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by DS0PR13MB6235.namprd13.prod.outlook.com (2603:10b6:8:115::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.21; Thu, 14 Mar 2024 07:06:05 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e%5]) with mapi id 15.20.7362.035; Thu, 14 Mar 2024 07:06:05 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , long.wu@corigine.com, stable@dpdk.org, Peng Zhang Subject: [PATCH 4/8] net/nfp: fix check return value Date: Thu, 14 Mar 2024 15:05:32 +0800 Message-Id: <20240314070536.3169210-5-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240314070536.3169210-1-chaoyong.he@corigine.com> References: <20240314070536.3169210-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR06CA0191.apcprd06.prod.outlook.com (2603:1096:4:1::23) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DS0PR13MB6235:EE_ X-MS-Office365-Filtering-Correlation-Id: 6eabf46d-27e8-44f1-e17e-08dc43f5375a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fin+7MntdVPqygu+p+NC901IRLPxkDS0H9snNZMybwSPSWB7P9/Y73czAJ3qfbyU2UUE7t3O4DrEMFsH1EW4Y6v+ZjncgYp45ckm0sd14NloBZ77Adzg3QgF/sifoQqWgfLABDcSv/Ju7FvR6i5gAg9tsG5lWUqIb3b7BpxONO4zkM6z5MnLfPj6dB0E75lBHUrea8ZwAw4xgk7QZigBQdowa7X08Tbek7PrWCNDnOJTB4LPGtHfuDZx1x+75dsIfc0Kq753QGK+xArkchMYS8QcZBSi0zIq21N5ipWEigJY4rqHiJo0lmAhEinRmx3GL1EgIsSsAXrEWrfuthD7Y8i0H9qxpVngAsVqVh4Rctlddi6bSefeTSmlTigngq7lSMxt5RSvi1g16o8nXrZiC8z9xSQyQd0E16ptPpdcySFWuLcsVHKEiJX17LAztm5FCBfaLYSDWVRtr3ODtcVZ1j6AN2Q6N8NIif9/LXibCpupxtoxGzxr1BaWukDhVeA5QwTnaZ65GuC7H/oOZwKq+Nd/vPs7dElFeiRZYLXtXSNMDhB30HE8C7dqhdVceVdzlAEbsS1TAjMHNL+AYHt5j8YFGiaSaIIxbER9VABv3r6AZj3FLJ4j6+tsaMjvYaz5eAf5giQdgoKd3azeZcptVNxt5rvCWWTQBiHQkkPIbC3Mf/SJ8jcTOCh17tpiqRiAqsxet39xfO3Vmjx533Edfn7Si2iIfrxcabqPiKKJEsA= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376005)(52116005)(1800799015)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CIkfW8j7YVnGXB3UPVQP30k1af+GQ9X2wQ1MXZXKmdeyJNlNHGjTu3zVbfK+Jpc3oiX9ggMGQIUIxOcV2I7+90OFIUsz3Het6xM1NYCFqggO9rmm7oa38y7DKzD+dVye7ZDpXid6iTVcT9QW4u8soX9OUWVFhM27DS6Jxe17r1zAE+X/cRWsz+fxzBcogxqtX9jBn7dYWvi5pfTj/xPQ4+spFLNlGFzUujOuZRmItGekfTf4Owz8IhPmnhhhgTKMZshH6iTUaFRFCsjVoDCkzv12lcoWPmmafKGYKfbYB+cap3YkZ0TYKSuLkcPXMJ0I7Q8fi17bMl9toOsUaay82jQl74PO3WQnYV+AGrKr4OSSP3tMCpCA5F4xBG6x5ZHEo7FnVcDaSVuvuxbEcNu48xrIEXrqwBKzGVynmw0EVHmtApfHTJ2ym+ghyHJjkPUIwEPjoGssF6LGqtIziz9bYp+YSo7FIzGUuNxn+worZntUFW8mLv+1zvm5M3+rip0363g3BBj61+LyELexqVGUfIaPrN28zZP8ntlTrKV56qn0qU+GAWa9hUmxTN1fmqK2rgvFIHbQ7GXtruoADu9JsFGLne6O/rgT53GupmRcnakt5nmTqHzRw3gY9TZaKUsrvhoHshQikmlkiMz1ThJMlqHaUJaR5wBn8vfX40OG0pSm3HDMPDnTzlefwCqQdIDBfSejx0+IT17Q3qDIVk2lAd96bJIDgdBYpT2WqtgaPSouWRcEvSBu9G1qYP/oCZdYADhcD/NPIuxvQmEzQHd2ywvVKvc5wJ1QBT1peI842Dc0sz6WHYVpjybfb8RqzcsyPnu649yRIFBOu7MUAQvtWlDXrQFS7MZtkg7Tb805wtg5DlzSOgP/+uHO34gqSinNKE0QFjqON1uOAHSjNF2Qi5GA++PjTHBgwIZb4kR3ypxdmoq/IblhbWVCa7ygMkLlQVd0IUcF7bmam9k1hxkaul8s+oGJnwOlYYokRi8/835OQWBxG5wh6UHjp5weW7NBjMmD6RfLpJe1FklE3ITd+dHDeoSWPZNzl2yyz5tLXrNiHFpsVF2Bh3/rqpWOcJaeoUy7HoRNMTOq+a0YZ2YpxBwNIBz9uLRBsS5hkxkroooHp4LzPw7BevZTwWNP3zgVALMg4AcqCt4L8FbjrA6swJumBiMHdz5HLQpeDtsdzOxY1mObTiuH7pWU3XyjGRSRoLumUnmPQf9oF9ogJ32m2zDu8zFhNzxP5FA+OofAmlVbKCdztb8FhEkJGjvDt5DMZl/hq8DsOj5VHful5lI/R/6eeFsrhUlcHk5unNqnpztY+FAzl91ggUSxC9OhhEOm+svyM0Kpfk7jxRDyOPJjZ0wn3mb0L9+w+wmseN9C2EmkrunI+xOtXjp/UTodqdsdhr+9HgNkAczJJm+Ny2hIhjR3R6E4iT8h/DfbIESj6uYPNamruI/mivQwCZamOvx0X5hGd/hs4eR865xJJaJXSiyKnkPAPAChck0uNU15QX9oVekCY4hlUj0vqRNl7JluTQPIevk2S+ow7xd3OYr99VvGdS+Y4XpfT3dASmUw3S5nonsgAFAiwIRSOkxUVJuOpUoLSUQlHxa8mHkKg2u/tw== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6eabf46d-27e8-44f1-e17e-08dc43f5375a X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2024 07:06:05.7814 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 8Nq0OwtSXjfXtccZxIQ2I35QazCtPRDFNlHHK6EOyVBHYLTrMGz67+GBLRtoUvaQuxv/gTR97n+GMfZ/CwbTFUUqlfGDCq7GlIVeabNsTrc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR13MB6235 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 CI found in 'nfp_service_disable()', not check the return value of API 'rte_service_map_lcore_set()'. Coverity issue: 414939 Fixes: 600f6d2c7704 ("net/nfp: add service module") Cc: long.wu@corigine.com Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_service.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfp_service.c b/drivers/net/nfp/nfp_service.c index f49fa6addf..24d60857ac 100644 --- a/drivers/net/nfp/nfp_service.c +++ b/drivers/net/nfp/nfp_service.c @@ -90,6 +90,7 @@ nfp_service_enable(const struct rte_service_spec *service_spec, int nfp_service_disable(struct nfp_service_info *info) { + int ret; uint32_t i; const char *service_name; @@ -107,10 +108,16 @@ nfp_service_disable(struct nfp_service_info *info) break; rte_delay_ms(1); } + if (i == NFP_SERVICE_DISABLE_WAIT_COUNT) PMD_DRV_LOG(ERR, "Could not stop service %s", service_name); - rte_service_map_lcore_set(info->id, info->lcore, 0); + ret = rte_service_map_lcore_set(info->id, info->lcore, 0); + if (ret != 0) { + PMD_DRV_LOG(DEBUG, "Could not unmap flower service"); + return -ENOENT; + } + rte_service_component_unregister(info->id); return 0; From patchwork Thu Mar 14 07:05:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 138342 X-Patchwork-Delegate: ferruh.yigit@amd.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 96EC843CAB; Thu, 14 Mar 2024 08:06:39 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9595F42E5E; Thu, 14 Mar 2024 08:06:12 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2121.outbound.protection.outlook.com [40.107.220.121]) by mails.dpdk.org (Postfix) with ESMTP id D32EB42E5B; Thu, 14 Mar 2024 08:06:09 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=POeJyj95uzkJo4uqbV7BDWt6Zc5ASRls2dWA1Dr1DK9inUHAJi4nCQD1zXpx86mKTjBpFZBjc9uSJMo4dXKXC1mcDQ9i1PNRAFfPYbG64Mg3pvGaXK10T5yMwk0Xp4MvTSCOLBvueDuX/5q5jf++V1NIJfTDUtkBig1elsjWpRwrRJ/M9JamO6uRIxHAXIaQMj3A0MzaSSk4KPQd57s4fa4ffOC9bEj5GNAWlTMmqL65lxocXEREHYgKE1T+OFVJyVzhLb/Lai9cxomkvfEQPCyeltlcEwroCN/KyD2bv/xKzqVJIe6vo5fZsTgXgE+h4YiiW7hRf1B/7Zv19z+VlQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=EB0MocTzMUAcKtnhvet0Pkwim1Lriwxw1GaQzsfmPjg=; b=BPKelE76HpG0Rja4UvOwfnWC6IHdeOQg/Y1p1B2SWSJTJf0MBwFuLSwbBdokKEKqHf63ytMTyQAz1aobRWtx2ujRPPBA1xzoHJ2pATA/vZ0xSekSQS/nGs5n3PiGbj2J4Ca/1TLNepYnG+AK9sU/opxtVAey5MjawxHWplpyxebKsHeMnZcat/qd2NAJCrUrwEryAW0BWEjx2UZgUgyJVM/+Ugw7ed5hxP/6H1bcsDAuOUifJQXapAKFC7u/amNjCEAPvAbwAzy72vtB4+TVSYKUiLo8YHa1jy0r+SOWm900iWLE9l6OTIvz8b2tWAj4ej0yodWXZdQvT57mwQSNsQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EB0MocTzMUAcKtnhvet0Pkwim1Lriwxw1GaQzsfmPjg=; b=O6jKm2l14cS1wpefEFKrlD6d5axzjvF1vXNGbjXHbqi/KNIGW3stVYpDwCuqkhBQtmtl8+zHGxKsyWKpeI9y9+qQc39iyy8LKocRaeHA94cM1iRvtosHphXwIbz70IP6Y7l6Mhv62PWcOVmC6u8/k8fIzVQxcnNgCvTDu4el00M= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by DS0PR13MB6235.namprd13.prod.outlook.com (2603:10b6:8:115::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.21; Thu, 14 Mar 2024 07:06:08 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e%5]) with mapi id 15.20.7362.035; Thu, 14 Mar 2024 07:06:08 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , stable@dpdk.org, Long Wu , Peng Zhang Subject: [PATCH 5/8] net/nfp: fix unreachable loop flow Date: Thu, 14 Mar 2024 15:05:33 +0800 Message-Id: <20240314070536.3169210-6-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240314070536.3169210-1-chaoyong.he@corigine.com> References: <20240314070536.3169210-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR06CA0191.apcprd06.prod.outlook.com (2603:1096:4:1::23) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DS0PR13MB6235:EE_ X-MS-Office365-Filtering-Correlation-Id: cbab21d2-a627-4a57-1957-08dc43f538e7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fLWbY6PJU/aC+/0EaO7QKV5QqnraNOjK1Iujcpt8GxwF5gucee48aB0pFKKGYYTOTBf62LTOj55k5rZ6bzM8jBDmonqaGcdBxeDAB05y+AOX7VgOdFmxF/gVLDFz+WqUoQfOq6Z7XETQhDPtvQ1TDPdtbDVypfsb2j5Ye2+vkdmw6CMAgUYrp71TFixgqc4nKkT0i1vf32z1FlIFKlhq2nDMJw+NvRzaUEAz9yzPo6bZB3s9Y1r9Dtll5SB2sE8RChGa5VC0ZNPjJ7pPgFNrQ3NRw9C2epaEFHPDQ17vnC+aZXkX4Vnp3Qu9H6AYn4+5molGEfRNyJvFSuVImZgUuLP8ZHzAG72BKFpQOE/MHHjDrMbDcdfhJ3NfG3m+VWrRBCa1dafJ0AhytBHi+t3fS+yzoROjaOYnLne8K4+f7sDW+NWRcDbFlFuY5b/KiSPPjpArsCxHtxUoFO/cxNzFmnJ5hWeN+KRZQKlpNETZnRybCjpP0nsG0f8sQ4ItX1SXkRcTDZDE6ULfkOFRl8Dc/tr1YsiDndf0uDO0bRsfMxBJl5RmTjGTwbyg3jW1VYIBlu3QfmIRVLCLYAxDNL9OqxK3Ewmb1/GROuVdIZQyNcMBg+tglM7ZqOGK7pnsTF0i6z9A5vCoix9lvsuO2T2xYVjhM1zB6O7mbFJ21ksBWZasWOC0N19JKttnTH0wg6JgMIxzhwgSWAmgIVONFCdrXg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376005)(52116005)(1800799015)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6ee5NVbhHNrB+85dM6FoeMtStFxwWJetB2Iz+yNPoC5N3gKTABzHmdlAW6T7ar0shE89uoRUxmXQBX7l4GOJ5F/aedM3/U2LmqFUzCLicl8D8y6Zdu64GEZ62sc+hZf/XHr211ZssMUCTbBFG71Ha0BMw88YWDKWuL/o/nvCoR8Vy/fZQR/SPW/V3ine4z/XLFf9TtBfjsMhpUGs7n0iZHoFdiGVXdC7SihqgIEAI9Bsey2eOwZZDWh2sZYz4kY8blJRel9bp1V+N/OYwo3+4padqB4jSLTvDLfebCEzrwfu3pNG6shA0DIxBkgfR4Qa28ZPa5ILASKY0xcpjL63Vfre9A5OXZ7hCxl1MhwAmxruMzvYDn0voSvhn0T3rCc7sUi9uSJcqGDmJEvZYnQzJJKTVeM1xcAgArIXIH74bbZWFEW3iJcdadF03n/QL08dltCkR43ScKbHEk2o054c5eRRiyB1hIVyJTZp92VoMIKguu9EJ6zdoV48LPInObUiKGbSSCBZf6IDLrTVhvX3naI2Fv8/9zu7VvQW6JzhVOMDsoLPswTb3xq8qmoCEyBJPhgrPfGMMU5e2IL0zYa9t5vweg4Yx3mAAzJwpF6JGy8fi0jkJNfHBceWRLJC/k6kL+fVuZAZzbRmrM5jvjxPO7IQpjR9kZy+XX+JoGRW3/A53LJ53HBaOvKQXzrA7gvTAa0qzqdRyD90rN22GKKkJZAuysrtUwE838aFtqrvQQNo3U0YDK4iSJ4qS4mkK7NjqSPd4oDqSkmUq4aP3tQl8dZAQ4KHb/l5d7g4McNSbvdwERgdNUATQA5syqmPFUYGuhoUIGIcIWe2ZHKWAmwWjXDXfBc0XbXoAyelje2NHwdeNnlu/HcW6Tu8noxmuXgJWUyAvqCNdqRgwP/yM4vDzIUuigcVU9q8//Jb0Tybozu3cb7+UBUKq5zkaDcJ47tvdErTtZGTwPF3NgrNm5zWnU3LifLzFmBaADNAe0ppHw6u02WNyI1US/WpcVazbahOHbI6zGwEEjpNpYJU1tBVEObHHgiA5dhOHN1Es70+F+1MYUDSNKrjDjgNDXXFQMYf78UG+N7KePiKLR860Gcvlj36vi4jGGFfichA8Vub5Awo2Wn1Doiy2l5TnbYlJV5UXoW6JetTEcqd1K5NZI7HMrDyHAFB2h+JAQcBe1QUi/bEZp+2GGelOh7OPI4JU0GSq1xcTD5Z5FCFFbQM8e3y4kGvsAM/nhASWfTcsTcni4stSg9E2fZV9xv0Gy9xhGxBxEw3yboTcvweR8VlNpqo3YvFjsHf46krrPS/GitAYESUgTnLEIweIXKZ6qVjc8f7sGP2S5yQzzqZkfgtiDFPb5brMaEBSPcfcXl9cqVyC0Eu4dzhfkjQHOIY2Erli2NH9JvIkcBWE2FOR9XD7QxcUSaK0DPLCXrhT3gcqad7VqyN4K5Pw5mMgyY+lXRJzG+kgol3DjYm6UNd3b3pOF7i3jsJpnMbPzbIlXAgJgTRDc7OrFkN8IFvX/A5PwGAJ3y2SjgcWHdjXlZZ7IBmP2aDWmzvTZw8xU5vCUPvetetUWUjA0qWKq3dMSPndsWu3K8RZ6VRmOb6jp0jRmoGAvLYpw== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: cbab21d2-a627-4a57-1957-08dc43f538e7 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2024 07:06:08.2635 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: yj2odltu4PiHJq4N8uW0mayst0nZz/Bq95iDEzEW1nR5+DDVzHTc4wxHVgDfzGln3OoXbRUGs2yTrf2JuDAulStniZ6hSB2obdp1UxJ3ols= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR13MB6235 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 CI found the loop flow in 'nfp_net_flow_calculate_items()' will never execute more than once. Coverity issue: 414941 Fixes: c91c6512d876 ("net/nfp: support Ethernet flow item") Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_net_flow.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_net_flow.c b/drivers/net/nfp/nfp_net_flow.c index ff6ce3ee45..251974edb4 100644 --- a/drivers/net/nfp/nfp_net_flow.c +++ b/drivers/net/nfp/nfp_net_flow.c @@ -180,6 +180,7 @@ static int nfp_net_flow_calculate_items(const struct rte_flow_item items[], uint32_t *match_len) { + int ret = -EINVAL; const struct rte_flow_item *item; for (item = items; item->type != RTE_FLOW_ITEM_TYPE_END; ++item) { @@ -187,7 +188,8 @@ nfp_net_flow_calculate_items(const struct rte_flow_item items[], case RTE_FLOW_ITEM_TYPE_ETH: PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_ETH detected"); *match_len = sizeof(struct nfp_net_cmsg_match_eth); - return 0; + ret = 0; + break; case RTE_FLOW_ITEM_TYPE_IPV4: PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_IPV4 detected"); *match_len = sizeof(struct nfp_net_cmsg_match_v4); @@ -203,7 +205,7 @@ nfp_net_flow_calculate_items(const struct rte_flow_item items[], } } - return -EINVAL; + return ret; } static int From patchwork Thu Mar 14 07:05:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 138343 X-Patchwork-Delegate: ferruh.yigit@amd.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 5A1E143CAB; Thu, 14 Mar 2024 08:06:47 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 67AD542E75; Thu, 14 Mar 2024 08:06:14 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2103.outbound.protection.outlook.com [40.107.220.103]) by mails.dpdk.org (Postfix) with ESMTP id A3BC242E65; Thu, 14 Mar 2024 08:06:12 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EWyQBX2QpxWyDSOZMY0A3kUqEFvQjl96fmii9KCc4FeIYXp9SpJ+IYji8jyxalrdKFD/6w6A2vCLAA+KyMssoHw0f8c9d3wyleFA3AfXb1oUklmurkxxe25EkDTSIfEC9NbSSrPwhRW6MZ8Ea+0jMa29LxMPfYKiypvOMcMlbAmPBoW5TslrS+cj9p5iw+QanwkRfgDD9ojFnOUZb2ikKk5iqVAeRWFCqBMbdOARMNftzlHTDdoE/LiODIKzpXiy8TtM5xetVu5zxf++kvSZ81zPhmLd8Hjxg1Rj8Eag05cLGP8K/1C62j/uTuADNObkxHE3GRzM5iKP1csrSMFmfA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=R1vFhZO3XcS0xmnG8doqo3d01BUp6K+oMMUU0Cpnai0=; b=BwFvcVIgZ63g6V7COMni6F7LTygVBmrveKeYdFd94uRVQRwS6pCKHTqojIjqcBtOcmT8aJLiN6TI0eDaUSKeCyerByj9vMRpWuoIymqh9dLPqyfk8Jl014waOm3FJnOL59sM68ktt0aq9wj7rxtghyMCkFtd/afiXoOPSgxKXZNXiGwnDlCQog5jAd15vAR6yhwq4bxPTu2/CUgb1qkl3zLWFLVSvGEeUlIlrhMxBc++wxNGyu6ZvQZeHr7gUkvrJc8l4eEaKTeWf51V+60LzPKXk7WLXbR/QFIrxdYV5bXaNyCsRFVh+cg1QHq9GKkoLEQVBOxGC/XRJGovo+w7Aw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=R1vFhZO3XcS0xmnG8doqo3d01BUp6K+oMMUU0Cpnai0=; b=Bz275hvd8zOS/Qy5tr2SAFyVMcWTtjUVzT/Jf9IZBNjaujlxY3vwDHCGvlVOWznov9a5CyC+VcOQJWHoayIVqLKp07+A2Wy/jLUeSnuEy8FfVsm8R7wJdZUoNCbaFngxFikM2wfJvd2uFU7e02CUtHqqcOJa4DXHBXepy3xKvas= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by DS0PR13MB6235.namprd13.prod.outlook.com (2603:10b6:8:115::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.21; Thu, 14 Mar 2024 07:06:11 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e%5]) with mapi id 15.20.7362.035; Thu, 14 Mar 2024 07:06:11 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , stable@dpdk.org, Long Wu , Peng Zhang Subject: [PATCH 6/8] net/nfp: fix null pointer dereference Date: Thu, 14 Mar 2024 15:05:34 +0800 Message-Id: <20240314070536.3169210-7-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240314070536.3169210-1-chaoyong.he@corigine.com> References: <20240314070536.3169210-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR06CA0191.apcprd06.prod.outlook.com (2603:1096:4:1::23) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DS0PR13MB6235:EE_ X-MS-Office365-Filtering-Correlation-Id: 63a77d99-cb00-459f-19cd-08dc43f53a65 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MIntDV/lZ/Q7xcp9PcnfK3sfQCJBzHkyy07e0ICrkZGM4e25sZ+GRSPaWfuPxe8S3CYmclGMLf6mCdNilniHMT9YUypjyvkcaCp38yVVwlr9BSc9Rm8JDS+ewhemMFV0Xs6g5TzjZ5YgGNGBRe85Cww+pfS3oljd/RchWp52T647meJYabV6y6Xq+ly5ml4QIcmv8x/WMMjG6G9+3iALHLsGWbV8NTat9zpjS/+Q3WzjyHbG7VTz5muZJalPlOXqKO4lV0z9KwbyvQtQQaf0kwFa3yCLmugJb0DmiCc4mvtTo2jz6pBKaj3W9Ej/sN6pxP+deS+zDjdIKk1fjSScZKQY0LM9u1rzoXu9gAJ0ig9hw9gG/TC7KeyRfOT1eH/6XU19XaR4b3Ncyu4CdehS8B7nEnzYOtiRHzQNjJU3GWMWUsO83X2+UWAZUHpzXXjA7sjLqnfVG9in914TGhe3bCt96RysckkB4izxPh9HMx2qss4sLRikKgJVwWBK2Dv/dyYZYMWrJD1oHpEUsOFFpINzR9+spZAuR5r7rUpL9RdL35zo0slNl1bkTeq+jr3yhJZDIdRwHiF+NIDBlbGfhIYBnqg+25J8B+hx3d8+V34DJEfFNcYZxesf8tYcfBoVZ9zx4H6XahXoGk6I6c24CE13K7e5+D1mOBmoRpuy8GwEJC1sXVUM67lPUe2zKmuT/Z+ZZykWExxsu5LLFh7Ei3ClYM73BkYMj5Tk9YaDuqU= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376005)(52116005)(1800799015)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rgwV2vGIZ1si4ugtT5E6o1sn2AYrvnm4JGtPZIMNxbnCT8BoQnu7ncNazRqWSCs5HUq3s6iH13DP/aC8I12UcFJ542y+6ExPCVSBIK1hW4HbsloxA8JDz0zgSqjmujEMUkKpOz6ZuYBSccUMn/Wawp2eVzhhOmK7ipSmX71/X4KUy7SD+X71ZfRPriv89/ijV3xlr9U7EcIT2wGttE5MSWBrrsEMGnSGLzRSNY9ZG+pKri0633dj2at3GrsloUMKmX5ES1NdIX1H7rvlAbFM5haCxAgVZ7tgY5AJ1IgLW7ZbdP0QI1/m1Wwdy55UJdr9Bkkab47Qoo2/+K2wAgyX6BETFaYV47R4A+Optr+HsjAw/bTwUjK7jeeJn2BVW4cT6JxiHJS15HN01NAp5//hSyXNXrWHx6GeiBEbrBp8MlBc/ztHRy+7xeRWTDWMeaYq/tNQ130+92kDvsCawRI06H6sQSnVrElxFqvonWoxxWfI9oxnFk6R5/npHMCtBagwNswsOOAnp0/kXZp1H0eASrHABQFwO+yaojTCip7nnmjaxNqCXJv30yBsBK2iCwB/zlAmC7ewD0HtiJgSxL+clIF6Nw1p1opkRIcAYXa7FMgcVMADzoVGKya0htjomUHJ2HVnEFsK3NLnT8nfX47rw1QOhshGL3z+IpwvaXnfsRMABbVQmPMry4HCV9v4nXsE5C9dvi5Zd0Fkef2ziApJXzzUGMKKNnDmoNGsp4196j7ZXUtwq3ElNo5HdNjWSeD23QjbjWl3DIuBGOi6VAFiTnWyvMdMfpbGS/LpNzpb6YfrNck0vz7piAsJv2YbfrloubXako4UXybEla5mGR6sv1hW3JgbpuIVjYj6NwwFbTBB4R9f8usXTJxeQcLtstCEalCHuFj9TuHjqK58G0p9TLWxDC/gkm8BH6sObpggjq46Rm1TqMoiihVCdSLccMTiNbNkabPE+tNYhatS3u5n6DY2S/LkfULAZSsHigCM8D++frXpbClHGMLLJpkhIkTB1UOJAzpecv+o64Dwsr5xFnGNdq+4iukq3fpa/1N5KiuHeOY+EhpbKLusXa97SF99i/TMI32F1Aa2hHoSdBvhtexxdW8gntPwCFiF8HTlP69xjVG4KUd1oK5MHukNIbR2gRRJ8mLGVCCCekA32LKrs5c/6dWZEfoAKHkhcbluV69MbB/F5sm8uUwLPl7/XlrBJ96/egQTsk3m3vv3Wuu1tECNMQMfM8PP/wzbZd3UzgENuxzvwQN5Y6+tS5ehqusd4dzunZOPVpxPsYOumiFhRDz3yIGn7F+NrVnzyznyH3zZB0RoJICPamE9jBW3ygAKmNPn66wrZuj4OqvBjKO4RITxDc5xFF98RZaZYqso4ZFS6Noe0dY/ce6f3sJYmVQ3/ny3qjkCsuQXIghTh1uilKQOI+FkKIxO0PRBrXICZ3R+jw4VqRJS8xgeP8fK0XtmomPMLeZkCHJH4bXQs6RSEkZnJNWrFll3YXEWpYskvbQi7ZGRV+OvjDc4PaBmEmVvVixHVQGhtF/YKd925nyPWB4QLDUpGwiTPfCQicx+WSPC+PGVTksjJ5PFv7zD8H1E90/4PPBV0ERvrtwUbji0Hw== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 63a77d99-cb00-459f-19cd-08dc43f53a65 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2024 07:06:11.0953 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7Xp4gLxHL/ggmm19EjNFIJ3E83Z8gHNDGt5pKZqV8SZpaEHRmkP2W2N4W37EAbZkKjxI35ppmLMAdlL1CVfcMlgyeSFArjeXD7Up7duTK0g= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR13MB6235 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 CI found there are null pointer dereference in 'nfp_flow_merge_l4()'. Coverity issue: 414942 Fixes: 94438b093702 ("net/nfp: support TCP/UDP/SCTP flow items") Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_net_flow.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfp_net_flow.c b/drivers/net/nfp/nfp_net_flow.c index 251974edb4..ea743eed73 100644 --- a/drivers/net/nfp/nfp_net_flow.c +++ b/drivers/net/nfp/nfp_net_flow.c @@ -349,12 +349,15 @@ nfp_flow_merge_l4(struct rte_flow *nfp_flow, ipv4->src_port = rte_be_to_cpu_16(spec->hdr.src_port); ipv4->dst_port = rte_be_to_cpu_16(spec->hdr.dst_port); - } else { + } else if (ipv6 != NULL) { ipv6->src_port_mask = rte_be_to_cpu_16(mask->hdr.src_port); ipv6->dst_port_mask = rte_be_to_cpu_16(mask->hdr.dst_port); ipv6->src_port = rte_be_to_cpu_16(spec->hdr.src_port); ipv6->dst_port = rte_be_to_cpu_16(spec->hdr.dst_port); + } else { + PMD_DRV_LOG(ERR, "No valid L3 layer pointer."); + return -EINVAL; } return 0; From patchwork Thu Mar 14 07:05:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 138344 X-Patchwork-Delegate: ferruh.yigit@amd.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 305FC43CAB; Thu, 14 Mar 2024 08:06:57 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BF5AB42E8B; Thu, 14 Mar 2024 08:06:17 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2109.outbound.protection.outlook.com [40.107.220.109]) by mails.dpdk.org (Postfix) with ESMTP id 0EA6E42E7D; Thu, 14 Mar 2024 08:06:16 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b4GZazPerowVU27ahTeh1a/b8lnGvq1u2y3baUvXgNRp3OHFotW6sXg6e1AW/AJsSbeYz/qeqUyBirleh9ebiNzU1Gn3M22Wgco8aKYKa5x5koJ+3Xw6tqih9KG6OJaFN8ullExVSw7ax3md0Gi/3WcMFtXAI3RLLrJMKscYEnqdD4r2RlUqEs+5VbaQK1lSbgM6T2jqeCG3482mP2ZKZMP2NHWK1CBSYfdBDQzDZNidVnamxa3AIuZ9dfMhIIVTyty3EM/npEulTXUPntRpZpqjdjyiWYmSpoLYzi4oI5RUW+D9nXSMXMddEqbt/X76EwSc2PEn2iA/+YJdwq+4Zw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=byfzGYTm0KCnIF14nNyHqdujt6PmveJmOG8kEXXL4OI=; b=Lg7QDDCW6Yqood2We7dlapnOzkZXfOIAhIfrJn4QLBudD4TaWpXJvDzl7O7E1jeVXRhS+qjoSooxyw99fgPKOseidN9DjTIm7Z559xsvC9D3AjBjyKefoNv9Z+4F+o8hyo2JJGNQUSLTPTQ6LgfWQ4jV8vyGUqzAvdaFoyALNRkC+ew3Z0159zkHG8EdBcpbQz5c2frIV2t40quqSvoQABq/nqYciYa/edgllYTvc4GGtcEkMVObIbi7P12ygCjNuit70dFO15Bls6oo38n1LRWdINMEOfCvd8/gUBX9/D5CLlklCfPghdbJt2aaKQ/PJEGXtr9ClyoHLOakMD7JQQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=byfzGYTm0KCnIF14nNyHqdujt6PmveJmOG8kEXXL4OI=; b=hQ0LZD9lst04kXGM+mUcOiutGJiqzxBCG98ORfu2gXEQ3oug5rXZlwJM7R4vNsG+1fpxt2nDGJqLK3H0OHotP7+B90jOMyDB3AJyWffWq/fT0FrwnEviQcdtrfUy2FJ7GVoJeTz/GX3YLJy0JhUQlL4m68cqFzI07OtmScjhcKc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by DS0PR13MB6235.namprd13.prod.outlook.com (2603:10b6:8:115::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.21; Thu, 14 Mar 2024 07:06:13 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e%5]) with mapi id 15.20.7362.035; Thu, 14 Mar 2024 07:06:13 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Peng Zhang , stable@dpdk.org, Chaoyong He Subject: [PATCH 7/8] net/nfp: fix dereference after null check Date: Thu, 14 Mar 2024 15:05:35 +0800 Message-Id: <20240314070536.3169210-8-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240314070536.3169210-1-chaoyong.he@corigine.com> References: <20240314070536.3169210-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR06CA0191.apcprd06.prod.outlook.com (2603:1096:4:1::23) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DS0PR13MB6235:EE_ X-MS-Office365-Filtering-Correlation-Id: 40b08fca-952e-48a1-6b61-08dc43f53be9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JoMy1H2ocCjHJBUhkBllouyNHpLJSq48KP2OBcEdRSHQ4ie2+/6ja7+Oxj35d3vF/qWTH/YfeU1Wj1uKs62FDNKX+OV8W2G3ceUW5Q+QVpYCb1/zMtjUXqvYdTB8NNB5LGfutMEDc2itG4Cy+04Q4qtMjNf5LKoeS+CMGViAEFSMKyc06a7enBkvTkcyjih01E/4xVyf5cyyAEEtxsyHWZShLSaj2nC/Mwf529r4Z12AUu+Gh1DQX+AF8qpz2d4sQbaniUUm4cbYzXSr1jQewL6yOi8F3etFUaSte5sMX5rck92sDzMol5zGae1b2Pgswh4g/PyBGkrWuQPw/xlqT70aek2ET/MI61I4syNZKhmDMQ7kDbauKtTB4XfSRzdav8Rc8GBLu00iDWTiMCsdzRkhNoqS7PXe4PiRhQwK5o1tS6nKVvT6nlJH5OBMgL3EnXtrGPC4GKCNjN5VwVPuFeXMlqKVVGz5s1ZCGaYFowURCC5rM09+OYOz0hRPUG1UKzfk8AqXmFtf7iCz7xkx7Z7dax9LFbecyvuw6C42AHvO+PI2xuUcex4MaOlMSTDDCQQDw1dOOFYpoewr1hFuQwZrzl+PCmpwE4zRJpXQwBkmOsoCrawXJiEo5NV1d7EKNe9sADTD7O2w9bXrE9AYQSzhnid7OON3CbC5ozxeINLLXWY0TT47cErWgs2eJvZLxHQQuOxRgMbkaBFaTUBI+DrQI8qUT1hVcW8sUHsDcmI= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376005)(52116005)(1800799015)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dkSLKMTJX8C/ZbQgX/3RZwH5ZuiFLNCW06E4/fk1Ik4Crtl575iIzwR8z3MQWj7gEqPh3iUxJ79+Y5HmLpdTwuysVczZfv2OmdnXJhUJvT87LSqy0p8pbxIEE0OOyYyzxcls7NmcncU86G6J+wjuaYFgNdZWvKmmVyrijmg0dMD7b2hjQBA/gXzijL7TMTfgVdoPaOvR5uX3k3Ols/5eeLkmgNXeRJG94ddhB7tWIxTAxEFfXqrN4gvngiPez7GkfgncvXQNUYuHGRfJF/a2NlUH8KtwCLoOS8SZVCHKzcaQYKFeqO7y7zv1EZJPyXSgGYHyU+7c4iECbBr2FhALW3YMOU0ywgoCVjmLMJm9LIFbfPDfvBfb3XMcpkj1Oqr+El5rC1VmmjgBq59GMNsdw5JSWfTBYeK77lRIQ42KfBTAr0tQ29pFudAV9MtIn/zYeh5CqILUrCbDpnPl6AueSphOObGyVX+zp/f5k2VuX1IFfGiABM8CXxsuHMmVvKIf+NKr2P4SpgbeaVRHMQHoC1D6LU9horwysUURZr70BatkGQZxXoTCVMoEjLbKg3OoFYMpI+qn7jFLN6y598lRZlMi06IumzPsI+yL6BLvu9DCX9sNKhPR2alyLODSfh4SggFprLHvFFJEPVV/4VdTomnFQecogCb9Cj3AT3DdxaumDH2H1Q6pujYaEVpBBTcJzO1dSAuDAmhk8ys8Q42g46HqOS2PUolshcuYBo/vJtMuCOPZbQ6CnTfz6IIH4ofes0KnF0mabGksrxQVyufzHJuQUe5yLnBFZAspq19g/MVlAVoMFLiXNTsn/TjH1NTOmC5xd2EQ92ou+7OBYKRf9RqUcOZhwBgrq55n2TIBeEh/nZ+EcO6sEZ66cZxwB0soxsT9JMXvU/opA0R3rin0+evPY+lofGMFMqr6P0CeKV938ETV7ekn8S7bX8n6DplXTSjsezBeruXdBfcAGfzXBZPbUeIvxRr3Vk6EpbwPquaLv6YLdUHZtjhVo+3gVwoGOlQktm1XYJO12/y9PfYMOfEb8424HI4vgdKkBGo1jrXcRZTFnzAf+tbLuqub2UZcJvHRBvzPf3Ss5YiyN1d1luHc07u3gatmlxK2X3TLwzlb4KuV1pMDuJ2JsbLKDu6vQQIVwoxZzVtfPpGB9Ij7mFfU1P8XBpgj2HXo6Iiol5FvZ+R2x/hYfjK8fqFRWZevEKVOSIMGfTljP3Yss1EgSVbV887mAXRWH6xF+zAdJiCag9PmQNXUxfntwMdzu2U09MbHMNyEyROtGGIEM5xsB7ySoyq/OlaMPqX2iqaEmXa5jR8Y8BYJcJSIngpmX7IJMVOxyzfdvuCdZJoHMz8vvMwtjIMAVXNloDu1a5KKKEsr0E3z8ox3syYqt6A3xQRX5Zohv3GNClgDjaAs/WKUdw87AGvU7sT7GEUSKc4lnGimkqYP/l57DIKRVFqohEUBQdoqlq7ArvWjfnhA863gxmTwb64m6EPVqAJhb8z995+1rhzG8gw3zAnrO8//Kz7p5JDC6/2yhyxlPB8QG6uQb/8fLpg5KWy28kNOyKUwyjcghL0huLov7yvrqdF2VXTD8h6Z4SXLReeSg63ET1S+1g== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 40b08fca-952e-48a1-6b61-08dc43f53be9 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2024 07:06:13.3880 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: /jPqvU+LJVWg2Yyhcxt7dZDR3+zJv2lIuWUhJ/hQCCA6YqYkgMeTS7XrLJGFOo6M3nRirK927CbmRSWZWJoOpsQwGyeEClsWEjjSJT6DMnU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR13MB6235 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: Peng Zhang CI found in the logic of 'nfp_elf_read_first_symtab()' has dereference after null check problem. Coverity issue: 415042 Fixes: c82ca09c441c ("net/nfp: add ELF module") Cc: stable@dpdk.org Signed-off-by: Peng Zhang Reviewed-by: Chaoyong He --- drivers/net/nfp/nfpcore/nfp_elf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfpcore/nfp_elf.c b/drivers/net/nfp/nfpcore/nfp_elf.c index fbd350589b..268cdb1aff 100644 --- a/drivers/net/nfp/nfpcore/nfp_elf.c +++ b/drivers/net/nfp/nfpcore/nfp_elf.c @@ -900,7 +900,8 @@ nfp_elf_read_first_symtab(struct nfp_elf *ectx) uint64_t sh_size; struct nfp_elf_elf64_shdr *sec; - for (idx = 0, sec = ectx->shdrs; idx < ectx->shdrs_cnt; idx++, sec++) { + for (idx = 0; idx < ectx->shdrs_cnt; idx++) { + sec = &ectx->shdrs[idx]; if (sec != NULL) { sh_type = rte_le_to_cpu_32(sec->sh_type); if (sh_type == NFP_ELF_SHT_SYMTAB) @@ -908,6 +909,9 @@ nfp_elf_read_first_symtab(struct nfp_elf *ectx) } } + if (sec == NULL) + return -EINVAL; + sh_size = rte_le_to_cpu_64(sec->sh_size); if (idx < ectx->shdrs_cnt && sh_type == NFP_ELF_SHT_SYMTAB) { From patchwork Thu Mar 14 07:05:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 138345 X-Patchwork-Delegate: ferruh.yigit@amd.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 BAB2A43CAB; Thu, 14 Mar 2024 08:07:05 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 07ECF42E7E; Thu, 14 Mar 2024 08:06:21 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2126.outbound.protection.outlook.com [40.107.220.126]) by mails.dpdk.org (Postfix) with ESMTP id 240CC42E7D; Thu, 14 Mar 2024 08:06:17 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gfsSABRciSeVxNCGuJpzOtvM8GuVyNKfZFpzjC5CQNZshzJlfEYK3uFZMZjhUl8lQOloG7U5e2XGe4WnMNzo4LBO15AE4oNsYrHZO50j7XaYuwtvtnK0IkvNzGMGp0PeQ/YDZKUGwQEJ3CWBeBM0y0IyLVZY85noO79/GAHTUf2VfqJ80pLQy+t+Yp7XuKIFBdRqbZk4m6mGeYiv55/MFC3u7dZAMSNA6Z0d5YOirwLaUh6f8ziWVsieqdXcg0PWcQAWsn1QknwFA2u//xkjoX5xssec7FIn+rNSW1ErrbUWr1NaiL4yxvDn3xg1PwK5zJ5V8Xvdy+S0339s8dZ4FQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=B8MpdmJcXzMA/ImlIk72Mswk1WbFXbFr1kiEOZ2sGys=; b=A5jzBHNRtaF4UerY92xgQM2RSJEzB6UgxB0CGQRzaOtZAF8MHRx2yKblmMIhmA7CvFtE0t0p1vWJ2AMMnfIMzPxpzAQjkh7xRN6v3bQrf997micq0XKT2fUN4W5I91o3f9W7ksSys995EzuYxH9r2QMgBazDXaHVbDaCdEaHeqFRzerfueUZhMAfy3u1eQMVJysFLJS97jcYf11cmqJK9S0HOxGC2/g+JiGYHyq/PrjGpO5S66KRhdQi3TQIuIAvINCVNQqydmjIaALIEK2C3JGZR04Xe47SzJlGls9tqLZFb5o9LQtIZ7/Qqw191+KfRdr+jY6kxtBm6CL7SbRBqg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=B8MpdmJcXzMA/ImlIk72Mswk1WbFXbFr1kiEOZ2sGys=; b=S8pfXnya46xY1P5vm89ESwaSv5mOpcwy5tWX/WQVh0cgP7mA40Otl38Xo39QPlbRfNCLbtZ1UqijF+ZHoCJBFPdTvBO6wkhmG5uyxmGABEXXr/3wS5sPGAH0tOHIcpmzJ6FFlJketsniuD2XUtwv1YPOoBcqgTw1EUYjyVQmmIM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by DS0PR13MB6235.namprd13.prod.outlook.com (2603:10b6:8:115::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.21; Thu, 14 Mar 2024 07:06:15 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e%5]) with mapi id 15.20.7362.035; Thu, 14 Mar 2024 07:06:15 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Peng Zhang , stable@dpdk.org, Chaoyong He Subject: [PATCH 8/8] net/nfp: fix tainted scalar Date: Thu, 14 Mar 2024 15:05:36 +0800 Message-Id: <20240314070536.3169210-9-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240314070536.3169210-1-chaoyong.he@corigine.com> References: <20240314070536.3169210-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR06CA0191.apcprd06.prod.outlook.com (2603:1096:4:1::23) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DS0PR13MB6235:EE_ X-MS-Office365-Filtering-Correlation-Id: bdc251ae-35e9-436a-afc8-08dc43f53d47 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: i1iJpbak2hzwO0x1IZrhleM0ulxMy9bDl2/D9srRX4AudWofXTUFwVqTd5G+con2D0OMhOrB/75YngObEt/9pyZD1KkPXBw0lKbEPMO6hA5vxRLJGyB1YKwD2bB04POxkka3erfZd56buPQIhXS3oHYOWGNdwDhMHSEtptQEviOWeVKBtDt44V9tYTlcycCMzDaOL53aGGcqsg7URd03CHhf4N6eUn/8+hedZwbedaFGXS1bCczfoUEZumq5eO0xNQymGQfhxsrxT4qG5znsRYll/1n3uX0zhYPk6pE9SamjHaNW362cIdvcoQNv66W3A+C9RevPycpJT9+FAVCBfiRGvOHvXqp5Jz6OTalGn24BVrOveKnzLkSa+VBh6OjjANrEjHFvTA8PyyzbHS1EhT+2K1kPd7OPAR6URiviAlRJ2v2SDKxJ6V7sWVE39EE+fClpjhGKZyu1yeL6An4oOzjIDg7Hzx6eFq/K0w3rizdfkMuJcWhtAAiueczl/dgXWBPRuOVeuMXzZpeh0dqnq5kbeEznnhNRZIsXOvl5XD+TjJ+flgm3LXzCTGrkStcb+OC+f3rdVQgvfDwQLm48BbXnGJy8MAacOpODLxUcorHiPCsmJDyXSizTAxnGKZ1ZCdqShzm9LrN9r3JGodQlexUEfcSEgfRn1DrC5W8rudObYrGuEoG6sTGAhRDMbzHWjTf5x/OsKbeKIfVo8aXaRarw//LjvKGiFT6RmsHtxdw= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376005)(52116005)(1800799015)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7JT31gOi+fRaJCxjN9zhkZjVNb77yjbetK0BPeBvZ9ZrLzXjHa/TuPiKPkqqtY7py/AM+hqKy1pIv8U+1cgvwpekzQXAYWrAutGqhIysoZEChYYRrmZOb3jFjeqoO8BqwbYr/0HfNdm1Thh1TXabQb4SPewpDyTLFdZXegQD1IejT1tBgouYXtziKZyx/MKMPTLhP24/dt0zMX9L28goFHCqCu4SRKWAee4Hz0DpQNDH40yzZj+ZnWDgUhDdIUn23eI7pqnQ+3e7t91XOjF6A16dDrywLZB/3QEuBRlNnq6H8ifCNmJhXjN9Q2j0tGRjKpJan9JN0+QAY5VQdwYKfNVGKMLNwN7//53loR5scL8bKCWi6j53KCbY5oERvSpLKB9xBRHejqFliFuSH2hpaGc9t3aDOsNpzonI+lxxiK4ftRW6VazGXUvP9dnqkmwfsDW1wIzxW6xwQv3PU6c7HxRvVCic/VBta9i7HV9cV4FR1RW8k8xupT+ZaOV/74NGqD/pLhSokVWEtkBXu1UCSeV4KYvd0Kv9RBNHE85n4QWPjInmeFRy0N/yt84fO0+3F9RcW/XW7nKXnvV+PmyDQlN5awE6g2ZsTjUFqh2hi9fMZbyrafoOr3SczFHr4Dy6H/eXDkkVqrSZBmE5VWsyUBjP0RN3WLRBd/J7EUthrr73xe7NXtAA6qMrB3QpD2KLJUDoTiODM4+zs77lnly014M0Bj8rpxoFz0XAi1gdQ7/HyW0ajK8FKhjH0RA2IJ4xmj71Ha1FbEAtE57rhL2KUQ8I9Zc4xvMvV8e3lshPBtfnqORIEhr8/4nhA/pjC4uI9TwEXJXfBt6d0IIPQpyDN/XOD1CrJCNlaiXyCBvWf66KurbD4C+VEepVR3MmUKto7KhU9w2Zkfujn1Y4X7t4q6WHPZRAD06TY3FiqOzP13x+GWfGYdpe30moNZoTx42eOaR14GVGN6wkkULl23NLEwnHCcjjr91rR4vKITozW0X6WeNWcaEkeWrek4jj01PjR/7Q0OFDU2N0PTDoA/M/0/d3YaUfSRQyHErRBYToBrfhGtbl/o3FN8Q/ORaYaDl2tR02QpsMyREmJniMyYzG9LbLGqvmxSYg+vY1XbtR5yMTEQX5ljJ8EvW3Gz89L8E6wRPhEFUlBDU1/dNGCkmpTS4USP7r/gbuhkuA6nZcUl4WU8EG0dOGpWjt/vMJGbeMG/yBMEqNfyHw7ZcS/q7ndfu33iZOjjh/xljV1orjwhT5YDtD3bqj5f7AejXOoasZKDZzO3B0wrNCuJKvp/X4RjCUyjbF8CHlESDpvF1q9+f1ZmX2/eshG/ugXTik7fL9G67xL05fo9vgRWxvNeGCjIMm2+qVQcUtQmZfJW7wLoW7az4mKnswVuKe1qRZiYdUsz2M25eweitG1RuzgwauC+cJKNxXnZI+ky2t3Hf30AoKgTAWnkn2/UYhDy0YzS8Vib8bRAg5d+Z6A9HzB+wCgQsOVLpzWNHRdOr6J9SdOMV7vxGtY0/cCTJOgk/NGM81bUuO8D0l+tBi1ZVs5PSaxm0ZsQ7cCkLbMT1uZvpNVQCuazUzstFAavZuYkvwNN1nVSiNAcOWcxbdqUkA/LGdAw== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: bdc251ae-35e9-436a-afc8-08dc43f53d47 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2024 07:06:15.6127 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: m8egX624jOJrnl2l9CNqesrhO3SwrfQFCDviIy4ULfZnk6TKoVCXzOFlJ6vKr+zBoB9j9Pd+9hPS/t+pU6nP6Brq1mPUAihvlWJURLhnhQs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR13MB6235 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: Peng Zhang Passing tainted expression 'ectx->fw_info_strtab_sz' to 'nfp_elf_fwinfo_lookup()', which uses it as a loop boundary. Replace tainted expression with a temp variable to avoid the tainted scalar coverity warning. Coverity issue: 415051 Fixes: c82ca09c441c ("net/nfp: add ELF module") Cc: stable@dpdk.org Signed-off-by: Peng Zhang Reviewed-by: Chaoyong He --- drivers/net/nfp/nfpcore/nfp_elf.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/net/nfp/nfpcore/nfp_elf.c b/drivers/net/nfp/nfpcore/nfp_elf.c index 268cdb1aff..fab9b68801 100644 --- a/drivers/net/nfp/nfpcore/nfp_elf.c +++ b/drivers/net/nfp/nfpcore/nfp_elf.c @@ -324,14 +324,13 @@ nfp_elf_fwinfo_next(struct nfp_elf *ectx, } static const char * -nfp_elf_fwinfo_lookup(struct nfp_elf *ectx, +nfp_elf_fwinfo_lookup(const char *strtab, + ssize_t tab_sz, const char *key) { size_t s_len; const char *s; size_t key_len = strlen(key); - const char *strtab = ectx->fw_info_strtab; - ssize_t tab_sz = (ssize_t)ectx->fw_info_strtab_sz; if (strtab == NULL) return NULL; @@ -610,7 +609,9 @@ nfp_elf_populate_fw_mip(struct nfp_elf *ectx, { uint8_t *pu8; const char *nx; + ssize_t tab_sz; uint64_t sh_size; + const char *str_tab; uint64_t sh_offset; uint32_t first_entry; const struct nfp_mip *mip; @@ -662,7 +663,9 @@ nfp_elf_populate_fw_mip(struct nfp_elf *ectx, } } - ectx->fw_mip.fw_typeid = nfp_elf_fwinfo_lookup(ectx, "TypeId"); + str_tab = ectx->fw_info_strtab; + tab_sz = (ssize_t)ectx->fw_info_strtab_sz; + ectx->fw_mip.fw_typeid = nfp_elf_fwinfo_lookup(str_tab, tab_sz, "TypeId"); /* * TypeId will be the last reserved key-value pair, so skip