[v1,1/2] raw/ifpga/base: unlock mutex when nios init fail

Message ID 1604540969-5503-2-git-send-email-wei.huang@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Qi Zhang
Headers
Series Fix defects found by coverity scan |

Checks

Context Check Description
ci/checkpatch warning coding style issues

Commit Message

Wei Huang Nov. 5, 2020, 1:49 a.m. UTC
  In fme_nios_spi_init(), a mutex is locked for protecting nios
initialization process, the mutex is only unlocked when process
is successful, it should also be unlocked when process fail.

Fixes: e41856b515ce ("raw/ifpga/base: enhance driver reliability in multi-process")
Coverity issue: 363751

Signed-off-by: Wei Huang <wei.huang@intel.com>
---
 drivers/raw/ifpga/base/ifpga_fme.c | 2 ++
 1 file changed, 2 insertions(+)
  

Comments

Zhang, Tianfei Nov. 5, 2020, 9:33 a.m. UTC | #1
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Wei Huang
> Sent: 2020年11月5日 9:49
> To: dev@dpdk.org; Xu, Rosen <rosen.xu@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>
> Cc: stable@dpdk.org; Huang, Wei <wei.huang@intel.com>
> Subject: [dpdk-dev] [PATCH v1 1/2] raw/ifpga/base: unlock mutex when nios
> init fail
> 
> In fme_nios_spi_init(), a mutex is locked for protecting nios initialization
> process, the mutex is only unlocked when process is successful, it should also
> be unlocked when process fail.
> 
> Fixes: e41856b515ce ("raw/ifpga/base: enhance driver reliability in
> multi-process") Coverity issue: 363751
> 
> Signed-off-by: Wei Huang <wei.huang@intel.com>
> ---
>  drivers/raw/ifpga/base/ifpga_fme.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/raw/ifpga/base/ifpga_fme.c
> b/drivers/raw/ifpga/base/ifpga_fme.c
> index 540bb1110..f29ff3159 100644
> --- a/drivers/raw/ifpga/base/ifpga_fme.c
> +++ b/drivers/raw/ifpga/base/ifpga_fme.c
> @@ -1115,6 +1115,8 @@ static int fme_nios_spi_init(struct ifpga_feature
> *feature)
>  	ret = nios_spi_wait_init_done(spi_master);
>  	if (ret != 0) {
>  		dev_err(fme, "FME NIOS_SPI init fail\n");
> +		if (spi_master->mutex)
> +			pthread_mutex_unlock(spi_master->mutex);
>  		goto release_dev;
>  	}
> 
Acked-by: Tianfei zhang <tianfei.zhang@intel.com>

> --
> 2.29.2
  

Patch

diff --git a/drivers/raw/ifpga/base/ifpga_fme.c b/drivers/raw/ifpga/base/ifpga_fme.c
index 540bb1110..f29ff3159 100644
--- a/drivers/raw/ifpga/base/ifpga_fme.c
+++ b/drivers/raw/ifpga/base/ifpga_fme.c
@@ -1115,6 +1115,8 @@  static int fme_nios_spi_init(struct ifpga_feature *feature)
 	ret = nios_spi_wait_init_done(spi_master);
 	if (ret != 0) {
 		dev_err(fme, "FME NIOS_SPI init fail\n");
+		if (spi_master->mutex)
+			pthread_mutex_unlock(spi_master->mutex);
 		goto release_dev;
 	}