2019-10-22 07:29:37

by Yunfeng Ye

Subject: [PATCH v2] crypto: arm64/aes-neonbs - add return value of skcipher_walk_done() in __xts_crypt()

A warning is found by the static code analysis tool:
"Identical condition 'err', second condition is always false"

Fix this by adding return value of skcipher_walk_done().

Fixes: 67cfa5d3b721 ("crypto: arm64/aes-neonbs - implement ciphertext stealing for XTS")
Signed-off-by: Yunfeng Ye <[email protected]>
---
v1 -> v2:
- update the subject and comment
- add return value of skcipher_walk_done()

arch/arm64/crypto/aes-neonbs-glue.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/crypto/aes-neonbs-glue.c b/arch/arm64/crypto/aes-neonbs-glue.c
index ea873b8904c4..e3e27349a9fe 100644
--- a/arch/arm64/crypto/aes-neonbs-glue.c
+++ b/arch/arm64/crypto/aes-neonbs-glue.c
@@ -384,7 +384,7 @@ static int __xts_crypt(struct skcipher_request *req, bool encrypt,
goto xts_tail;

kernel_neon_end();
- skcipher_walk_done(&walk, nbytes);
+ err = skcipher_walk_done(&walk, nbytes);
}

if (err || likely(!tail))
--
2.7.4.3

2019-10-22 07:46:45

by Ard Biesheuvel

Subject: Re: [PATCH v2] crypto: arm64/aes-neonbs - add return value of skcipher_walk_done() in __xts_crypt()

On Tue, 22 Oct 2019 at 09:28, Yunfeng Ye <[email protected]> wrote:
>
> A warning is found by the static code analysis tool:
> "Identical condition 'err', second condition is always false"
>
> Fix this by adding return value of skcipher_walk_done().
>
> Fixes: 67cfa5d3b721 ("crypto: arm64/aes-neonbs - implement ciphertext stealing for XTS")
> Signed-off-by: Yunfeng Ye <[email protected]>

Acked-by: Ard Biesheuvel <[email protected]>

> ---
> v1 -> v2:
> - update the subject and comment
> - add return value of skcipher_walk_done()
>
> arch/arm64/crypto/aes-neonbs-glue.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/crypto/aes-neonbs-glue.c b/arch/arm64/crypto/aes-neonbs-glue.c
> index ea873b8904c4..e3e27349a9fe 100644
> --- a/arch/arm64/crypto/aes-neonbs-glue.c
> +++ b/arch/arm64/crypto/aes-neonbs-glue.c
> @@ -384,7 +384,7 @@ static int __xts_crypt(struct skcipher_request *req, bool encrypt,
> goto xts_tail;
>
> kernel_neon_end();
> - skcipher_walk_done(&walk, nbytes);
> + err = skcipher_walk_done(&walk, nbytes);
> }
>
> if (err || likely(!tail))
> --
> 2.7.4.3
>