cryptodev: fixes for gcc 4.4.7 build issues
PATCH 1/1 cryptodev: fixes for gcc 4.4.7 build issues
- Fix for build error caused by flexible array member in struct rte_ccryptodev_session.
- Change void** casting of sess parameter in rte_cryptodev_session_create which causes a strict-aliasing error
Signed-off-by Declan Doherty <[email protected]>
--- lib/librte_cryptodev/rte_cryptodev.c | 7 +++++-- lib/librte_cryptodev/rte_cryptodev_pmd.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-)
lib/librte_cryptodev/rte_cryptodev.c +5 -2
@@ -1037,6 +1037,7 @@ rte_cryptodev_session_create(uint8_t dev_id, struct rte_crypto_xform *xform) {struct rte_cryptodev *dev;struct rte_cryptodev_session *sess; +void *_sess;if (!rte_cryptodev_pmd_is_valid_dev (dev_id)) {CDEV_LOG_ERR ("Invalid dev_id=%d" , dev_id);
@@ -1046,11 +1047,13 @@ rte_cryptodev_session_create(uint8_t dev_id, struct rte_crypto_xform *xform) dev = &rte_crypto_devices[dev_id];/* Allocate a session structure from the session pool */ -if (rte_mempool_get (dev->data->session_pool, (void **)&sess)) { +if (rte_mempool_get (dev->data->session_pool, &_sess)) {CDEV_LOG_ERR ("Couldn't get object from session mempool" );return NULL ; } + sess = (struct rte_cryptodev_session *)_sess; +RTE_FUNC_PTR_OR_ERR_RET (*dev->dev_ops->session_configure,NULL );if (dev->dev_ops->session_configure (dev, xform, sess->_private) ==NULL ) {
@@ -1058,7 +1061,7 @@ rte_cryptodev_session_create(uint8_t dev_id, struct rte_crypto_xform *xform) dev_id);/* Return session to mempool */ -rte_mempool_put (sess->mp, (void *)sess); +rte_mempool_put (sess->mp, _sess);return NULL ; }
lib/librte_cryptodev/rte_cryptodev_pmd.h +1 -1
@@ -76,7 +76,7 @@ struct rte_cryptodev_session {struct rte_mempool *mp; }__rte_aligned (8 ); -char _private[]; +char _private[0 ]; };struct rte_cryptodev_driver ;
Signature · 1 line
2.5.0
Thomas Monjalon
Applied2015-11-27 17:44, Declan Doherty:
Quoted 1 line
- Fix for build error caused by flexible array member in struct
rte_ccryptodev_session.
error: flexible array member in otherwise empty struct
Quoted 2 lines
- Change void** casting of sess parameter in
rte_cryptodev_session_createwhich causes a strict-aliasing error
Fixes d11b0f30df88 ("cryptodev: introduce API and framework for crypto devices")
Quoted 1 line
Signed-off-by Declan Doherty <[email protected]>
Applied, thanks