* [PATCH] raw/ifpga/base: check pointer before dereference
@ 2022-06-23 3:11 Wei Huang
2022-06-23 5:51 ` Zhang, Tianfei
2022-06-23 6:25 ` Xu, Rosen
0 siblings, 2 replies; 4+ messages in thread
From: Wei Huang @ 2022-06-23 3:11 UTC (permalink / raw)
To: dev, thomas, nipun.gupta, hemant.agrawal
Cc: stable, rosen.xu, tianfei.zhang, qi.z.zhang, Wei Huang
Do null-checking on hw->adapter in fme_pmci_init() before dereference it.
Coverity issue: 379202
Fixes: ca6eb0f7c836 ("raw/ifpga/base: add PMCI base driver")
Signed-off-by: Wei Huang <wei.huang@intel.com>
---
drivers/raw/ifpga/base/ifpga_fme.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/raw/ifpga/base/ifpga_fme.c b/drivers/raw/ifpga/base/ifpga_fme.c
index 25ff819..b6dd4ce 100644
--- a/drivers/raw/ifpga/base/ifpga_fme.c
+++ b/drivers/raw/ifpga/base/ifpga_fme.c
@@ -1591,7 +1591,7 @@ static int fme_pmci_init(struct ifpga_feature *feature)
int ret = 0;
hw = fme->parent;
- if (!hw)
+ if (!hw || !hw->adapter)
return -ENODEV;
mgr = hw->adapter->mgr;
@@ -1608,7 +1608,7 @@ static int fme_pmci_init(struct ifpga_feature *feature)
max10->type = M10_N6000;
max10->mmio = feature->addr;
- if (hw->adapter && hw->adapter->shm.ptr) {
+ if (hw->adapter->shm.ptr) {
sd = (opae_share_data *)hw->adapter->shm.ptr;
max10->bmc_ops.mutex = &sd->spi_mutex;
} else {
--
1.8.3.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH] raw/ifpga/base: check pointer before dereference
2022-06-23 3:11 [PATCH] raw/ifpga/base: check pointer before dereference Wei Huang
@ 2022-06-23 5:51 ` Zhang, Tianfei
2022-06-26 10:21 ` Thomas Monjalon
2022-06-23 6:25 ` Xu, Rosen
1 sibling, 1 reply; 4+ messages in thread
From: Zhang, Tianfei @ 2022-06-23 5:51 UTC (permalink / raw)
To: Huang, Wei, dev, thomas, nipun.gupta, hemant.agrawal
Cc: stable, Xu, Rosen, Zhang, Qi Z
> -----Original Message-----
> From: Huang, Wei <wei.huang@intel.com>
> Sent: Thursday, June 23, 2022 11:12 AM
> To: dev@dpdk.org; thomas@monjalon.net; nipun.gupta@nxp.com;
> hemant.agrawal@nxp.com
> Cc: stable@dpdk.org; Xu, Rosen <rosen.xu@intel.com>; Zhang, Tianfei
> <tianfei.zhang@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>; Huang, Wei
> <wei.huang@intel.com>
> Subject: [PATCH] raw/ifpga/base: check pointer before dereference
>
> Do null-checking on hw->adapter in fme_pmci_init() before dereference it.
>
> Coverity issue: 379202
> Fixes: ca6eb0f7c836 ("raw/ifpga/base: add PMCI base driver")
>
> Signed-off-by: Wei Huang <wei.huang@intel.com>
> ---
> drivers/raw/ifpga/base/ifpga_fme.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/raw/ifpga/base/ifpga_fme.c
> b/drivers/raw/ifpga/base/ifpga_fme.c
> index 25ff819..b6dd4ce 100644
> --- a/drivers/raw/ifpga/base/ifpga_fme.c
> +++ b/drivers/raw/ifpga/base/ifpga_fme.c
> @@ -1591,7 +1591,7 @@ static int fme_pmci_init(struct ifpga_feature
> *feature)
> int ret = 0;
>
> hw = fme->parent;
> - if (!hw)
> + if (!hw || !hw->adapter)
> return -ENODEV;
>
> mgr = hw->adapter->mgr;
> @@ -1608,7 +1608,7 @@ static int fme_pmci_init(struct ifpga_feature
> *feature)
>
> max10->type = M10_N6000;
> max10->mmio = feature->addr;
> - if (hw->adapter && hw->adapter->shm.ptr) {
> + if (hw->adapter->shm.ptr) {
> sd = (opae_share_data *)hw->adapter->shm.ptr;
> max10->bmc_ops.mutex = &sd->spi_mutex;
> } else {
> --
> 1.8.3.1
It looks good for me.
Acked-by: Tianfei Zhang <tianfei.zhang@intel.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH] raw/ifpga/base: check pointer before dereference
2022-06-23 3:11 [PATCH] raw/ifpga/base: check pointer before dereference Wei Huang
2022-06-23 5:51 ` Zhang, Tianfei
@ 2022-06-23 6:25 ` Xu, Rosen
1 sibling, 0 replies; 4+ messages in thread
From: Xu, Rosen @ 2022-06-23 6:25 UTC (permalink / raw)
To: Huang, Wei, dev, thomas, nipun.gupta, hemant.agrawal
Cc: stable, Zhang, Tianfei, Zhang, Qi Z
Hi,
> -----Original Message-----
> From: Huang, Wei <wei.huang@intel.com>
> Sent: Thursday, June 23, 2022 11:12
> To: dev@dpdk.org; thomas@monjalon.net; nipun.gupta@nxp.com;
> hemant.agrawal@nxp.com
> Cc: stable@dpdk.org; Xu, Rosen <rosen.xu@intel.com>; Zhang, Tianfei
> <tianfei.zhang@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>; Huang, Wei
> <wei.huang@intel.com>
> Subject: [PATCH] raw/ifpga/base: check pointer before dereference
>
> Do null-checking on hw->adapter in fme_pmci_init() before dereference it.
>
> Coverity issue: 379202
> Fixes: ca6eb0f7c836 ("raw/ifpga/base: add PMCI base driver")
>
> Signed-off-by: Wei Huang <wei.huang@intel.com>
> ---
> drivers/raw/ifpga/base/ifpga_fme.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/raw/ifpga/base/ifpga_fme.c
> b/drivers/raw/ifpga/base/ifpga_fme.c
> index 25ff819..b6dd4ce 100644
> --- a/drivers/raw/ifpga/base/ifpga_fme.c
> +++ b/drivers/raw/ifpga/base/ifpga_fme.c
> @@ -1591,7 +1591,7 @@ static int fme_pmci_init(struct ifpga_feature
> *feature)
> int ret = 0;
>
> hw = fme->parent;
> - if (!hw)
> + if (!hw || !hw->adapter)
> return -ENODEV;
>
> mgr = hw->adapter->mgr;
> @@ -1608,7 +1608,7 @@ static int fme_pmci_init(struct ifpga_feature
> *feature)
>
> max10->type = M10_N6000;
> max10->mmio = feature->addr;
> - if (hw->adapter && hw->adapter->shm.ptr) {
> + if (hw->adapter->shm.ptr) {
> sd = (opae_share_data *)hw->adapter->shm.ptr;
> max10->bmc_ops.mutex = &sd->spi_mutex;
> } else {
> --
> 1.8.3.1
Acked-by: Rosen Xu <rosen.xu@intel.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] raw/ifpga/base: check pointer before dereference
2022-06-23 5:51 ` Zhang, Tianfei
@ 2022-06-26 10:21 ` Thomas Monjalon
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Monjalon @ 2022-06-26 10:21 UTC (permalink / raw)
To: Huang, Wei
Cc: dev, nipun.gupta, hemant.agrawal, stable, stable, Xu, Rosen,
Zhang, Qi Z, Zhang, Tianfei
> > Do null-checking on hw->adapter in fme_pmci_init() before dereference it.
> >
> > Coverity issue: 379202
> > Fixes: ca6eb0f7c836 ("raw/ifpga/base: add PMCI base driver")
> >
> > Signed-off-by: Wei Huang <wei.huang@intel.com>
>
> It looks good for me.
>
> Acked-by: Tianfei Zhang <tianfei.zhang@intel.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-06-26 10:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-23 3:11 [PATCH] raw/ifpga/base: check pointer before dereference Wei Huang
2022-06-23 5:51 ` Zhang, Tianfei
2022-06-26 10:21 ` Thomas Monjalon
2022-06-23 6:25 ` Xu, Rosen
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).