[dpdk-dev] crypto/scheduler: fix uninitialized capability structure

Message ID 1492614135-27777-1-git-send-email-pablo.de.lara.guarch@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Pablo de Lara Guarch
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

De Lara Guarch, Pablo April 19, 2017, 3:02 p.m. UTC
  Capability information is updated as slaves are attached,
but if this information is requested via rte_cryptodev_info_get()
when no slaves have been attached, the structure would not be
initialized, leading to a potential segmentation fault.

Therefore, the structure should be initialized with no
capabilities at device creation.

Fixes: 31439ee72b2c ("crypto/scheduler: add API implementations")

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
 drivers/crypto/scheduler/scheduler_pmd.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
  

Comments

Fan Zhang April 19, 2017, 3:40 p.m. UTC | #1
> -----Original Message-----
> From: De Lara Guarch, Pablo
> Sent: Wednesday, April 19, 2017 4:02 PM
> To: Zhang, Roy Fan <roy.fan.zhang@intel.com>
> Cc: dev@dpdk.org; De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>
> Subject: [PATCH] crypto/scheduler: fix uninitialized capability structure
> 
> Capability information is updated as slaves are attached, but if this
> information is requested via rte_cryptodev_info_get() when no slaves have
> been attached, the structure would not be initialized, leading to a potential
> segmentation fault.
> 
> Therefore, the structure should be initialized with no capabilities at device
> creation.
> 
> Fixes: 31439ee72b2c ("crypto/scheduler: add API implementations")
> 
> Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>

Acked-by: Fan Zhang <roy.fan.zhang@intel.com>
  
De Lara Guarch, Pablo April 19, 2017, 4:34 p.m. UTC | #2
> -----Original Message-----
> From: Zhang, Roy Fan
> Sent: Wednesday, April 19, 2017 4:41 PM
> To: De Lara Guarch, Pablo
> Cc: dev@dpdk.org
> Subject: RE: [PATCH] crypto/scheduler: fix uninitialized capability structure
> 
> > -----Original Message-----
> > From: De Lara Guarch, Pablo
> > Sent: Wednesday, April 19, 2017 4:02 PM
> > To: Zhang, Roy Fan <roy.fan.zhang@intel.com>
> > Cc: dev@dpdk.org; De Lara Guarch, Pablo
> <pablo.de.lara.guarch@intel.com>
> > Subject: [PATCH] crypto/scheduler: fix uninitialized capability structure
> >
> > Capability information is updated as slaves are attached, but if this
> > information is requested via rte_cryptodev_info_get() when no slaves
> have
> > been attached, the structure would not be initialized, leading to a
> potential
> > segmentation fault.
> >
> > Therefore, the structure should be initialized with no capabilities at device
> > creation.
> >
> > Fixes: 31439ee72b2c ("crypto/scheduler: add API implementations")
> >
> > Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
> 
> Acked-by: Fan Zhang <roy.fan.zhang@intel.com>

Applied to dpdk-next-crypto.

Pablo
  

Patch

diff --git a/drivers/crypto/scheduler/scheduler_pmd.c b/drivers/crypto/scheduler/scheduler_pmd.c
index f2a1d2a..4ac31bb 100644
--- a/drivers/crypto/scheduler/scheduler_pmd.c
+++ b/drivers/crypto/scheduler/scheduler_pmd.c
@@ -202,6 +202,20 @@  cryptodev_scheduler_create(const char *name,
 		sched_ctx->nb_init_slaves++;
 	}
 
+	/*
+	 * Initialize capabilities structure as an empty structure,
+	 * in case device information is requested when no slaves are attached
+	 */
+	sched_ctx->capabilities = rte_zmalloc_socket(NULL,
+			sizeof(struct rte_cryptodev_capabilities),
+			0, SOCKET_ID_ANY);
+
+	if (!sched_ctx->capabilities) {
+		RTE_LOG(ERR, PMD, "Not enough memory for capability "
+				"information\n");
+		return -ENOMEM;
+	}
+
 	return 0;
 }