All of lore.kernel.org
 help / color / mirror / Atom feed
* [patch] crypto: remove a duplicate checks in __cbc_decrypt()
@ 2014-02-13 14:58 ` Dan Carpenter
  0 siblings, 0 replies; 8+ messages in thread
From: Dan Carpenter @ 2014-02-13 14:58 UTC (permalink / raw)
  To: Herbert Xu, Jussi Kivilinna, Johannes Goetzfried
  Cc: David S. Miller, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
	x86, linux-crypto, kernel-janitors

We checked "nbytes < bsize" before so it can't happen here.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
This doesn't change how the code works, but maybe their is a bug in the
original code.  Please review?

diff --git a/arch/x86/crypto/cast5_avx_glue.c b/arch/x86/crypto/cast5_avx_glue.c
index e6a3700489b9..e57e20ab5e0b 100644
--- a/arch/x86/crypto/cast5_avx_glue.c
+++ b/arch/x86/crypto/cast5_avx_glue.c
@@ -203,9 +203,6 @@ static unsigned int __cbc_decrypt(struct blkcipher_desc *desc,
 			src -= 1;
 			dst -= 1;
 		} while (nbytes >= bsize * CAST5_PARALLEL_BLOCKS);
-
-		if (nbytes < bsize)
-			goto done;
 	}
 
 	/* Handle leftovers */
diff --git a/arch/x86/crypto/blowfish_glue.c b/arch/x86/crypto/blowfish_glue.c
index 50ec333b70e6..8af519ed73d1 100644
--- a/arch/x86/crypto/blowfish_glue.c
+++ b/arch/x86/crypto/blowfish_glue.c
@@ -223,9 +223,6 @@ static unsigned int __cbc_decrypt(struct blkcipher_desc *desc,
 			src -= 1;
 			dst -= 1;
 		} while (nbytes >= bsize * 4);
-
-		if (nbytes < bsize)
-			goto done;
 	}
 
 	/* Handle leftovers */

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [patch] crypto: remove a duplicate checks in __cbc_decrypt()
@ 2014-02-13 14:58 ` Dan Carpenter
  0 siblings, 0 replies; 8+ messages in thread
From: Dan Carpenter @ 2014-02-13 14:58 UTC (permalink / raw)
  To: Herbert Xu, Jussi Kivilinna, Johannes Goetzfried
  Cc: David S. Miller, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
	x86, linux-crypto, kernel-janitors

We checked "nbytes < bsize" before so it can't happen here.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
This doesn't change how the code works, but maybe their is a bug in the
original code.  Please review?

diff --git a/arch/x86/crypto/cast5_avx_glue.c b/arch/x86/crypto/cast5_avx_glue.c
index e6a3700489b9..e57e20ab5e0b 100644
--- a/arch/x86/crypto/cast5_avx_glue.c
+++ b/arch/x86/crypto/cast5_avx_glue.c
@@ -203,9 +203,6 @@ static unsigned int __cbc_decrypt(struct blkcipher_desc *desc,
 			src -= 1;
 			dst -= 1;
 		} while (nbytes >= bsize * CAST5_PARALLEL_BLOCKS);
-
-		if (nbytes < bsize)
-			goto done;
 	}
 
 	/* Handle leftovers */
diff --git a/arch/x86/crypto/blowfish_glue.c b/arch/x86/crypto/blowfish_glue.c
index 50ec333b70e6..8af519ed73d1 100644
--- a/arch/x86/crypto/blowfish_glue.c
+++ b/arch/x86/crypto/blowfish_glue.c
@@ -223,9 +223,6 @@ static unsigned int __cbc_decrypt(struct blkcipher_desc *desc,
 			src -= 1;
 			dst -= 1;
 		} while (nbytes >= bsize * 4);
-
-		if (nbytes < bsize)
-			goto done;
 	}
 
 	/* Handle leftovers */

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* Re: [patch] crypto: remove a duplicate checks in __cbc_decrypt()
  2014-02-13 14:58 ` Dan Carpenter
@ 2014-02-14 17:43   ` Jussi Kivilinna
  -1 siblings, 0 replies; 8+ messages in thread
From: Jussi Kivilinna @ 2014-02-14 17:43 UTC (permalink / raw)
  To: Dan Carpenter, Herbert Xu, Jussi Kivilinna, Johannes Goetzfried
  Cc: David S. Miller, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
	x86, linux-crypto, kernel-janitors

On 13.02.2014 16:58, Dan Carpenter wrote:
> We checked "nbytes < bsize" before so it can't happen here.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Acked-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>

