Use dev only after it was checked not to be NULL. Fixes: acd4818ea2a45 ("net/pfe: add link status update") Cc: stable@dpdk.org Cc: Gagandeep Singh <g.singh@nxp.com> Signed-off-by: Thierry Herbelot <thierry.herbelot@6wind.com> --- drivers/net/pfe/pfe_ethdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/pfe/pfe_ethdev.c b/drivers/net/pfe/pfe_ethdev.c index 3135466713fb..09048e57d973 100644 --- a/drivers/net/pfe/pfe_ethdev.c +++ b/drivers/net/pfe/pfe_ethdev.c @@ -578,7 +578,7 @@ static int pfe_eth_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused) { int ret, ioctl_cmd = 0; - struct pfe_eth_priv_s *priv = dev->data->dev_private; + struct pfe_eth_priv_s *priv; struct rte_eth_link link, old; unsigned int lstatus = 1; @@ -586,6 +586,7 @@ pfe_eth_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused) PFE_PMD_ERR("Invalid device in link_update.\n"); return 0; } + priv = dev->data->dev_private; memset(&old, 0, sizeof(old)); memset(&link, 0, sizeof(struct rte_eth_link)); -- 2.29.2
> -----Original Message----- > From: Thierry Herbelot <thierry.herbelot@6wind.com> > Sent: Monday, May 24, 2021 2:29 PM > To: dev@dpdk.org > Cc: Thierry Herbelot <thierry.herbelot@6wind.com>; Thomas Monjalon > <thomas@monjalon.net>; stable@dpdk.org; Gagandeep Singh > <G.Singh@nxp.com> > Subject: [PATCH] net/pfe: do not use a possibly NULL Pointer > > Use dev only after it was checked not to be NULL. > > Fixes: acd4818ea2a45 ("net/pfe: add link status update") > Cc: stable@dpdk.org > Cc: Gagandeep Singh <g.singh@nxp.com> > > Signed-off-by: Thierry Herbelot <thierry.herbelot@6wind.com> > --- > drivers/net/pfe/pfe_ethdev.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/pfe/pfe_ethdev.c b/drivers/net/pfe/pfe_ethdev.c > index 3135466713fb..09048e57d973 100644 > --- a/drivers/net/pfe/pfe_ethdev.c > +++ b/drivers/net/pfe/pfe_ethdev.c > @@ -578,7 +578,7 @@ static int > pfe_eth_link_update(struct rte_eth_dev *dev, int wait_to_complete > __rte_unused) > { > int ret, ioctl_cmd = 0; > - struct pfe_eth_priv_s *priv = dev->data->dev_private; > + struct pfe_eth_priv_s *priv; > struct rte_eth_link link, old; > unsigned int lstatus = 1; > > @@ -586,6 +586,7 @@ pfe_eth_link_update(struct rte_eth_dev *dev, int > wait_to_complete __rte_unused) > PFE_PMD_ERR("Invalid device in link_update.\n"); > return 0; > } > + priv = dev->data->dev_private; "dev" will never be NULL here because librte_ethdev library is already doing some checks on dev before calling the link update. So please remove the if check. > > memset(&old, 0, sizeof(old)); > memset(&link, 0, sizeof(struct rte_eth_link)); > -- > 2.29.2
librte_ethdev library is already doing some checks on dev before calling the link update. Fixes: acd4818ea2a45 ("net/pfe: add link status update") Cc: stable@dpdk.org Cc: Gagandeep Singh <g.singh@nxp.com> Signed-off-by: Thierry Herbelot <thierry.herbelot@6wind.com> -- V2: rework after noting dev cannot be NULL --- drivers/net/pfe/pfe_ethdev.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/net/pfe/pfe_ethdev.c b/drivers/net/pfe/pfe_ethdev.c index 3135466713fb..feec4d10a26e 100644 --- a/drivers/net/pfe/pfe_ethdev.c +++ b/drivers/net/pfe/pfe_ethdev.c @@ -582,11 +582,6 @@ pfe_eth_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused) struct rte_eth_link link, old; unsigned int lstatus = 1; - if (dev == NULL) { - PFE_PMD_ERR("Invalid device in link_update.\n"); - return 0; - } - memset(&old, 0, sizeof(old)); memset(&link, 0, sizeof(struct rte_eth_link)); -- 2.29.2
> -----Original Message----- > From: Thierry Herbelot <thierry.herbelot@6wind.com> > Sent: Monday, May 24, 2021 3:08 PM > To: dev@dpdk.org > Cc: Thierry Herbelot <thierry.herbelot@6wind.com>; Thomas Monjalon > <thomas@monjalon.net>; stable@dpdk.org; Gagandeep Singh > <G.Singh@nxp.com> > Subject: [PATCH v2] net/pfe: no need to check dev to be NULL Pointer > > librte_ethdev library is already doing some checks on dev before calling > the link update. > > Fixes: acd4818ea2a45 ("net/pfe: add link status update") > Cc: stable@dpdk.org > Cc: Gagandeep Singh <g.singh@nxp.com> > > Signed-off-by: Thierry Herbelot <thierry.herbelot@6wind.com> > -- > V2: rework after noting dev cannot be NULL > --- Acked-by: Gagandeep Singh <G.singh@nxp.com> > drivers/net/pfe/pfe_ethdev.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/drivers/net/pfe/pfe_ethdev.c b/drivers/net/pfe/pfe_ethdev.c > index 3135466713fb..feec4d10a26e 100644 > --- a/drivers/net/pfe/pfe_ethdev.c > +++ b/drivers/net/pfe/pfe_ethdev.c > @@ -582,11 +582,6 @@ pfe_eth_link_update(struct rte_eth_dev *dev, int > wait_to_complete __rte_unused) > struct rte_eth_link link, old; > unsigned int lstatus = 1; > > - if (dev == NULL) { > - PFE_PMD_ERR("Invalid device in link_update.\n"); > - return 0; > - } > - > memset(&old, 0, sizeof(old)); > memset(&link, 0, sizeof(struct rte_eth_link)); > > -- > 2.29.2
On 5/24/21 1:28 PM, Gagandeep Singh wrote:
>
>
>> -----Original Message-----
>> From: Thierry Herbelot <thierry.herbelot@6wind.com>
>> Sent: Monday, May 24, 2021 3:08 PM
>> To: dev@dpdk.org
>> Cc: Thierry Herbelot <thierry.herbelot@6wind.com>; Thomas Monjalon
>> <thomas@monjalon.net>; stable@dpdk.org; Gagandeep Singh
>> <G.Singh@nxp.com>
>> Subject: [PATCH v2] net/pfe: no need to check dev to be NULL Pointer
>>
>> librte_ethdev library is already doing some checks on dev before calling
>> the link update.
>>
>> Fixes: acd4818ea2a45 ("net/pfe: add link status update")
>> Cc: stable@dpdk.org
>> Cc: Gagandeep Singh <g.singh@nxp.com>
>>
>> Signed-off-by: Thierry Herbelot <thierry.herbelot@6wind.com>
>> --
>> V2: rework after noting dev cannot be NULL
>> ---
>
> Acked-by: Gagandeep Singh <G.singh@nxp.com>
Applied, thanks.