[dpdk-dev] [PATCH v2] net/axgbe: fix potential unreleased lock problem in axgbe_i2c_xfer

[dpdk-dev] [PATCH v2] net/axgbe: fix potential unreleased lock problem in axgbe_i2c_xfer

[Chengfeng Ye]

The lock pdata->i2c_mutex is not released if the function return in
these two patched branches, which may lead to deadlock problem if
this lock is acquired again.

Cc: cyeaa@connect.ust.hk
Bugzilla ID: 777

Signed-off-by: Chengfeng Ye <cyeaa@connect.ust.hk>
---
 drivers/net/axgbe/axgbe_i2c.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/axgbe/axgbe_i2c.c b/drivers/net/axgbe/axgbe_i2c.c
index ab3738a12e..a2798f484e 100644
--- a/drivers/net/axgbe/axgbe_i2c.c
+++ b/drivers/net/axgbe/axgbe_i2c.c
@@ -233,6 +233,7 @@ static int axgbe_i2c_xfer(struct axgbe_port *pdata, struct axgbe_i2c_op *op)
 	ret = axgbe_i2c_disable(pdata);
 	if (ret) {
 		PMD_DRV_LOG(ERR, "failed to disable i2c master\n");
+		pthread_mutex_unlock(&pdata->i2c_mutex);
 		return ret;
 	}
 
@@ -249,6 +250,7 @@ static int axgbe_i2c_xfer(struct axgbe_port *pdata, struct axgbe_i2c_op *op)
 	ret = axgbe_i2c_enable(pdata);
 	if (ret) {
 		PMD_DRV_LOG(ERR, "failed to enable i2c master\n");
+		pthread_mutex_unlock(&pdata->i2c_mutex);
 		return ret;
 	}
 
-- 
2.17.1

Re: [dpdk-dev] [PATCH v2] net/axgbe: fix potential unreleased lock problem in axgbe_i2c_xfer

[Ferruh Yigit]

On 8/26/2021 7:55 PM, Chengfeng Ye wrote:
> The lock pdata->i2c_mutex is not released if the function return in
> these two patched branches, which may lead to deadlock problem if
> this lock is acquired again.
> 
> Cc: cyeaa@connect.ust.hk
> Bugzilla ID: 777
> 
> Signed-off-by: Chengfeng Ye <cyeaa@connect.ust.hk>

Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>

    Bugzilla ID: 777
    Fixes: 4ac7516b8b39 ("net/axgbe: add phy init and related APIs")
    Cc: stable@dpdk.org

Patch title updated as following while merging:
net/axgbe: fix unreleased lock in I2C transfer


Applied to dpdk-next-net/main, thanks.