patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Wei Huang <wei.huang@intel.com>
To: dev@dpdk.org, rosen.xu@intel.com, qi.z.zhang@intel.com
Cc: stable@dpdk.org, Wei Huang <wei.huang@intel.com>
Subject: [dpdk-stable] [PATCH v2 2/2] raw/ifpga/base: check pointer adapter before dereference
Date: Wed,  4 Nov 2020 21:05:40 -0500	[thread overview]
Message-ID: <1604541940-5994-3-git-send-email-wei.huang@intel.com> (raw)
In-Reply-To: <1604541940-5994-1-git-send-email-wei.huang@intel.com>

In opae_adapter_destroy(), pointer "adapter" is not validated before
passing it to opae_adapter_shm_free() and opae_adapter_mutex_close()
which dereference it.

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

Signed-off-by: Wei Huang <wei.huang@intel.com>
---
v2: fix typo in commit log
---
 drivers/raw/ifpga/base/opae_hw_api.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/raw/ifpga/base/opae_hw_api.c b/drivers/raw/ifpga/base/opae_hw_api.c
index 600afdea1..d5cd5fe60 100644
--- a/drivers/raw/ifpga/base/opae_hw_api.c
+++ b/drivers/raw/ifpga/base/opae_hw_api.c
@@ -605,10 +605,12 @@ int opae_adapter_enumerate(struct opae_adapter *adapter)
  */
 void opae_adapter_destroy(struct opae_adapter *adapter)
 {
-	if (adapter && adapter->ops && adapter->ops->destroy)
-		adapter->ops->destroy(adapter);
-	opae_adapter_shm_free(adapter);
-	opae_adapter_mutex_close(adapter);
+	if (adapter) {
+		if (adapter->ops && adapter->ops->destroy)
+			adapter->ops->destroy(adapter);
+		opae_adapter_shm_free(adapter);
+		opae_adapter_mutex_close(adapter);
+	}
 }
 
 /**
-- 
2.29.2


  parent reply	other threads:[~2020-11-05  3:06 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-05  2:05 [dpdk-stable] [PATCH v2 0/2] raw/ifpga/base: fix defects found by coverity scan Wei Huang
2020-11-05  2:05 ` [dpdk-stable] [PATCH v2 1/2] raw/ifpga/base: unlock mutex when nios init fail Wei Huang
2020-11-05 11:32   ` Xu, Rosen
2020-11-05  2:05 ` Wei Huang [this message]
2020-11-05 11:32   ` [dpdk-stable] [PATCH v2 2/2] raw/ifpga/base: check pointer adapter before dereference Xu, Rosen
2020-11-09  9:41 ` [dpdk-stable] [PATCH v2 0/2] raw/ifpga/base: fix defects found by coverity scan Zhang, Qi Z

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=1604541940-5994-3-git-send-email-wei.huang@intel.com \
    --to=wei.huang@intel.com \
    --cc=dev@dpdk.org \
    --cc=qi.z.zhang@intel.com \
    --cc=rosen.xu@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).