crypto/mvsam: fix missed code change for mvsam
PATCH 1/1 crypto/mvsam: fix missed code change for mvsam
This patch fixes the missed "uint8_t *" to "const uint8_t *" xform key data type change for mvsam driver.
--- drivers/crypto/mvsam/rte_mrvl_pmd.c | 44 ++++++++++++++++++++++++++++++--- drivers/crypto/mvsam/rte_mrvl_pmd_ops.c | 9 +++++++ 2 files changed, 49 insertions(+), 4 deletions(-)
drivers/crypto/mvsam/rte_mrvl_pmd.c +40 -4
@@ -222,6 +222,8 @@ static int mrvl_crypto_set_cipher_session_parameters(struct mrvl_crypto_session *sess, const struct rte_crypto_sym_xform *cipher_xform) { + uint8_t *cipher_key; +/* Make sure we've got proper struct */ if (cipher_xform->type !=RTE_CRYPTO_SYM_XFORM_CIPHER ) {MRVL_LOG (ERR ,"Wrong xform struct provided!" );
@@ -256,8 +258,17 @@ mrvl_crypto_set_cipher_session_parameters(struct mrvl_crypto_session *sess,return -EINVAL ; } + cipher_key =malloc (cipher_xform->cipher.key.length); +if (cipher_key ==NULL ) { +MRVL_LOG (ERR ,"Insufficient memory!" ); +return -ENOMEM ; + } + +memcpy (cipher_key, cipher_xform->cipher.key, + cipher_xform->cipher.key.length); + sess->sam_sess_params.cipher_key_len = cipher_xform->cipher.key.length; - sess->sam_sess_params.cipher_key = cipher_xform->cipher.key.data; + sess->sam_sess_params.cipher_key = cipher_key;return 0 ; }
@@ -273,6 +284,8 @@ static int mrvl_crypto_set_auth_session_parameters(struct mrvl_crypto_session *sess, const struct rte_crypto_sym_xform *auth_xform) { + uint8_t *auth_key = NULL; +/* Make sure we've got proper struct */ if (auth_xform->type !=RTE_CRYPTO_SYM_XFORM_AUTH ) {MRVL_LOG (ERR ,"Wrong xform struct provided!" );
@@ -293,9 +306,21 @@ mrvl_crypto_set_auth_session_parameters(struct mrvl_crypto_session *sess, auth_map[auth_xform->auth.algo].auth_alg; sess->sam_sess_params.u.basic.auth_icv_len = auth_xform->auth.digest_length; + +if (auth_xform->auth.key.length >0 ) { + auth_key =malloc (auth_xform->auth.key.length); +if (auth_key ==NULL ) { +MRVL_LOG (ERR ,"Not enough memory!" ); +return -EINVAL ; + } + +memcpy (auth_key, auth_xform->auth.key.data, + auth_xform->auth.key.length); + } + +/* auth_key must be NULL if auth algorithm does not use HMAC */ - sess->sam_sess_params.auth_key = auth_xform->auth.key.length ? - auth_xform->auth.key.data :NULL ; + sess->sam_sess_params.auth_key = auth_key; sess->sam_sess_params.auth_key_len = auth_xform->auth.key.length;return 0 ;
@@ -312,6 +337,8 @@ static int mrvl_crypto_set_aead_session_parameters(struct mrvl_crypto_session *sess, const struct rte_crypto_sym_xform *aead_xform) { + uint8_t *aead_key; +/* Make sure we've got proper struct */ if (aead_xform->type !=RTE_CRYPTO_SYM_XFORM_AEAD ) {MRVL_LOG (ERR ,"Wrong xform struct provided!" );
@@ -344,7 +371,16 @@ mrvl_crypto_set_aead_session_parameters(struct mrvl_crypto_session *sess,return -EINVAL ; } - sess->sam_sess_params.cipher_key = aead_xform->aead.key.data; + aead_key =malloc (aead_xform->aead.key.length); +if (aead_key ==NULL ) { +MRVL_LOG (ERR ,"Insufficient memory!" ); +return -ENOMEM ; + } + +memcpy (aead_key, aead_xform->aead.key.data, + aead_xform->aead.key.length); + + sess->sam_sess_params.cipher_key = aead_key; sess->sam_sess_params.cipher_key_len = aead_xform->aead.key.length;if (sess->sam_sess_params.cipher_mode ==SAM_CIPHER_GCM )
drivers/crypto/mvsam/rte_mrvl_pmd_ops.c +9 -0
@@ -751,6 +751,8 @@ mrvl_crypto_pmd_sym_session_configure(__rte_unused struct rte_cryptodev *dev,return -ENOMEM ; } +memset (sess_private_data,0 ,sizeof (struct mrvl_crypto_session )); + ret =mrvl_crypto_set_session_parameters (sess_private_data, xform);if (ret !=0 ) {MRVL_LOG (ERR ,"Failed to configure session parameters!" );
@@ -769,6 +771,13 @@ mrvl_crypto_pmd_sym_session_configure(__rte_unused struct rte_cryptodev *dev,return -EIO ; } +/* free the keys memory allocated for session creation */ +if (mrvl_sess->sam_sess_params.cipher_key !=NULL ) +free (mrvl_sess->sam_sess_params.cipher_key); +if (mrvl_sess->sam_sess_params.auth_key !=NULL ) +free (mrvl_sess->sam_sess_params.auth_key); + +return 0 ; }
Signature · 1 line
2.14.5
Hi Fan,
Quoted 65 lines
This patch fixes the missed "
uint8_t*" to "constuint8_t*" xform key data type change for mvsam driver.Fixes f3390532cf6a ("cryptodev: make xform key pointer constant")Signed-off-by Fan Zhang <[email protected]>--- drivers/crypto/mvsam/rte_mrvl_pmd.c | 44 ++++++++++++++++++++++++++++++--- drivers/crypto/mvsam/rte_mrvl_pmd_ops.c | 9 +++++++ 2 files changed, 49 insertions(+), 4 deletions(-)drivers/crypto/mvsam/rte_mrvl_pmd.c +12
-1@@ -222,6 +222,8 @@ static int mrvl_crypto_set_cipher_session_parameters(struct mrvl_crypto_session *sess, const struct rte_crypto_sym_xform *cipher_xform) { + uint8_t *cipher_key; +/* Make sure we've got proper struct */ if (cipher_xform->type !=RTE_CRYPTO_SYM_XFORM_CIPHER ) {MRVL_LOG (ERR ,"Wrong xform struct provided!" );@@ -256,8 +258,17 @@ mrvl_crypto_set_cipher_session_parameters(struct mrvl_crypto_session *sess, return -EINVAL ; } + cipher_key =malloc (cipher_xform->cipher.key.length); +if (cipher_key ==NULL ) { +MRVL_LOG (ERR ,"Insufficient memory!" ); +return -ENOMEM ; + } + +memcpy (cipher_key, cipher_xform->cipher.key, + cipher_xform->cipher.key.length); + sess->sam_sess_params.cipher_key_len = cipher_xform- >cipher.key.length; - sess->sam_sess_params.cipher_key = cipher_xform->cipher.key.data; + sess->sam_sess_params.cipher_key = cipher_key;drivers/crypto/mvsam/rte_mrvl_pmd.c +5
-0return 0 ; }@@ -273,6 +284,8 @@ static int mrvl_crypto_set_auth_session_parameters(struct mrvl_crypto_session *sess, const struct rte_crypto_sym_xform *auth_xform) { + uint8_t *auth_key = NULL; +/* Make sure we've got proper struct */ if (auth_xform->type !=RTE_CRYPTO_SYM_XFORM_AUTH ) {MRVL_LOG (ERR ,"Wrong xform struct provided!" );@@ -293,9 +306,21 @@ mrvl_crypto_set_auth_session_parameters(struct mrvl_crypto_session *sess, auth_map[auth_xform->auth.algo].auth_alg; sess->sam_sess_params.u.basic.auth_icv_len = auth_xform->auth.digest_length; + +if (auth_xform->auth.key.length >0 ) { + auth_key =malloc (auth_xform->auth.key.length);
drivers/crypto/mvsam/rte_mrvl_pmd.c mrvl_crypto_set_auth_session_parameters(struct · line 322
Quoted 10 lines
drivers/crypto/mvsam/rte_mrvl_pmd.c +10
-0+if (auth_key ==NULL ) { +MRVL_LOG (ERR ,"Not enough memory!" ); +return -EINVAL ; + } + +memcpy (auth_key, auth_xform->auth.key.data, + auth_xform->auth.key.length); + } + +
Extra blank spaces.
Quoted 55 lines
drivers/crypto/mvsam/rte_mrvl_pmd.c +1
-2/* auth_key must be NULL if auth algorithm does not use HMAC */ - sess->sam_sess_params.auth_key = auth_xform->auth.key.length ? - auth_xform->auth.key.data :NULL ; + sess->sam_sess_params.auth_key = auth_key; sess->sam_sess_params.auth_key_len = auth_xform->auth.key.length;drivers/crypto/mvsam/rte_mrvl_pmd.c +12
-1return 0 ;@@ -312,6 +337,8 @@ static int mrvl_crypto_set_aead_session_parameters(struct mrvl_crypto_session *sess, const struct rte_crypto_sym_xform *aead_xform) { + uint8_t *aead_key; +/* Make sure we've got proper struct */ if (aead_xform->type !=RTE_CRYPTO_SYM_XFORM_AEAD ) {MRVL_LOG (ERR ,"Wrong xform struct provided!" );@@ -344,7 +371,16 @@ mrvl_crypto_set_aead_session_parameters(struct mrvl_crypto_session *sess, return -EINVAL ; } - sess->sam_sess_params.cipher_key = aead_xform->aead.key.data; + aead_key =malloc (aead_xform->aead.key.length); +if (aead_key ==NULL ) { +MRVL_LOG (ERR ,"Insufficient memory!" ); +return -ENOMEM ; + } + +memcpy (aead_key, aead_xform->aead.key.data, + aead_xform->aead.key.length); + + sess->sam_sess_params.cipher_key = aead_key; sess->sam_sess_params.cipher_key_len = aead_xform- >aead.key.length;drivers/crypto/mvsam/rte_mrvl_pmd.c +0
-0if (sess->sam_sess_params.cipher_mode ==SAM_CIPHER_GCM )drivers/crypto/mvsam/rte_mrvl_pmd_ops.c +0
-0@@ -751,6 +751,8 @@mrvl_crypto_pmd_sym_session_configure(__rte_unused struct
rte_cryptodev*dev,drivers/crypto/mvsam/rte_mrvl_pmd_ops.c +2
-0return -ENOMEM ; } +memset (sess_private_data,0 ,sizeof (struct mrvl_crypto_session )); + ret =mrvl_crypto_set_session_parameters (sess_private_data, xform);if (ret !=0 ) {MRVL_LOG (ERR ,"Failed to configure session parameters!" );@@ -769,6 +771,13 @@mrvl_crypto_pmd_sym_session_configure(__rte_unused struct
rte_cryptodev*dev,
drivers/crypto/mvsam/rte_mrvl_pmd_ops.c mrvl_crypto_pmd_sym_session_configure(__rte_unused struct rte_cryptodev *dev, · line 780
Quoted 10 lines
drivers/crypto/mvsam/rte_mrvl_pmd_ops.c +7
-0return -EIO ; } +/* free the keys memory allocated for session creation */ +if (mrvl_sess->sam_sess_params.cipher_key !=NULL ) +free (mrvl_sess->sam_sess_params.cipher_key); +if (mrvl_sess->sam_sess_params.auth_key !=NULL ) +free (mrvl_sess->sam_sess_params.auth_key); + +
Extra blank and missing the aead key free.
Quoted 5 lines
return 0;
}--
2.14.5
Hi Akhil,
Thanks for the review, comments inline.
Regards,
Fan
Quoted 9 lines
-----Original Message-----
From: Akhil Goyal [mailto:[email protected]]
Sent: Friday, July 5, 2019 2:28 PM
To: Zhang, Roy Fan <[email protected]>; [email protected]
Subject: RE: [PATCH]crypto/mvsam: fix missed code change for mvsamHi Fan,
Quoted 1 line
...
Quoted 1 line
Extra blank spaces.
Will change in v2.
Quoted 1 line
...
Quoted 25 lines
Quoted 14 lines
drivers/crypto/mvsam/rte_mrvl_pmd.c +10
-1- sess->sam_sess_params.cipher_key = aead_xform->aead.key.data; + aead_key =malloc (aead_xform->aead.key.length); +if (aead_key ==NULL ) { +MRVL_LOG (ERR ,"Insufficient memory!" ); +return -ENOMEM ; + } + +memcpy (aead_key, aead_xform->aead.key.data, + aead_xform->aead.key.length); + + sess->sam_sess_params.cipher_key = aead_key; sess->sam_sess_params.cipher_key_len = aead_xform-Quoted 1 line
aead.key.length;
Quoted 1 line
if (
sess->sam_sess_params.cipher_mode==SAM_CIPHER_GCM)diff --git
Quoted 9 lines
a/drivers/crypto/mvsam/rte_mrvl_pmd_ops.cb/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c
indexf6bf2cd4c..b334c7694100644drivers/crypto/mvsam/rte_mrvl_pmd_ops.c +0
-0@@ -751,6 +751,8 @@
Quoted 8 lines
drivers/crypto/mvsam/rte_mrvl_pmd_ops.c mrvl_crypto_pmd_sym_session_configure(__rte_unused struct rte_cryptodev *dev, · line 780
Quoted 7 lines
drivers/crypto/mvsam/rte_mrvl_pmd_ops.c +7
-0+/* free the keys memory allocated for session creation */ +if (mrvl_sess->sam_sess_params.cipher_key !=NULL ) +free (mrvl_sess->sam_sess_params.cipher_key); +if (mrvl_sess->sam_sess_params.auth_key !=NULL ) +free (mrvl_sess->sam_sess_params.auth_key); + +Extra blank and missing the aead key free.
During the session config the driver used cipher_key field to store the aead key. So no matter it is cipher key or aead key the memory is freed here. Will fix the extra blank line in v2.
Quoted 7 lines
Quoted 7 lines
return 0;
}--
2.14.5
Hi Liron,
Following patch need to be merged today as it is fixing a build issue for a patch already merged. Could you please review this patch? Sorry for a very short notice.
Thanks,
Akhil
Quoted 151 lines
-----Original Message-----
From: Fan Zhang <[email protected]>
Sent: Friday, July 5, 2019 6:54 PM
To: [email protected]
Cc: Akhil Goyal <[email protected]>; Fan Zhang <[email protected]>
Subject: [PATCH]crypto/mvsam: fix missed code change for mvsamThis patch fixes the missed "
uint8_t*" to "constuint8_t*" xform key data type change for mvsam driver.Fixes f3390532cf6a ("cryptodev: make xform key pointer constant")Signed-off-by Fan Zhang <[email protected]>--- drivers/crypto/mvsam/rte_mrvl_pmd.c | 44 ++++++++++++++++++++++++++++++--- drivers/crypto/mvsam/rte_mrvl_pmd_ops.c | 9 +++++++ 2 files changed, 49 insertions(+), 4 deletions(-)drivers/crypto/mvsam/rte_mrvl_pmd.c +12
-1@@ -222,6 +222,8 @@ static int mrvl_crypto_set_cipher_session_parameters(struct mrvl_crypto_session *sess, const struct rte_crypto_sym_xform *cipher_xform) { + uint8_t *cipher_key; +/* Make sure we've got proper struct */ if (cipher_xform->type !=RTE_CRYPTO_SYM_XFORM_CIPHER ) {MRVL_LOG (ERR ,"Wrong xform struct provided!" );@@ -256,8 +258,17 @@ mrvl_crypto_set_cipher_session_parameters(struct mrvl_crypto_session *sess, return -EINVAL ; } + cipher_key =malloc (cipher_xform->cipher.key.length); +if (cipher_key ==NULL ) { +MRVL_LOG (ERR ,"Insufficient memory!" ); +return -ENOMEM ; + } + +memcpy (cipher_key, cipher_xform->cipher.key, + cipher_xform->cipher.key.length); + sess->sam_sess_params.cipher_key_len = cipher_xform- >cipher.key.length; - sess->sam_sess_params.cipher_key = cipher_xform->cipher.key.data; + sess->sam_sess_params.cipher_key = cipher_key;drivers/crypto/mvsam/rte_mrvl_pmd.c +16
-2return 0 ; }@@ -273,6 +284,8 @@ static int mrvl_crypto_set_auth_session_parameters(struct mrvl_crypto_session *sess, const struct rte_crypto_sym_xform *auth_xform) { + uint8_t *auth_key = NULL; +/* Make sure we've got proper struct */ if (auth_xform->type !=RTE_CRYPTO_SYM_XFORM_AUTH ) {MRVL_LOG (ERR ,"Wrong xform struct provided!" );@@ -293,9 +306,21 @@ mrvl_crypto_set_auth_session_parameters(struct mrvl_crypto_session *sess, auth_map[auth_xform->auth.algo].auth_alg; sess->sam_sess_params.u.basic.auth_icv_len = auth_xform->auth.digest_length; + +if (auth_xform->auth.key.length >0 ) { + auth_key =malloc (auth_xform->auth.key.length); +if (auth_key ==NULL ) { +MRVL_LOG (ERR ,"Not enough memory!" ); +return -EINVAL ; + } + +memcpy (auth_key, auth_xform->auth.key.data, + auth_xform->auth.key.length); + } + +/* auth_key must be NULL if auth algorithm does not use HMAC */ - sess->sam_sess_params.auth_key = auth_xform->auth.key.length ? - auth_xform->auth.key.data :NULL ; + sess->sam_sess_params.auth_key = auth_key; sess->sam_sess_params.auth_key_len = auth_xform->auth.key.length;drivers/crypto/mvsam/rte_mrvl_pmd.c +12
-1return 0 ;@@ -312,6 +337,8 @@ static int mrvl_crypto_set_aead_session_parameters(struct mrvl_crypto_session *sess, const struct rte_crypto_sym_xform *aead_xform) { + uint8_t *aead_key; +/* Make sure we've got proper struct */ if (aead_xform->type !=RTE_CRYPTO_SYM_XFORM_AEAD ) {MRVL_LOG (ERR ,"Wrong xform struct provided!" );@@ -344,7 +371,16 @@ mrvl_crypto_set_aead_session_parameters(struct mrvl_crypto_session *sess, return -EINVAL ; } - sess->sam_sess_params.cipher_key = aead_xform->aead.key.data; + aead_key =malloc (aead_xform->aead.key.length); +if (aead_key ==NULL ) { +MRVL_LOG (ERR ,"Insufficient memory!" ); +return -ENOMEM ; + } + +memcpy (aead_key, aead_xform->aead.key.data, + aead_xform->aead.key.length); + + sess->sam_sess_params.cipher_key = aead_key; sess->sam_sess_params.cipher_key_len = aead_xform- >aead.key.length;drivers/crypto/mvsam/rte_mrvl_pmd.c +0
-0if (sess->sam_sess_params.cipher_mode ==SAM_CIPHER_GCM )drivers/crypto/mvsam/rte_mrvl_pmd_ops.c +0
-0@@ -751,6 +751,8 @@mrvl_crypto_pmd_sym_session_configure(__rte_unused struct
rte_cryptodev*dev,drivers/crypto/mvsam/rte_mrvl_pmd_ops.c +2
-0return -ENOMEM ; } +memset (sess_private_data,0 ,sizeof (struct mrvl_crypto_session )); + ret =mrvl_crypto_set_session_parameters (sess_private_data, xform);if (ret !=0 ) {MRVL_LOG (ERR ,"Failed to configure session parameters!" );@@ -769,6 +771,13 @@mrvl_crypto_pmd_sym_session_configure(__rte_unused struct
rte_cryptodev*dev,drivers/crypto/mvsam/rte_mrvl_pmd_ops.c +7
-1return -EIO ; } +/* free the keys memory allocated for session creation */ +if (mrvl_sess->sam_sess_params.cipher_key !=NULL ) +free (mrvl_sess->sam_sess_params.cipher_key); +if (mrvl_sess->sam_sess_params.auth_key !=NULL ) +free (mrvl_sess->sam_sess_params.auth_key); + +return 0 ; } --2.14.5
Liron Himi
Acked-by-----Original Message-----
From: Akhil Goyal <[email protected]>
Sent: Friday, July 5, 2019 16:32
To: Fan Zhang <[email protected]>; [email protected]; Liron Himi <[email protected]>
Subject: [EXT] RE: [PATCH] crypto/mvsam: fix missed code change for mvsam
External Email
----------------------------------------------------------------------
Hi Liron,
Following patch need to be merged today as it is fixing a build issue for a patch already merged. Could you please review this patch? Sorry for a very short notice.
Thanks,
Akhil
Quoted 147 lines
-----Original Message-----
From: Fan Zhang <[email protected]>
Sent: Friday, July 5, 2019 6:54 PM
To: [email protected]
Cc: Akhil Goyal <[email protected]>; Fan Zhang <[email protected]>
Subject: [PATCH]crypto/mvsam: fix missed code change for mvsamThis patch fixes the missed "
uint8_t*" to "constuint8_t*" xform key data type change for mvsam driver.Fixes f3390532cf6a ("cryptodev: make xform key pointer constant")Signed-off-by Fan Zhang <[email protected]>--- drivers/crypto/mvsam/rte_mrvl_pmd.c | 44 ++++++++++++++++++++++++++++++--- drivers/crypto/mvsam/rte_mrvl_pmd_ops.c | 9 +++++++ 2 files changed, 49 insertions(+), 4 deletions(-)drivers/crypto/mvsam/rte_mrvl_pmd.c +2
-0@@ -222,6 +222,8 @@ static int mrvl_crypto_set_cipher_session_parameters(struct mrvl_crypto_session *sess, const struct rte_crypto_sym_xform *cipher_xform) { + uint8_t *cipher_key; +/* Make sure we've got proper struct */ if (cipher_xform->type !=RTE_CRYPTO_SYM_XFORM_CIPHER ) { MRVL_LOG(ERR, "Wrong xform struct provided!"); @@ -256,8 +258,17 @@mrvl_crypto_set_cipher_session_parameters(struct
mrvl_crypto_session*sess,drivers/crypto/mvsam/rte_mrvl_pmd.c +9
-0return -EINVAL ; } + cipher_key =malloc (cipher_xform->cipher.key.length); +if (cipher_key ==NULL ) { +MRVL_LOG (ERR ,"Insufficient memory!" ); +return -ENOMEM ; + } + +memcpy (cipher_key, cipher_xform->cipher.key, + cipher_xform->cipher.key.length); + sess->sam_sess_params.cipher_key_len = cipher_xform-Quoted 1 line
cipher.key.length;
drivers/crypto/mvsam/rte_mrvl_pmd.c +3
-1- sess->sam_sess_params.cipher_key = cipher_xform->cipher.key.data; + sess->sam_sess_params.cipher_key = cipher_key;return 0 ; }@@ -273,6 +284,8 @@ static int mrvl_crypto_set_auth_session_parameters(struct mrvl_crypto_session *sess, const struct rte_crypto_sym_xform *auth_xform) { + uint8_t *auth_key = NULL; +/* Make sure we've got proper struct */ if (auth_xform->type !=RTE_CRYPTO_SYM_XFORM_AUTH ) { MRVL_LOG(ERR, "Wrong xform struct provided!"); @@ -293,9 +306,21 @@mrvl_crypto_set_auth_session_parameters(struct
mrvl_crypto_session*sess,drivers/crypto/mvsam/rte_mrvl_pmd.c +16
-2auth_map[auth_xform->auth.algo].auth_alg; sess->sam_sess_params.u.basic.auth_icv_len = auth_xform->auth.digest_length; + +if (auth_xform->auth.key.length >0 ) { + auth_key =malloc (auth_xform->auth.key.length); +if (auth_key ==NULL ) { +MRVL_LOG (ERR ,"Not enough memory!" ); +return -EINVAL ; + } + +memcpy (auth_key, auth_xform->auth.key.data, + auth_xform->auth.key.length); + } + +/* auth_key must be NULL if auth algorithm does not use HMAC */ - sess->sam_sess_params.auth_key = auth_xform->auth.key.length ? - auth_xform->auth.key.data :NULL ; + sess->sam_sess_params.auth_key = auth_key; sess->sam_sess_params.auth_key_len = auth_xform->auth.key.length;return 0 ;@@ -312,6 +337,8 @@ static int mrvl_crypto_set_aead_session_parameters(struct mrvl_crypto_session *sess, const struct rte_crypto_sym_xform *aead_xform) { + uint8_t *aead_key; +/* Make sure we've got proper struct */ if (aead_xform->type !=RTE_CRYPTO_SYM_XFORM_AEAD ) { MRVL_LOG(ERR, "Wrong xform struct provided!"); @@ -344,7 +371,16 @@mrvl_crypto_set_aead_session_parameters(struct
mrvl_crypto_session*sess,drivers/crypto/mvsam/rte_mrvl_pmd.c +10
-1return -EINVAL ; } - sess->sam_sess_params.cipher_key = aead_xform->aead.key.data; + aead_key =malloc (aead_xform->aead.key.length); +if (aead_key ==NULL ) { +MRVL_LOG (ERR ,"Insufficient memory!" ); +return -ENOMEM ; + } + +memcpy (aead_key, aead_xform->aead.key.data, + aead_xform->aead.key.length); + + sess->sam_sess_params.cipher_key = aead_key; sess->sam_sess_params.cipher_key_len = aead_xform-Quoted 1 line
aead.key.length;
if (
sess->sam_sess_params.cipher_mode==SAM_CIPHER_GCM) diff --gita/drivers/crypto/mvsam/rte_mrvl_pmd_ops.cb/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c
indexf6bf2cd4c..b334c7694100644drivers/crypto/mvsam/rte_mrvl_pmd_ops.c +0
-0@@ -751,6 +751,8 @@mrvl_crypto_pmd_sym_session_configure(__rte_unused struct
rte_cryptodev*dev,drivers/crypto/mvsam/rte_mrvl_pmd_ops.c +3
-0return -ENOMEM ; } +memset (sess_private_data,0 ,sizeof (struct mrvl_crypto_session )); + ret =mrvl_crypto_set_session_parameters (sess_private_data, xform); if (ret != 0) { MRVL_LOG(ERR, "Failed to configure session parameters!"); @@ -769,6 +771,13 @@ mrvl_crypto_pmd_sym_session_configure(__rte_unused struct
rte_cryptodev*dev,drivers/crypto/mvsam/rte_mrvl_pmd_ops.c +7
-1return -EIO ; } +/* free the keys memory allocated for session creation */ +if (mrvl_sess->sam_sess_params.cipher_key !=NULL ) +free (mrvl_sess->sam_sess_params.cipher_key); +if (mrvl_sess->sam_sess_params.auth_key !=NULL ) +free (mrvl_sess->sam_sess_params.auth_key); + +return 0 ; } --
Quoted 1 line
2.14.5
Based on Fan's comments
07/07/2019 07:41, Liron Himi:
Quoted 11 lines
From: Akhil Goyal <[email protected]>
Quoted 7 lines
This patch fixes the missed "
uint8_t*" to "constuint8_t*" xform key data type change for mvsam driver.Fixes f3390532cf6a ("cryptodev: make xform key pointer constant")Signed-off-by Fan Zhang <[email protected]>---
Based on Fan's comments
Acked-by Liron Himi <[email protected]>
So we are OK to merge this patch with
"cryptodev: make xform key pointer constant"
in next-crypto tree?
Quoted 11 lines
07/07/2019 07:41, Liron Himi:
Quoted 8 lines
From: Akhil Goyal <[email protected]>
Quoted 7 lines
This patch fixes the missed "
uint8_t*" to "constuint8_t*" xform key data type change for mvsam driver.Fixes f3390532cf6a ("cryptodev: make xform key pointer constant")Signed-off-by Fan Zhang <[email protected]>---
Quoted 8 lines
Quoted 3 lines
Based on Fan's comments
Acked-by Liron Himi <[email protected]>So we are OK to merge this patch with
"cryptodev: make xform key pointer constant"
in next-crypto tree?
I have just squashed this with the original commit.
08/07/2019 12:26, Thomas Monjalon:
Quoted 9 lines
07/07/2019 07:41, Liron Himi:
Quoted 8 lines
From: Akhil Goyal <[email protected]>
Quoted 7 lines
This patch fixes the missed "
uint8_t*" to "constuint8_t*" xform key data type change for mvsam driver.Fixes f3390532cf6a ("cryptodev: make xform key pointer constant")Signed-off-by Fan Zhang <[email protected]>---
Quoted 7 lines
Quoted 3 lines
Based on Fan's comments
Acked-by Liron Himi <[email protected]>So we are OK to merge this patch with
"cryptodev: make xform key pointer constant"
in next-crypto tree?
There is still a compilation error:
drivers/crypto/mvsam/rte_mrvl_pmd.c:267:41: error:
incompatible type for argument 2 of 'memcpy'
memcpy(cipher_key, cipher_xform->cipher.key,
~~~~~~~~~~~~~~~~~~~~^~~~
Seen when compiling arm64-thunderx-linux-gcc
Hi Fan,
Quoted 19 lines
08/07/2019 12:26, Thomas Monjalon:
Quoted 9 lines
07/07/2019 07:41, Liron Himi:
Quoted 8 lines
From: Akhil Goyal <[email protected]>
Quoted 7 lines
This patch fixes the missed "
uint8_t*" to "constuint8_t*" xform key data type change for mvsam driver.Fixes f3390532cf6a ("cryptodev: make xform key pointer constant")Signed-off-by Fan Zhang <[email protected]>---
Quoted 7 lines
Quoted 3 lines
Based on Fan's comments
Acked-by Liron Himi <[email protected]>So we are OK to merge this patch with
"cryptodev: make xform key pointer constant"
in next-crypto tree?
Quoted 9 lines
There is still a compilation error:
drivers/crypto/mvsam/rte_mrvl_pmd.c:267:41: error:
incompatible type for argument 2 of 'memcpy'
memcpy(cipher_key,cipher_xform->cipher.key,~~~~~~~~~~~~~~~~~~~~^~~~Seen when compiling arm64-thunderx-linux-gcc
Could you send a proper fix to this issue.
Thanks,
Akhil
Hi Fan/Liron,
Could you please send the incremental patch ASAP. Otherwise I need to remove this patch from the subtree. I don't have environment to test this.
Regards,
Akhil
Quoted 36 lines
Hi Fan,
Quoted 19 lines
08/07/2019 12:26, Thomas Monjalon:
Quoted 9 lines
07/07/2019 07:41, Liron Himi:
Quoted 8 lines
From: Akhil Goyal <[email protected]>
Quoted 7 lines
This patch fixes the missed "
uint8_t*" to "constuint8_t*" xform key data type change for mvsam driver.Fixes f3390532cf6a ("cryptodev: make xform key pointer constant")Signed-off-by Fan Zhang <[email protected]>---
Quoted 7 lines
Quoted 3 lines
Based on Fan's comments
Acked-by Liron Himi <[email protected]>So we are OK to merge this patch with
"cryptodev: make xform key pointer constant"
in next-crypto tree?Quoted 9 lines
There is still a compilation error:
drivers/crypto/mvsam/rte_mrvl_pmd.c:267:41: error:
incompatible type for argument 2 of 'memcpy'
memcpy(cipher_key,cipher_xform->cipher.key,~~~~~~~~~~~~~~~~~~~~^~~~Seen when compiling arm64-thunderx-linux-gcc
Could you send a proper fix to this issue.
Thanks,
Akhil