> ---
> This doesn't change how the code works, but maybe their is a bug in the
> original code.  Please review?
> 
> diff --git a/arch/x86/crypto/cast5_avx_glue.c b/arch/x86/crypto/cast5_avx_glue.c
> index e6a3700489b9..e57e20ab5e0b 100644
> --- a/arch/x86/crypto/cast5_avx_glue.c
> +++ b/arch/x86/crypto/cast5_avx_glue.c
> @@ -203,9 +203,6 @@ static unsigned int __cbc_decrypt(struct blkcipher_desc *desc,
>  			src -= 1;
>  			dst -= 1;
>  		} while (nbytes >= bsize * CAST5_PARALLEL_BLOCKS);
> -
> -		if (nbytes < bsize)
> -			goto done;
>  	}
>  
>  	/* Handle leftovers */
> diff --git a/arch/x86/crypto/blowfish_glue.c b/arch/x86/crypto/blowfish_glue.c
> index 50ec333b70e6..8af519ed73d1 100644
> --- a/arch/x86/crypto/blowfish_glue.c
> +++ b/arch/x86/crypto/blowfish_glue.c
> @@ -223,9 +223,6 @@ static unsigned int __cbc_decrypt(struct blkcipher_desc *desc,
>  			src -= 1;
>  			dst -= 1;
>  		} while (nbytes >= bsize * 4);
> -
> -		if (nbytes < bsize)
> -			goto done;
>  	}
>  
>  	/* Handle leftovers */
> --
> To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [patch] crypto: remove a duplicate checks in __cbc_decrypt()
@ 2014-02-14 17:43   ` Jussi Kivilinna
  0 siblings, 0 replies; 8+ messages in thread
From: Jussi Kivilinna @ 2014-02-14 17:43 UTC (permalink / raw)
  To: Dan Carpenter, Herbert Xu, Jussi Kivilinna, Johannes Goetzfried
  Cc: David S. Miller, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
	x86, linux-crypto, kernel-janitors

On 13.02.2014 16:58, Dan Carpenter wrote:
> We checked "nbytes < bsize" before so it can't happen here.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Acked-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>

> ---
> This doesn't change how the code works, but maybe their is a bug in the
> original code.  Please review?
> 
> diff --git a/arch/x86/crypto/cast5_avx_glue.c b/arch/x86/crypto/cast5_avx_glue.c
> index e6a3700489b9..e57e20ab5e0b 100644
> --- a/arch/x86/crypto/cast5_avx_glue.c
> +++ b/arch/x86/crypto/cast5_avx_glue.c
> @@ -203,9 +203,6 @@ static unsigned int __cbc_decrypt(struct blkcipher_desc *desc,
>  			src -= 1;
>  			dst -= 1;
>  		} while (nbytes >= bsize * CAST5_PARALLEL_BLOCKS);
> -
> -		if (nbytes < bsize)
> -			goto done;
>  	}
>  
>  	/* Handle leftovers */
> diff --git a/arch/x86/crypto/blowfish_glue.c b/arch/x86/crypto/blowfish_glue.c
> index 50ec333b70e6..8af519ed73d1 100644
> --- a/arch/x86/crypto/blowfish_glue.c
> +++ b/arch/x86/crypto/blowfish_glue.c
> @@ -223,9 +223,6 @@ static unsigned int __cbc_decrypt(struct blkcipher_desc *desc,
>  			src -= 1;
>  			dst -= 1;
>  		} while (nbytes >= bsize * 4);
> -
> -		if (nbytes < bsize)
> -			goto done;
>  	}
>  
>  	/* Handle leftovers */
> --
> To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 


^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [patch] crypto: remove a duplicate checks in __cbc_decrypt()
  2014-02-13 14:58 ` Dan Carpenter
@ 2014-02-14 17:55   ` Johannes Götzfried
  -1 siblings, 0 replies; 8+ messages in thread
From: Johannes Götzfried @ 2014-02-14 17:55 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: Herbert Xu, Jussi Kivilinna, David S. Miller, Thomas Gleixner,
	Ingo Molnar, H. Peter Anvin, x86, linux-crypto, kernel-janitors

On Thu, Feb 13, 2014 at 05:58:32PM +0300, Dan Carpenter wrote:
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Acked-by: Johannes Götzfried <johannes.goetzfried@cs.fau.de>

> ---
> This doesn't change how the code works, but maybe their is a bug in the
> original code.  Please review?

> diff --git a/arch/x86/crypto/cast5_avx_glue.c b/arch/x86/crypto/cast5_avx_glue.c
> index e6a3700489b9..e57e20ab5e0b 100644
> --- a/arch/x86/crypto/cast5_avx_glue.c
> +++ b/arch/x86/crypto/cast5_avx_glue.c
> @@ -203,9 +203,6 @@ static unsigned int __cbc_decrypt(struct blkcipher_desc *desc,
>  			src -= 1;
>  			dst -= 1;
>  		} while (nbytes >= bsize * CAST5_PARALLEL_BLOCKS);
> -
> -		if (nbytes < bsize)
> -			goto done;
>  	}

>  	/* Handle leftovers */
> diff --git a/arch/x86/crypto/blowfish_glue.c b/arch/x86/crypto/blowfish_glue.c
> index 50ec333b70e6..8af519ed73d1 100644
> --- a/arch/x86/crypto/blowfish_glue.c
> +++ b/arch/x86/crypto/blowfish_glue.c
> @@ -223,9 +223,6 @@ static unsigned int __cbc_decrypt(struct blkcipher_desc *desc,
>  			src -= 1;
>  			dst -= 1;
>  		} while (nbytes >= bsize * 4);
> -
> -		if (nbytes < bsize)
> -			goto done;
>  	}

>  	/* Handle leftovers */

--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [patch] crypto: remove a duplicate checks in __cbc_decrypt()
@ 2014-02-14 17:55   ` Johannes Götzfried
  0 siblings, 0 replies; 8+ messages in thread
