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 3CEDCA0A02 for ; Fri, 23 Apr 2021 03:50:00 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2E54941CF8; Fri, 23 Apr 2021 03:50:00 +0200 (CEST) Received: from smtpbgau1.qq.com (smtpbgau1.qq.com [54.206.16.166]) by mails.dpdk.org (Postfix) with ESMTP id 1214141CF8 for ; Fri, 23 Apr 2021 03:49:57 +0200 (CEST) X-QQ-mid: bizesmtp29t1619142583t3a03n5q Received: from jiawenwu (unknown [183.129.236.74]) by esmtp6.qq.com (ESMTP) with id ; Fri, 23 Apr 2021 09:49:40 +0800 (CST) X-QQ-SSF: 01400000002000D0F000B00A0000000 X-QQ-FEAT: gJOPO5V2d0uxPIdGNiyZjZMtykSbVX7sU15+ysWRQhXExUwgVR5leTZIgC2bl 3DgsBwlt27XLtZQLccZe/clVYHEjER4ieTx5gXxyT676DZNYmCABo5TPPLT33DpYk7f2HXF F4b+KVFJqzrFa7PentlMqjQX5AoG/SkyfyHW/ag17b4+9Ffu+KBCZLKQPjiHswz4f7t2XKp BbB9ofZ6zesD0HxN6Ilx8vpLG80H34/FbSQkoTjh33B5OowenI5aEbv7tao+LR71KFJQTEQ MmuYgPyv3gYi+M+pteoBDz46rDLZmEtVdc3sCqgloIf4myRryeGDnpF3tv4nshGGkWJsoTE xgOa55DyfsjR/1vuCM= X-QQ-GoodBg: 2 From: "Jiawen Wu" To: "'Ferruh Yigit'" , "'Igor Russkikh'" , "'Pavel Belous'" , "'Somalapuram Amaranath'" , "'Ajit Khaparde'" , "'Somnath Kotur'" , "'Hemant Agrawal'" , "'Sachin Saxena'" , "'Jeff Guo'" , "'Haiyue Wang'" , "'John Daley'" , "'Hyong Youb Kim'" , "'Min Hu \(Connor\)'" , "'Yisen Zhuang'" , "'Lijun Ou'" , "'Beilei Xing'" , "'Qiming Yang'" , "'Qi Zhang'" , "'Andrew Boyer'" , "'Jerin Jacob'" , "'Nithin Dabilpuram'" , "'Kiran Kumar K'" , "'Rasesh Mody'" , "'Devendra Singh Rawat'" , "'Andrew Rybchenko'" , "'Jian Wang'" , "'Thomas Monjalon'" , "'Selwin Sebastian'" , "'Remy Horton'" , "'Chunsong Feng'" , "'Huisong Li'" , "'Hao Chen'" , "'Wei Hu \(Xavier\)'" , "'Jingjing Wu'" , "'Wenzhuo Lu'" , "'Xiaoyun Li'" , "'Alvin Zhang'" , "'Shannon Nelson'" , "'Alfredo Cardigliano'" , "'Vamsi Attunuru'" , "'Yash Sharma'" , "'Ivan Malov'" , "'Andrew Lee'" Cc: , References: <20210421162058.1352960-1-ferruh.yigit@intel.com> In-Reply-To: <20210421162058.1352960-1-ferruh.yigit@intel.com> Date: Fri, 23 Apr 2021 09:49:40 +0800 Message-ID: <006401d737e2$ee9c5b80$cbd51280$@trustnetic.com>+1C7B84008617094A MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQGguxWAjFmndASyDfnLKenmjz9/H6suTblg Content-Language: zh-cn X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:trustnetic.com:qybgforeign:qybgforeign6 X-QQ-Bgrelay: 1 Subject: Re: [dpdk-stable] [PATCH] drivers/net: fix FW version get 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" On April 22, 2021 12:21 AM, Ferruh Yigit wrote: > Fixes a few different things: > * Remove 'fw_version' NULL checks, it is allowed if the 'fw_size' is > zero, 'fw_version' being NULL but 'fw_size' not zero condition checked > in ethdev layer > * Be sure required buffer size is returned if provided one is not big > enough, instead of returning success (0) > * Document in doxygen comment the '-EINVAL' is a valid return type > * Take into account that 'snprintf' can return negative value > * Cast length to 'size_t' to compare it with 'fw_size' > > Fixes: bb42aa9ffe4e ("net/atlantic: configure device start/stop") > Fixes: ff70acdf4299 ("net/axgbe: support reading FW version") > Fixes: e2652b0a20a0 ("net/bnxt: support get FW version") > Fixes: cf0fab1d2ca5 ("net/dpaa: support firmware version get API") > Fixes: 748eccb97cdc ("net/dpaa2: add support for firmware version get") > Fixes: b883c0644a24 ("net/e1000: add firmware version get") > Fixes: 293430677e9c ("net/enic: add handler to return firmware version") > Fixes: 1f5ca0b460cd ("net/hns3: support some device operations") > Fixes: bd5b86732bc7 ("net/hns3: modify format for firmware version") > Fixes: ed0dfdd0e976 ("net/i40e: add firmware version get") > Fixes: e31cb9a36298 ("net/ice: support FW version getting") > Fixes: 4f09bc55ac3d ("net/igc: implement device base operations") > Fixes: eec10fb0ce6b ("net/ionic: support FW version") > Fixes: 8b0b56574269 ("net/ixgbe: add firmware version get") > Fixes: 4d9f5b8adc02 ("net/octeontx2: add FW version get operation") > Fixes: f97b56f9f12e ("net/qede: support FW version query") > Fixes: 83fef46a22b2 ("net/sfc: add callback to retrieve FW version") > Fixes: bc84ac0fadef ("net/txgbe: support getting FW version") > Fixes: 21913471202f ("ethdev: add firmware version get") > Cc: stable@dpdk.org > > Signed-off-by: Ferruh Yigit <...> > diff --git a/drivers/net/txgbe/txgbe_ethdev.c > b/drivers/net/txgbe/txgbe_ethdev.c > index 97796f040b43..8dbe3da5c2c9 100644 > --- a/drivers/net/txgbe/txgbe_ethdev.c > +++ b/drivers/net/txgbe/txgbe_ethdev.c > @@ -2582,9 +2582,11 @@ txgbe_fw_version_get(struct rte_eth_dev *dev, > char *fw_version, size_t fw_size) > hw->phy.get_fw_version(hw, &etrack_id); > > ret = snprintf(fw_version, fw_size, "0x%08x", etrack_id); > + if (ret < 0) > + return -EINVAL; > > ret += 1; /* add the size of '\0' */ > - if (fw_size < (u32)ret) > + if (fw_size < (size_t)ret) > return ret; > else > return 0; For txgbe, Acked-by: Jiawen Wu