vhost/vhost_crypto: do not use possibly NULL Pointers

Message ID 20210524085812.15916-1-thierry.herbelot@6wind.com (mailing list archive)
State Superseded, archived
Series vhost/vhost_crypto: do not use possibly NULL Pointers |


Context Check Description
ci/checkpatch warning coding style issues
ci/github-robot fail github build: failed
ci/iol-testing warning apply patch failure
ci/Intel-compilation fail Compilation issues

Commit Message

Thierry Herbelot May 24, 2021, 8:58 a.m. UTC
  Use vc_req only after it was checked not to be NULL.

Fixes: 2d962bb736521 ("vhost/crypto: fix possible TOCTOU attack")
Cc: stable@dpdk.org
Cc: Maxime Coquelin <maxime.coquelin@redhat.com>
Cc: Chenbo Xia <chenbo.xia@intel.com>

Signed-off-by: Thierry Herbelot <thierry.herbelot@6wind.com>
 lib/vhost/vhost_crypto.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


diff --git a/lib/vhost/vhost_crypto.c b/lib/vhost/vhost_crypto.c
index 6689c52df239..5113a552bd2e 100644
--- a/lib/vhost/vhost_crypto.c
+++ b/lib/vhost/vhost_crypto.c
@@ -1337,13 +1337,15 @@  vhost_crypto_finalize_one_request(struct rte_crypto_op *op,
 	struct rte_mbuf *m_src = op->sym->m_src;
 	struct rte_mbuf *m_dst = op->sym->m_dst;
 	struct vhost_crypto_data_req *vc_req = rte_mbuf_to_priv(m_src);
-	struct vhost_virtqueue *vq = vc_req->vq;
-	uint16_t used_idx = vc_req->desc_idx, desc_idx;
+	struct vhost_virtqueue *vq;
+	uint16_t used_idx;
 	if (unlikely(!vc_req)) {
 		VC_LOG_ERR("Failed to retrieve vc_req");
 		return NULL;
+	vq = vc_req->vq;
+	used_idx = vc_req->desc_idx, desc_idx;
 	if (old_vq && (vq != old_vq))
 		return vq;