2015-07-29 23:43:06

by Dan Streetman

Subject: [PATCH] crypto: nx - don't err if compressed output > input

Return success instead of error if compression succeeds but the output is
larger than the input.

It's unlikely that the caller will use the compressed data since it's
larger than the original uncompressed data, but there was no error and
returning an error code is incorrect. Further, for testing small input
buffers, the output is likely to be larger than the input and success
needs to be returned to verify the test.

Signed-off-by: Dan Streetman <[email protected]>
---
drivers/crypto/nx/nx-842-pseries.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/nx/nx-842-pseries.c b/drivers/crypto/nx/nx-842-pseries.c
index b6a26907..f4cbde0 100644
--- a/drivers/crypto/nx/nx-842-pseries.c
+++ b/drivers/crypto/nx/nx-842-pseries.c
@@ -226,9 +226,12 @@ static int nx842_validate_result(struct device *dev,
switch (csb->completion_code) {
case 0: /* Completed without error */
break;
- case 64: /* Target bytes > Source bytes during compression */
+ case 64: /* Compression ok, but output larger than input */
+ dev_dbg(dev, "%s: output size larger than input size\n",
+ __func__);
+ break;
case 13: /* Output buffer too small */
- dev_dbg(dev, "%s: Compression output larger than input\n",
+ dev_dbg(dev, "%s: Out of space in output buffer\n",
__func__);
return -ENOSPC;
case 66: /* Input data contains an illegal template field */
--
2.1.0

2015-07-30 13:52:10

by Herbert Xu

Subject: Re: [PATCH] crypto: nx - don't err if compressed output > input

On Wed, Jul 29, 2015 at 07:42:09PM -0400, Dan Streetman wrote:
> Return success instead of error if compression succeeds but the output is
> larger than the input.
>
> It's unlikely that the caller will use the compressed data since it's
> larger than the original uncompressed data, but there was no error and
> returning an error code is incorrect. Further, for testing small input
> buffers, the output is likely to be larger than the input and success
> needs to be returned to verify the test.
>
> Signed-off-by: Dan Streetman <[email protected]>

Applied.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt