This patch fixes the out-of-bounds coverity issue by adding missed algorithms to the array. Coverity issue: 337683 Fixes: c68d7aa354f6 ("crypto/aesni_mb: use architecture independent macros") Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com> --- drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h index 4d439360f..c937b21b6 100644 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h @@ -65,7 +65,13 @@ static const unsigned auth_truncated_digest_byte_lengths[] = { [AES_XCBC] = 12, [AES_CMAC] = 12, [AES_CCM] = 8, - [NULL_HASH] = 0 + [NULL_HASH] = 0, + [AES_GMAC] = 12, + [PLAIN_SHA1] = 20, + [PLAIN_SHA_224] = 28, + [PLAIN_SHA_256] = 32, + [PLAIN_SHA_384] = 48, + [PLAIN_SHA_512] = 64 }; /** -- 2.14.5
This patch fixes the out-of-bounds coverity issue by adding missed algorithms to the array. Coverity issue: 337683 Fixes: c68d7aa354f6 ("crypto/aesni_mb: use architecture independent macros") Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com> --- drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h index 4d439360f..c937b21b6 100644 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h @@ -65,7 +65,13 @@ static const unsigned auth_truncated_digest_byte_lengths[] = { [AES_XCBC] = 12, [AES_CMAC] = 12, [AES_CCM] = 8, - [NULL_HASH] = 0 + [NULL_HASH] = 0, + [AES_GMAC] = 12, + [PLAIN_SHA1] = 20, + [PLAIN_SHA_224] = 28, + [PLAIN_SHA_256] = 32, + [PLAIN_SHA_384] = 48, + [PLAIN_SHA_512] = 64 }; /** -- 2.14.5
Hi Fan, > -----Original Message----- > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Fan Zhang > Sent: Wednesday, May 15, 2019 4:33 PM > To: dev@dpdk.org > Cc: akhil.goyal@nxp.com; Zhang, Roy Fan <roy.fan.zhang@intel.com> > Subject: [dpdk-dev] [PATCH] aesni_mb: fix out-of-bounds access > > This patch fixes the out-of-bounds coverity issue by adding missed > algorithms to the array. > > Coverity issue: 337683 > > Fixes: c68d7aa354f6 ("crypto/aesni_mb: use architecture independent > macros") > > Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com> > --- > drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h > b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h > index 4d439360f..c937b21b6 100644 > --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h > +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h > @@ -65,7 +65,13 @@ static const unsigned > auth_truncated_digest_byte_lengths[] = { > [AES_XCBC] = 12, > [AES_CMAC] = 12, > [AES_CCM] = 8, > - [NULL_HASH] = 0 > + [NULL_HASH] = 0, > + [AES_GMAC] = 12, According to the code in the IPSec MB lib, truncated value for GMAC is 16, although it can actually generate anything from 4 to 16 bytes, so I guess any value between this range could work. > + [PLAIN_SHA1] = 20, > + [PLAIN_SHA_224] = 28, > + [PLAIN_SHA_256] = 32, > + [PLAIN_SHA_384] = 48, > + [PLAIN_SHA_512] = 64 > }; > Could you also complete the other two arrays? auth_digest_byte_lengths (missing AES_CCM) and auth_blocksize. Thanks! Pablo > /** > -- > 2.14.5
This patch fixes the out-of-bounds coverity issue by adding missed algorithms to the array. Coverity issue: 337683 Fixes: c68d7aa354f6 ("crypto/aesni_mb: use architecture independent macros") Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com> --- drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h index 4d439360f..dda78d989 100644 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h @@ -41,6 +41,14 @@ static const unsigned auth_blocksize[] = { [SHA_512] = 128, [AES_XCBC] = 16, [AES_CCM] = 16, + [AES_CMAC] = 16, + [AES_GMAC] = 16, + [AES_GCM] = 16, + [PLAIN_SHA1] = 64, + [PLAIN_SHA_224] = 64, + [PLAIN_SHA_256] = 64, + [PLAIN_SHA_384] = 128, + [PLAIN_SHA_512] = 128 }; /** @@ -65,7 +73,13 @@ static const unsigned auth_truncated_digest_byte_lengths[] = { [AES_XCBC] = 12, [AES_CMAC] = 12, [AES_CCM] = 8, - [NULL_HASH] = 0 + [NULL_HASH] = 0, + [AES_GMAC] = 16, + [PLAIN_SHA1] = 20, + [PLAIN_SHA_224] = 28, + [PLAIN_SHA_256] = 32, + [PLAIN_SHA_384] = 48, + [PLAIN_SHA_512] = 64 }; /** @@ -90,6 +104,7 @@ static const unsigned auth_digest_byte_lengths[] = { [SHA_512] = 64, [AES_XCBC] = 16, [AES_CMAC] = 16, + [AES_CCM] = 16, [AES_GMAC] = 12, [NULL_HASH] = 0, [PLAIN_SHA1] = 20, -- 2.14.5
Hi Fan,
>
> This patch fixes the out-of-bounds coverity issue by adding
> missed algorithms to the array.
>
> Coverity issue: 337683
>
> Fixes: c68d7aa354f6 ("crypto/aesni_mb: use architecture independent macros")
>
> Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
> ---
> drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h | 17
> ++++++++++++++++-
> 1 file changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h
> b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h
> index 4d439360f..dda78d989 100644
> --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h
> +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h
> @@ -41,6 +41,14 @@ static const unsigned auth_blocksize[] = {
> [SHA_512] = 128,
> [AES_XCBC] = 16,
> [AES_CCM] = 16,
> + [AES_CMAC] = 16,
> + [AES_GMAC] = 16,
> + [AES_GCM] = 16,
> + [PLAIN_SHA1] = 64,
> + [PLAIN_SHA_224] = 64,
> + [PLAIN_SHA_256] = 64,
> + [PLAIN_SHA_384] = 128,
> + [PLAIN_SHA_512] = 128
> };
>
> /**
> @@ -65,7 +73,13 @@ static const unsigned
> auth_truncated_digest_byte_lengths[] = {
> [AES_XCBC] = 12,
> [AES_CMAC] = 12,
> [AES_CCM] = 8,
> - [NULL_HASH] = 0
> + [NULL_HASH] = 0,
> + [AES_GMAC] = 16,
> + [PLAIN_SHA1] = 20,
> + [PLAIN_SHA_224] = 28,
> + [PLAIN_SHA_256] = 32,
> + [PLAIN_SHA_384] = 48,
> + [PLAIN_SHA_512] = 64
> };
>
> /**
> @@ -90,6 +104,7 @@ static const unsigned auth_digest_byte_lengths[] = {
> [SHA_512] = 64,
> [AES_XCBC] = 16,
> [AES_CMAC] = 16,
> + [AES_CCM] = 16,
> [AES_GMAC] = 12,
> [NULL_HASH] = 0,
> [PLAIN_SHA1] = 20,
> --
> 2.14.5
Patchworks say that there is a compilation issue in this patch.
Could you please check.
Thanks,
Akhil
Hi Fan,
> -----Original Message-----
> From: Zhang, Roy Fan
> Sent: Monday, June 17, 2019 3:31 PM
> To: dev@dpdk.org
> Cc: akhil.goyal@nxp.com; De Lara Guarch, Pablo
> <pablo.de.lara.guarch@intel.com>; Zhang, Roy Fan
> <roy.fan.zhang@intel.com>
> Subject: [PATCH v2] aesni_mb: fix out-of-bounds access
>
> This patch fixes the out-of-bounds coverity issue by adding missed
> algorithms to the array.
>
> Coverity issue: 337683
>
> Fixes: c68d7aa354f6 ("crypto/aesni_mb: use architecture independent
> macros")
>
> Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
> ---
> drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h | 17
> ++++++++++++++++-
> 1 file changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h
> b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h
> index 4d439360f..dda78d989 100644
> --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h
> +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h
> @@ -41,6 +41,14 @@ static const unsigned auth_blocksize[] = {
> [SHA_512] = 128,
> [AES_XCBC] = 16,
> [AES_CCM] = 16,
> + [AES_CMAC] = 16,
> + [AES_GMAC] = 16,
> + [AES_GCM] = 16,
As Akhil has pointed out, there is a compilation error,
because there is no AES_GCM in JOB_HASH_ALG list.
I think instead what's missing is NULL_HASH, which block size should be 0.
Thanks,
Pablo
This patch fixes the out-of-bounds coverity issue by adding missed algorithms to the array. Coverity issue: 337683 Fixes: c68d7aa354f6 ("crypto/aesni_mb: use architecture independent macros") Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com> --- v3: - fixed a compile issue v2: - added missed size data. drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h index 4d439360f..b794d4bc1 100644 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h @@ -33,6 +33,7 @@ int aesni_mb_logtype_driver; /* Maximum length for digest */ #define DIGEST_LENGTH_MAX 64 static const unsigned auth_blocksize[] = { + [NULL_HASH] = 0, [MD5] = 64, [SHA1] = 64, [SHA_224] = 64, @@ -41,6 +42,13 @@ static const unsigned auth_blocksize[] = { [SHA_512] = 128, [AES_XCBC] = 16, [AES_CCM] = 16, + [AES_CMAC] = 16, + [AES_GMAC] = 16, + [PLAIN_SHA1] = 64, + [PLAIN_SHA_224] = 64, + [PLAIN_SHA_256] = 64, + [PLAIN_SHA_384] = 128, + [PLAIN_SHA_512] = 128 }; /** @@ -65,7 +73,13 @@ static const unsigned auth_truncated_digest_byte_lengths[] = { [AES_XCBC] = 12, [AES_CMAC] = 12, [AES_CCM] = 8, - [NULL_HASH] = 0 + [NULL_HASH] = 0, + [AES_GMAC] = 16, + [PLAIN_SHA1] = 20, + [PLAIN_SHA_224] = 28, + [PLAIN_SHA_256] = 32, + [PLAIN_SHA_384] = 48, + [PLAIN_SHA_512] = 64 }; /** @@ -90,6 +104,7 @@ static const unsigned auth_digest_byte_lengths[] = { [SHA_512] = 64, [AES_XCBC] = 16, [AES_CMAC] = 16, + [AES_CCM] = 16, [AES_GMAC] = 12, [NULL_HASH] = 0, [PLAIN_SHA1] = 20, -- 2.14.5
>
> This patch fixes the out-of-bounds coverity issue by adding
> missed algorithms to the array.
>
> Coverity issue: 337683
>
> Fixes: c68d7aa354f6 ("crypto/aesni_mb: use architecture independent macros")
>
> Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
> ---
> v3:
> - fixed a compile issue
>
> v2:
> - added missed size data.
>
> drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h | 17
> ++++++++++++++++-
> 1 file changed, 16 insertions(+), 1 deletion(-)
>
@Pablo: I hope there are no more concerns on this patch.
Applied to dpdk-next-crypto
Thanks.