From: Johannes Götzfried @ 2014-02-14 17:55 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: Herbert Xu, Jussi Kivilinna, David S. Miller, Thomas Gleixner,
	Ingo Molnar, H. Peter Anvin, x86, linux-crypto, kernel-janitors

On Thu, Feb 13, 2014 at 05:58:32PM +0300, Dan Carpenter wrote:
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Acked-by: Johannes Götzfried <johannes.goetzfried@cs.fau.de>

> ---
> This doesn't change how the code works, but maybe their is a bug in the
> original code.  Please review?

> diff --git a/arch/x86/crypto/cast5_avx_glue.c b/arch/x86/crypto/cast5_avx_glue.c
> index e6a3700489b9..e57e20ab5e0b 100644
> --- a/arch/x86/crypto/cast5_avx_glue.c
> +++ b/arch/x86/crypto/cast5_avx_glue.c
> @@ -203,9 +203,6 @@ static unsigned int __cbc_decrypt(struct blkcipher_desc *desc,
>  			src -= 1;
>  			dst -= 1;
>  		} while (nbytes >= bsize * CAST5_PARALLEL_BLOCKS);
> -
> -		if (nbytes < bsize)
> -			goto done;
>  	}

>  	/* Handle leftovers */
> diff --git a/arch/x86/crypto/blowfish_glue.c b/arch/x86/crypto/blowfish_glue.c
> index 50ec333b70e6..8af519ed73d1 100644
> --- a/arch/x86/crypto/blowfish_glue.c
> +++ b/arch/x86/crypto/blowfish_glue.c
> @@ -223,9 +223,6 @@ static unsigned int __cbc_decrypt(struct blkcipher_desc *desc,
>  			src -= 1;
>  			dst -= 1;
>  		} while (nbytes >= bsize * 4);
> -
> -		if (nbytes < bsize)
> -			goto done;
>  	}

>  	/* Handle leftovers */

--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [patch] crypto: remove a duplicate checks in __cbc_decrypt()
  2014-02-14 17:55   ` Johannes Götzfried
@ 2014-02-25 12:18     ` Herbert Xu
  -1 siblings, 0 replies; 8+ messages in thread
From: Herbert Xu @ 2014-02-25 12:18 UTC (permalink / raw)
  To: Johannes Götzfried
  Cc: Dan Carpenter, Jussi Kivilinna, David S. Miller, Thomas Gleixner,
	Ingo Molnar, H. Peter Anvin, x86, linux-crypto, kernel-janitors

On Fri, Feb 14, 2014 at 06:55:45PM +0100, Johannes Götzfried wrote:
> On Thu, Feb 13, 2014 at 05:58:32PM +0300, Dan Carpenter wrote:
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> Acked-by: Johannes Götzfried <johannes.goetzfried@cs.fau.de>

Patch applied.  Thanks!
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [patch] crypto: remove a duplicate checks in __cbc_decrypt()
@ 2014-02-25 12:18     ` Herbert Xu
  0 siblings, 0 replies; 8+ messages in thread
From: Herbert Xu @ 2014-02-25 12:18 UTC (permalink / raw)
  To: Johannes Götzfried
  Cc: Dan Carpenter, Jussi Kivilinna, David S. Miller, Thomas Gleixner,
	Ingo Molnar, H. Peter Anvin, x86, linux-crypto, kernel-janitors

On Fri, Feb 14, 2014 at 06:55:45PM +0100, Johannes Götzfried wrote:
> On Thu, Feb 13, 2014 at 05:58:32PM +0300, Dan Carpenter wrote:
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> Acked-by: Johannes Götzfried <johannes.goetzfried@cs.fau.de>

Patch applied.  Thanks!
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-02-25 12:18 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-13 14:58 [patch] crypto: remove a duplicate checks in __cbc_decrypt() Dan Carpenter
2014-02-13 14:58 ` Dan Carpenter
2014-02-14 17:43 ` Jussi Kivilinna
2014-02-14 17:43   ` Jussi Kivilinna
2014-02-14 17:55 ` Johannes Götzfried
2014-02-14 17:55   ` Johannes Götzfried
2014-02-25 12:18   ` Herbert Xu
2014-02-25 12:18     ` Herbert Xu

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.