[uml-devel] [PATCH 2/2] um: vector: Fix an error handling path in 'vector_parse()'

[uml-devel] [PATCH 2/2] um: vector: Fix an error handling path in 'vector_parse()'

[Christophe JAILLET]

If 'find_device()' finds something, we set '*error_out' and we should
return an error. However, 'err' is known to be 0 at this point.

Explicitly return -EINVAL instead.

While at it, remove the initialization of 'err' at the beginning of the
function and also explicitly return an error code if the first check
fails.

Fixes: ad1f62ab2bd4 ("High Performance UML Vector Network Driver")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
Not sure if correct, but it looks spurious to set 'error_out' and return
0 (i.e. success)
---
 arch/um/drivers/vector_kern.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c
index 3c1e6ad91016..6fab02a126e6 100644
--- a/arch/um/drivers/vector_kern.c
+++ b/arch/um/drivers/vector_kern.c
@@ -677,7 +677,7 @@ static struct vector_device *find_device(int n)
 static int vector_parse(char *str, int *index_out, char **str_out,
 			char **error_out)
 {
-	int n, len, err = -EINVAL;
+	int n, len, err;
 	char *start = str;
 
 	len = strlen(str);
@@ -686,7 +686,7 @@ static int vector_parse(char *str, int *index_out, char **str_out,
 		str++;
 	if (*str != ':') {
 		*error_out = "Expected ':' after device number";
-		return err;
+		return -EINVAL;
 	}
 	*str = '\0';
 
@@ -699,7 +699,7 @@ static int vector_parse(char *str, int *index_out, char **str_out,
 	str++;
 	if (find_device(n)) {
 		*error_out = "Device already configured";
-		return err;
+		return -EINVAL;
 	}
 
 	*index_out = n;
-- 
2.14.1


---
L'absence de virus dans ce courrier électronique a été vérifiée par le logiciel antivirus Avast.
https://www.avast.com/antivirus


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

Re: [uml-devel] [PATCH 2/2] um: vector: Fix an error handling path in 'vector_parse()'

[Anton Ivanov]

Thanks, looks correct, +1

Richard, can you add it to the next pull.

Thanks in advance,

A.



On 27/01/18 10:55, Christophe JAILLET wrote:
> If 'find_device()' finds something, we set '*error_out' and we should
> return an error. However, 'err' is known to be 0 at this point.
>
> Explicitly return -EINVAL instead.
>
> While at it, remove the initialization of 'err' at the beginning of the
> function and also explicitly return an error code if the first check
> fails.
>
> Fixes: ad1f62ab2bd4 ("High Performance UML Vector Network Driver")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> Not sure if correct, but it looks spurious to set 'error_out' and return
> 0 (i.e. success)
> ---
>  arch/um/drivers/vector_kern.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c
> index 3c1e6ad91016..6fab02a126e6 100644
> --- a/arch/um/drivers/vector_kern.c
> +++ b/arch/um/drivers/vector_kern.c
> @@ -677,7 +677,7 @@ static struct vector_device *find_device(int n)
>  static int vector_parse(char *str, int *index_out, char **str_out,
>  			char **error_out)
>  {
> -	int n, len, err = -EINVAL;
> +	int n, len, err;
>  	char *start = str;
>  
>  	len = strlen(str);
> @@ -686,7 +686,7 @@ static int vector_parse(char *str, int *index_out, char **str_out,
>  		str++;
>  	if (*str != ':') {
>  		*error_out = "Expected ':' after device number";
> -		return err;
> +		return -EINVAL;
>  	}
>  	*str = '\0';
>  
> @@ -699,7 +699,7 @@ static int vector_parse(char *str, int *index_out, char **str_out,
>  	str++;
>  	if (find_device(n)) {
>  		*error_out = "Device already configured";
> -		return err;
> +		return -EINVAL;
>  	}
>  
>  	*index_out = n;



------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

Re: [uml-devel] [PATCH 2/2] um: vector: Fix an error handling path in 'vector_parse()'

[Richard Weinberger]

Anton,

Am Samstag, 27. Januar 2018, 12:42:17 CET schrieb Anton Ivanov:
> Thanks, looks correct, +1
> 
> Richard, can you add it to the next pull.
> 
> Thanks in advance,

Is that a Reviewed-by? :)
(Same for the other patch)

Thanks,
//richard

P.s: Something is odd with your mail setup, none of your mails made it to the 
mailinglist.

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel