[v1,2/2] raw/ifpga: fix logically dead code

Message ID 20190604135148.21791-2-tianfei.zhang@intel.com (mailing list archive)
State Superseded, archived
Headers
Series [v1,1/2] raw/ifpga: fix use of untrusted scalar value |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Zhang, Tianfei June 4, 2019, 1:51 p.m. UTC
  add temporary variable in max10_reg_write().

Coverity issue: 337927
Cc: stable@dpdk.org

Signed-off-by: Zhang, Tianfei <tianfei.zhang@intel.com>
---
 drivers/raw/ifpga_rawdev/base/opae_intel_max10.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
  

Comments

Xiaolong Ye June 4, 2019, 7:26 a.m. UTC | #1
On 06/04, Zhang, Tianfei wrote:
>add temporary variable in max10_reg_write().
>
>Coverity issue: 337927
>Cc: stable@dpdk.org

Missing a Fixes line?

>
>Signed-off-by: Zhang, Tianfei <tianfei.zhang@intel.com>
>---
> drivers/raw/ifpga_rawdev/base/opae_intel_max10.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/raw/ifpga_rawdev/base/opae_intel_max10.c b/drivers/raw/ifpga_rawdev/base/opae_intel_max10.c
>index f354ee4b6..3ff6575d7 100644
>--- a/drivers/raw/ifpga_rawdev/base/opae_intel_max10.c
>+++ b/drivers/raw/ifpga_rawdev/base/opae_intel_max10.c
>@@ -17,11 +17,13 @@ int max10_reg_read(unsigned int reg, unsigned int *val)
> 
> int max10_reg_write(unsigned int reg, unsigned int val)
> {
>+	unsigned int tmp = val;
>+
> 	if (!g_max10)
> 		return -ENODEV;
> 
> 	return spi_transaction_write(g_max10->spi_tran_dev,
>-			reg, 4, (unsigned char *)&val);
>+			reg, 4, (unsigned char *)&tmp);
> }
> 
> struct intel_max10_device *
>@@ -57,7 +59,7 @@ intel_max10_device_probe(struct altera_spi_device *spi,
> 
> 	/* set PKVL Polling manually in BBS */
> 	ret = max10_reg_write(PKVL_POLLING_CTRL, 0x3);
>-	if (ret) {
>+	if (ret != 0) {
> 		dev_err(dev, "%s set PKVL polling fail\n", __func__);
> 		goto spi_tran_fail;
> 	}
>-- 
>2.17.1
>
  
John McNamara June 4, 2019, 9:06 a.m. UTC | #2
> -----Original Message-----
> From: stable [mailto:stable-bounces@dpdk.org] On Behalf Of Ye Xiaolong
> Sent: Tuesday, June 4, 2019 8:27 AM
> To: Zhang, Tianfei <tianfei.zhang@intel.com>
> Cc: dev@dpdk.org; Xu, Rosen <rosen.xu@intel.com>; stable@dpdk.org;
> Zhang@dpdk.org
> Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH v1 2/2] raw/ifpga: fix
> logically dead code
> 
> On 06/04, Zhang, Tianfei wrote:
> >add temporary variable in max10_reg_write().
> >
> >Coverity issue: 337927
> >Cc: stable@dpdk.org
> 
> Missing a Fixes line?
> 

In this case it would be:


    Fixes: 96ebfcf8125c ("raw/ifpga/base: add SPI and MAX10 device driver")
    Coverity issue: 337927

John
  

Patch

diff --git a/drivers/raw/ifpga_rawdev/base/opae_intel_max10.c b/drivers/raw/ifpga_rawdev/base/opae_intel_max10.c
index f354ee4b6..3ff6575d7 100644
--- a/drivers/raw/ifpga_rawdev/base/opae_intel_max10.c
+++ b/drivers/raw/ifpga_rawdev/base/opae_intel_max10.c
@@ -17,11 +17,13 @@  int max10_reg_read(unsigned int reg, unsigned int *val)
 
 int max10_reg_write(unsigned int reg, unsigned int val)
 {
+	unsigned int tmp = val;
+
 	if (!g_max10)
 		return -ENODEV;
 
 	return spi_transaction_write(g_max10->spi_tran_dev,
-			reg, 4, (unsigned char *)&val);
+			reg, 4, (unsigned char *)&tmp);
 }
 
 struct intel_max10_device *
@@ -57,7 +59,7 @@  intel_max10_device_probe(struct altera_spi_device *spi,
 
 	/* set PKVL Polling manually in BBS */
 	ret = max10_reg_write(PKVL_POLLING_CTRL, 0x3);
-	if (ret) {
+	if (ret != 0) {
 		dev_err(dev, "%s set PKVL polling fail\n", __func__);
 		goto spi_tran_fail;
 	}