From: Ferruh Yigit <ferruh.yigit@intel.com>
To: Pallantla Poornima <pallantlax.poornima@intel.com>,
dev@dpdk.org, ravi1.kumar@amd.com
Cc: reshma.pattan@intel.com, jananeex.m.parthasarathy@intel.com,
stable@dpdk.org
Subject: Re: [dpdk-dev] [dpdk-stable] [PATCH] net/axgbe: fix double unlock coverity issue
Date: Wed, 9 Oct 2019 09:41:42 +0100 [thread overview]
Message-ID: <1c2dc5ac-c0f6-64e9-3040-704b896a212d@intel.com> (raw)
In-Reply-To: <1568890907-10123-1-git-send-email-pallantlax.poornima@intel.com>
On 9/19/2019 12:01 PM, Pallantla Poornima wrote:
> One issue caught by Coverity 340835
> *unlock: axgbe_phy_set_mode unlocks pdata->phy_mutex
> *double_unlock: axgbe_phy_sfp_detect unlocks pdata->phy_mutex
> while it is unlocked.
>
> In axgbe_phy_sfp_detect()/axgbe_phy_set_redrv_mode(),
> axgbe_phy_get_comm_ownership() and axgbe_phy_put_comm_ownership()
> are invoked subsequently.
>
> Currently in axgbe_phy_get_comm_ownership(), during one of the case
> 'phy_data->comm_owned' is not protected and before returning 0,
> lock is not called and unlock is called in axgbe_phy_put_comm_ownership()
> directly which is incorrect.
>
> Ideally, the variable 'phy_data->comm_owned' needs to be protected.
> During success scenario, lock is called in axgbe_phy_get_comm_ownership()
> followed by unlock in axgbe_phy_put_comm_ownership().
> In failure case, unlock is invoked in axgbe_phy_get_comm_ownership()
> itself appropriately.
>
> The fix is to protect 'phy_data->comm_owned' in the identified case
> ensuring locks/unlocks properly exist.
>
> Coverity issue: 340835
> Fixes: a5c7273771 ("net/axgbe: add phy programming APIs")
> Cc: stable@dpdk.org
>
> Signed-off-by: Pallantla Poornima <pallantlax.poornima@intel.com>
lgtm, 'axgbe_phy_put_comm_ownership()' expects 'axgbe_phy_get_comm_ownership()'
gets the lock. Thanks for fixing the coverity issue.
But still, Ravi can you please review/test the patch?
Thanks,
ferruh
> ---
> drivers/net/axgbe/axgbe_phy_impl.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c
> index 973177f69..2267c5f81 100644
> --- a/drivers/net/axgbe/axgbe_phy_impl.c
> +++ b/drivers/net/axgbe/axgbe_phy_impl.c
> @@ -412,15 +412,15 @@ static int axgbe_phy_get_comm_ownership(struct axgbe_port *pdata)
> uint64_t timeout;
> unsigned int mutex_id;
>
> - if (phy_data->comm_owned)
> - return 0;
> -
> /* The I2C and MDIO/GPIO bus is multiplexed between multiple devices,
> * the driver needs to take the software mutex and then the hardware
> * mutexes before being able to use the busses.
> */
> pthread_mutex_lock(&pdata->phy_mutex);
>
> + if (phy_data->comm_owned)
> + return 0;
> +
> /* Clear the mutexes */
> XP_IOWRITE(pdata, XP_I2C_MUTEX, AXGBE_MUTEX_RELEASE);
> XP_IOWRITE(pdata, XP_MDIO_MUTEX, AXGBE_MUTEX_RELEASE);
>
next prev parent reply other threads:[~2019-10-09 8:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-19 11:01 [dpdk-dev] " Pallantla Poornima
2019-09-25 6:03 ` Poornima, PallantlaX
2019-10-09 8:41 ` Ferruh Yigit [this message]
2019-10-18 16:53 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
2019-10-21 8:20 ` Kumar, Ravi1
2019-10-21 9:09 ` Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1c2dc5ac-c0f6-64e9-3040-704b896a212d@intel.com \
--to=ferruh.yigit@intel.com \
--cc=dev@dpdk.org \
--cc=jananeex.m.parthasarathy@intel.com \
--cc=pallantlax.poornima@intel.com \
--cc=ravi1.kumar@amd.com \
--cc=reshma.pattan@intel.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).