[dpdk-dev] [PATCH] app/crypto-perf: fix dereference null return value

[dpdk-dev] [PATCH] app/crypto-perf: fix dereference null return value

[Slawomir Mrozowicz]

Dereferencing a pointer that might be null key_token when calling strstr.
Check if the pointer is null before.

Coverity issue: 141071
Fixes: f8be1786b1b8 ("app/crypto-perf: introduce performance test application")

Signed-off-by: Slawomir Mrozowicz <slawomirx.mrozowicz@intel.com>
---
 app/test-crypto-perf/cperf_test_vector_parsing.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/test-crypto-perf/cperf_test_vector_parsing.c b/app/test-crypto-perf/cperf_test_vector_parsing.c
index e0bcb20..a7d7b51 100644
--- a/app/test-crypto-perf/cperf_test_vector_parsing.c
+++ b/app/test-crypto-perf/cperf_test_vector_parsing.c
@@ -240,7 +240,7 @@ parse_entry(char *entry, struct cperf_test_vector *vector,
 
 	/* get values for key */
 	token = strtok(NULL, CPERF_ENTRY_DELIMITER);
-	if (token == NULL) {
+	if (key_token == NULL || token == NULL) {
 		printf("Expected 'key = values' but was '%.40s'..\n",
 			key_token);
 		return -1;
-- 
2.5.0

Re: [dpdk-dev] [PATCH] app/crypto-perf: fix dereference null return value

[De Lara Guarch, Pablo]

Hi Slawomir,

> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Slawomir
> Mrozowicz
> Sent: Monday, February 06, 2017 2:55 PM
> To: Doherty, Declan
> Cc: dev@dpdk.org; Mrozowicz, SlawomirX
> Subject: [dpdk-dev] [PATCH] app/crypto-perf: fix dereference null return
> value
> 
> Dereferencing a pointer that might be null key_token when calling strstr.
> Check if the pointer is null before.
> 
> Coverity issue: 141071
> Fixes: f8be1786b1b8 ("app/crypto-perf: introduce performance test
> application")
> 
> Signed-off-by: Slawomir Mrozowicz <slawomirx.mrozowicz@intel.com>
> ---
>  app/test-crypto-perf/cperf_test_vector_parsing.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/app/test-crypto-perf/cperf_test_vector_parsing.c b/app/test-
> crypto-perf/cperf_test_vector_parsing.c
> index e0bcb20..a7d7b51 100644
> --- a/app/test-crypto-perf/cperf_test_vector_parsing.c
> +++ b/app/test-crypto-perf/cperf_test_vector_parsing.c
> @@ -240,7 +240,7 @@ parse_entry(char *entry, struct cperf_test_vector
> *vector,
> 
>  	/* get values for key */
>  	token = strtok(NULL, CPERF_ENTRY_DELIMITER);
> -	if (token == NULL) {
> +	if (key_token == NULL || token == NULL) {

Is this fix right? If key_token is NULL, then I would expect a seg fault here.

>  		printf("Expected 'key = values' but was '%.40s'..\n",
>  			key_token);
>  		return -1;
> --
> 2.5.0

Thanks,
Pablo

Re: [dpdk-dev] [PATCH v2] app/crypto-perf: fix dereference null return value

[De Lara Guarch, Pablo]

> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Slawomir
> Mrozowicz
> Sent: Friday, February 10, 2017 2:23 PM
> To: Doherty, Declan
> Cc: dev@dpdk.org; Mrozowicz, SlawomirX
> Subject: [dpdk-dev] [PATCH v2] app/crypto-perf: fix dereference null return
> value
> 
> Dereferencing a pointer that might be null key_token when calling strstr.
> Check if the pointer is null before.
> 
> Coverity issue: 141071
> Fixes: f8be1786b1b8 ("app/crypto-perf: introduce performance test
> application")
> 
> Signed-off-by: Slawomir Mrozowicz <slawomirx.mrozowicz@intel.com>

Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>

Re: [dpdk-dev] [PATCH v2] app/crypto-perf: fix dereference null return value

[De Lara Guarch, Pablo]

> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of De Lara Guarch,
> Pablo
> Sent: Friday, February 10, 2017 1:25 PM
> To: Mrozowicz, SlawomirX; Doherty, Declan
> Cc: dev@dpdk.org; Mrozowicz, SlawomirX
> Subject: Re: [dpdk-dev] [PATCH v2] app/crypto-perf: fix dereference null
> return value
> 
> 
> 
> > -----Original Message-----
> > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Slawomir
> > Mrozowicz
> > Sent: Friday, February 10, 2017 2:23 PM
> > To: Doherty, Declan
> > Cc: dev@dpdk.org; Mrozowicz, SlawomirX
> > Subject: [dpdk-dev] [PATCH v2] app/crypto-perf: fix dereference null
> return
> > value
> >
> > Dereferencing a pointer that might be null key_token when calling strstr.
> > Check if the pointer is null before.
> >
> > Coverity issue: 141071
> > Fixes: f8be1786b1b8 ("app/crypto-perf: introduce performance test
> > application")
> >
> > Signed-off-by: Slawomir Mrozowicz <slawomirx.mrozowicz@intel.com>
> 
> Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>

Applied to dpdk-next-crypto.
Thanks,

Pablo

[dpdk-dev] [PATCH v2] app/crypto-perf: fix dereference null return value

[Slawomir Mrozowicz]

Dereferencing a pointer that might be null key_token when calling strstr.
Check if the pointer is null before.

Coverity issue: 141071
Fixes: f8be1786b1b8 ("app/crypto-perf: introduce performance test application")

Signed-off-by: Slawomir Mrozowicz <slawomirx.mrozowicz@intel.com>
---
v2 changes:
- print message only if key_token exist
---
 app/test-crypto-perf/cperf_test_vector_parsing.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/test-crypto-perf/cperf_test_vector_parsing.c b/app/test-crypto-perf/cperf_test_vector_parsing.c
index e0bcb20..e442489 100644
--- a/app/test-crypto-perf/cperf_test_vector_parsing.c
+++ b/app/test-crypto-perf/cperf_test_vector_parsing.c
@@ -234,15 +234,19 @@ parse_entry(char *entry, struct cperf_test_vector *vector,
 	uint8_t *data = NULL;
 	char *token, *key_token;
 
+	if (entry == NULL) {
+		printf("Expected entry value\n");
+		return -1;
+	}
+
 	/* get key */
 	token = strtok(entry, CPERF_ENTRY_DELIMITER);
 	key_token = token;
-
 	/* get values for key */
 	token = strtok(NULL, CPERF_ENTRY_DELIMITER);
-	if (token == NULL) {
-		printf("Expected 'key = values' but was '%.40s'..\n",
-			key_token);
+
+	if (key_token == NULL || token == NULL) {
+		printf("Expected 'key = values' but was '%.40s'..\n", entry);
 		return -1;
 	}
 
-- 
2.5.0