* [PATCH] crypto/ipsec_mb: fix cipher key setting
@ 2021-11-22 17:47 Pablo de Lara
2021-11-23 8:22 ` Power, Ciara
2021-11-23 13:09 ` Zhang, Roy Fan
0 siblings, 2 replies; 4+ messages in thread
From: Pablo de Lara @ 2021-11-22 17:47 UTC (permalink / raw)
To: roy.fan.zhang, ciara.power; +Cc: dev, Pablo de Lara, stable
When authenticating with SNOW3G, KASUMI and ZUC,
the pointers for encryption/decryption keys is not set.
If a cipher algorithm such as AES-CBC is also used,
the application would seg fault.
Hence, these pointers should be set to some value by default.
Command line to replicate the issue:
./build/app/dpdk-test-crypto-perf -l 4,5 -n 6 --vdev="crypto_aesni_mb" -- \
--devtype="crypto_aesni_mb" --optype=cipher-then-auth --auth-algo snow3g-uia2 \
--auth-key-sz 16 --auth-iv-sz 16 --digest-sz 4 --silent --total-ops 1000000 \
--auth-op generate --burst-sz 32 --cipher-algo aes-ctr
--cipher-key-sz 16 --cipher-iv-sz 16
Fixes: ae8e085c608d ("crypto/aesni_mb: support KASUMI F8/F9")
Fixes: 6c42e0cf4d12 ("crypto/aesni_mb: support SNOW3G-UEA2/UIA2")
Fixes: fd8df85487c4 ("crypto/aesni_mb: support ZUC-EEA3/EIA3")
Cc: stable@dpdk.org
Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c
index e05bc04c3b..a308d42ffa 100644
--- a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c
+++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c
@@ -1120,6 +1120,14 @@ set_mb_job_params(IMB_JOB *job, struct ipsec_mb_qp *qp,
const int aead = is_aead_algo(job->hash_alg, job->cipher_mode);
+ if (job->cipher_mode == IMB_CIPHER_DES3) {
+ job->enc_keys = session->cipher.exp_3des_keys.ks_ptr;
+ job->dec_keys = session->cipher.exp_3des_keys.ks_ptr;
+ } else {
+ job->enc_keys = session->cipher.expanded_aes_keys.encode;
+ job->dec_keys = session->cipher.expanded_aes_keys.decode;
+ }
+
switch (job->hash_alg) {
case IMB_AUTH_AES_XCBC:
job->u.XCBC._k1_expanded = session->auth.xcbc.k1_expanded;
@@ -1189,13 +1197,6 @@ set_mb_job_params(IMB_JOB *job, struct ipsec_mb_qp *qp,
job->u.HMAC._hashed_auth_key_xor_opad =
session->auth.pads.outer;
- if (job->cipher_mode == IMB_CIPHER_DES3) {
- job->enc_keys = session->cipher.exp_3des_keys.ks_ptr;
- job->dec_keys = session->cipher.exp_3des_keys.ks_ptr;
- } else {
- job->enc_keys = session->cipher.expanded_aes_keys.encode;
- job->dec_keys = session->cipher.expanded_aes_keys.decode;
- }
}
if (aead)
--
2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread* RE: [PATCH] crypto/ipsec_mb: fix cipher key setting
2021-11-22 17:47 [PATCH] crypto/ipsec_mb: fix cipher key setting Pablo de Lara
@ 2021-11-23 8:22 ` Power, Ciara
2021-11-23 13:09 ` Zhang, Roy Fan
1 sibling, 0 replies; 4+ messages in thread
From: Power, Ciara @ 2021-11-23 8:22 UTC (permalink / raw)
To: De Lara Guarch, Pablo, Zhang, Roy Fan; +Cc: dev, stable
>-----Original Message-----
>From: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>
>Sent: Monday 22 November 2021 17:47
>To: Zhang, Roy Fan <roy.fan.zhang@intel.com>; Power, Ciara
><ciara.power@intel.com>
>Cc: dev@dpdk.org; De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>;
>stable@dpdk.org
>Subject: [PATCH] crypto/ipsec_mb: fix cipher key setting
>
>When authenticating with SNOW3G, KASUMI and ZUC, the pointers for
>encryption/decryption keys is not set.
>If a cipher algorithm such as AES-CBC is also used, the application would seg
>fault.
>Hence, these pointers should be set to some value by default.
>
>Command line to replicate the issue:
>./build/app/dpdk-test-crypto-perf -l 4,5 -n 6 --vdev="crypto_aesni_mb" -- \ --
>devtype="crypto_aesni_mb" --optype=cipher-then-auth --auth-algo snow3g-
>uia2 \ --auth-key-sz 16 --auth-iv-sz 16 --digest-sz 4 --silent --total-ops 1000000
>\ --auth-op generate --burst-sz 32 --cipher-algo aes-ctr --cipher-key-sz 16 --
>cipher-iv-sz 16
>
>Fixes: ae8e085c608d ("crypto/aesni_mb: support KASUMI F8/F9")
>Fixes: 6c42e0cf4d12 ("crypto/aesni_mb: support SNOW3G-UEA2/UIA2")
>Fixes: fd8df85487c4 ("crypto/aesni_mb: support ZUC-EEA3/EIA3")
>Cc: stable@dpdk.org
>
>Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
>---
> drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 15 ++++++++-------
> 1 file changed, 8 insertions(+), 7 deletions(-)
>
>diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c
>b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c
>index e05bc04c3b..a308d42ffa 100644
>--- a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c
>+++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c
>@@ -1120,6 +1120,14 @@ set_mb_job_params(IMB_JOB *job, struct
>ipsec_mb_qp *qp,
>
> const int aead = is_aead_algo(job->hash_alg, job->cipher_mode);
>
>+ if (job->cipher_mode == IMB_CIPHER_DES3) {
>+ job->enc_keys = session->cipher.exp_3des_keys.ks_ptr;
>+ job->dec_keys = session->cipher.exp_3des_keys.ks_ptr;
>+ } else {
>+ job->enc_keys = session-
>>cipher.expanded_aes_keys.encode;
>+ job->dec_keys = session-
>>cipher.expanded_aes_keys.decode;
>+ }
>+
> switch (job->hash_alg) {
> case IMB_AUTH_AES_XCBC:
> job->u.XCBC._k1_expanded = session-
>>auth.xcbc.k1_expanded; @@ -1189,13 +1197,6 @@
>set_mb_job_params(IMB_JOB *job, struct ipsec_mb_qp *qp,
> job->u.HMAC._hashed_auth_key_xor_opad =
> session->auth.pads.outer;
>
>- if (job->cipher_mode == IMB_CIPHER_DES3) {
>- job->enc_keys = session-
>>cipher.exp_3des_keys.ks_ptr;
>- job->dec_keys = session-
>>cipher.exp_3des_keys.ks_ptr;
>- } else {
>- job->enc_keys = session-
>>cipher.expanded_aes_keys.encode;
>- job->dec_keys = session-
>>cipher.expanded_aes_keys.decode;
>- }
> }
>
> if (aead)
>--
>2.25.1
Acked-by: Ciara Power <ciara.power@intel.com>
^ permalink raw reply [flat|nested] 4+ messages in thread* RE: [PATCH] crypto/ipsec_mb: fix cipher key setting
2021-11-22 17:47 [PATCH] crypto/ipsec_mb: fix cipher key setting Pablo de Lara
2021-11-23 8:22 ` Power, Ciara
@ 2021-11-23 13:09 ` Zhang, Roy Fan
2021-11-23 18:39 ` Akhil Goyal
1 sibling, 1 reply; 4+ messages in thread
From: Zhang, Roy Fan @ 2021-11-23 13:09 UTC (permalink / raw)
To: De Lara Guarch, Pablo, Power, Ciara; +Cc: dev, stable, Akhil Goyal
> -----Original Message-----
> From: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>
> Sent: Monday, November 22, 2021 5:47 PM
> To: Zhang, Roy Fan <roy.fan.zhang@intel.com>; Power, Ciara
> <ciara.power@intel.com>
> Cc: dev@dpdk.org; De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>;
> stable@dpdk.org
> Subject: [PATCH] crypto/ipsec_mb: fix cipher key setting
>
> When authenticating with SNOW3G, KASUMI and ZUC,
> the pointers for encryption/decryption keys is not set.
> If a cipher algorithm such as AES-CBC is also used,
> the application would seg fault.
> Hence, these pointers should be set to some value by default.
>
> Command line to replicate the issue:
> ./build/app/dpdk-test-crypto-perf -l 4,5 -n 6 --vdev="crypto_aesni_mb" -- \
> --devtype="crypto_aesni_mb" --optype=cipher-then-auth --auth-algo
> snow3g-uia2 \
> --auth-key-sz 16 --auth-iv-sz 16 --digest-sz 4 --silent --total-ops 1000000 \
> --auth-op generate --burst-sz 32 --cipher-algo aes-ctr
> --cipher-key-sz 16 --cipher-iv-sz 16
>
> Fixes: ae8e085c608d ("crypto/aesni_mb: support KASUMI F8/F9")
> Fixes: 6c42e0cf4d12 ("crypto/aesni_mb: support SNOW3G-UEA2/UIA2")
> Fixes: fd8df85487c4 ("crypto/aesni_mb: support ZUC-EEA3/EIA3")
> Cc: stable@dpdk.org
>
> Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
> ---
> drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 15 ++++++++-------
> 1 file changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c
> b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c
> index e05bc04c3b..a308d42ffa 100644
> --- a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c
> +++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c
> @@ -1120,6 +1120,14 @@ set_mb_job_params(IMB_JOB *job, struct
> ipsec_mb_qp *qp,
>
> const int aead = is_aead_algo(job->hash_alg, job->cipher_mode);
>
> + if (job->cipher_mode == IMB_CIPHER_DES3) {
> + job->enc_keys = session->cipher.exp_3des_keys.ks_ptr;
> + job->dec_keys = session->cipher.exp_3des_keys.ks_ptr;
> + } else {
> + job->enc_keys = session-
> >cipher.expanded_aes_keys.encode;
> + job->dec_keys = session-
> >cipher.expanded_aes_keys.decode;
> + }
> +
> switch (job->hash_alg) {
> case IMB_AUTH_AES_XCBC:
> job->u.XCBC._k1_expanded = session-
> >auth.xcbc.k1_expanded;
> @@ -1189,13 +1197,6 @@ set_mb_job_params(IMB_JOB *job, struct
> ipsec_mb_qp *qp,
> job->u.HMAC._hashed_auth_key_xor_opad =
> session->auth.pads.outer;
>
> - if (job->cipher_mode == IMB_CIPHER_DES3) {
> - job->enc_keys = session-
> >cipher.exp_3des_keys.ks_ptr;
> - job->dec_keys = session-
> >cipher.exp_3des_keys.ks_ptr;
> - } else {
> - job->enc_keys = session-
> >cipher.expanded_aes_keys.encode;
> - job->dec_keys = session-
> >cipher.expanded_aes_keys.decode;
> - }
> }
>
> if (aead)
> --
> 2.25.1
Acked-by: Fan Zhang <roy.fan.zhang@intel.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-11-23 18:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-22 17:47 [PATCH] crypto/ipsec_mb: fix cipher key setting Pablo de Lara
2021-11-23 8:22 ` Power, Ciara
2021-11-23 13:09 ` Zhang, Roy Fan
2021-11-23 18:39 ` Akhil Goyal
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).