* [PATCH] crypto: arm64/aes-neonbs - remove redundant code in __xts_crypt()
@ 2019-10-22 6:42 Yunfeng Ye
2019-10-22 6:52 ` Ard Biesheuvel
0 siblings, 1 reply; 3+ messages in thread
From: Yunfeng Ye @ 2019-10-22 6:42 UTC (permalink / raw)
To: Herbert Xu, davem, catalin.marinas, will
Cc: linux-crypto, linux-arm-kernel, linux-kernel, hushiyuan, linfeilong
A warning is found by the static code analysis tool:
"Identical condition 'err', second condition is always false"
Fix this by removing the redundant condition @err.
Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
---
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..7b342db428b0 100644
--- a/arch/arm64/crypto/aes-neonbs-glue.c
+++ b/arch/arm64/crypto/aes-neonbs-glue.c
@@ -387,7 +387,7 @@ static int __xts_crypt(struct skcipher_request *req, bool encrypt,
skcipher_walk_done(&walk, nbytes);
}
- if (err || likely(!tail))
+ if (likely(!tail))
return err;
/* handle ciphertext stealing */
--
2.7.4.3
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] crypto: arm64/aes-neonbs - remove redundant code in __xts_crypt()
2019-10-22 6:42 [PATCH] crypto: arm64/aes-neonbs - remove redundant code in __xts_crypt() Yunfeng Ye
@ 2019-10-22 6:52 ` Ard Biesheuvel
2019-10-22 7:14 ` Yunfeng Ye
0 siblings, 1 reply; 3+ messages in thread
From: Ard Biesheuvel @ 2019-10-22 6:52 UTC (permalink / raw)
To: Yunfeng Ye
Cc: Herbert Xu, David S. Miller, Catalin Marinas, Will Deacon,
hushiyuan, linfeilong,
open list:HARDWARE RANDOM NUMBER GENERATOR CORE,
linux-arm-kernel, Linux Kernel Mailing List
On Tue, 22 Oct 2019 at 08:42, Yunfeng Ye <yeyunfeng@huawei.com> wrote:
>
> A warning is found by the static code analysis tool:
> "Identical condition 'err', second condition is always false"
>
> Fix this by removing the redundant condition @err.
>
> Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
Please don't blindly 'fix' crypto code without reading it carefully
and without cc'ing the author.
The correct fix is to add the missing assignment of 'err', like so
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))
Does that make the warning go away?
> ---
> 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..7b342db428b0 100644
> --- a/arch/arm64/crypto/aes-neonbs-glue.c
> +++ b/arch/arm64/crypto/aes-neonbs-glue.c
> @@ -387,7 +387,7 @@ static int __xts_crypt(struct skcipher_request *req, bool encrypt,
> skcipher_walk_done(&walk, nbytes);
> }
>
> - if (err || likely(!tail))
> + if (likely(!tail))
> return err;
>
> /* handle ciphertext stealing */
> --
> 2.7.4.3
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] crypto: arm64/aes-neonbs - remove redundant code in __xts_crypt()
2019-10-22 6:52 ` Ard Biesheuvel
@ 2019-10-22 7:14 ` Yunfeng Ye
0 siblings, 0 replies; 3+ messages in thread
From: Yunfeng Ye @ 2019-10-22 7:14 UTC (permalink / raw)
To: Ard Biesheuvel
Cc: Herbert Xu, David S. Miller, Catalin Marinas, Will Deacon,
hushiyuan, linfeilong,
open list:HARDWARE RANDOM NUMBER GENERATOR CORE,
linux-arm-kernel, Linux Kernel Mailing List
On 2019/10/22 14:52, Ard Biesheuvel wrote:
> On Tue, 22 Oct 2019 at 08:42, Yunfeng Ye <yeyunfeng@huawei.com> wrote:
>>
>> A warning is found by the static code analysis tool:
>> "Identical condition 'err', second condition is always false"
>>
>> Fix this by removing the redundant condition @err.
>>
>> Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
>
> Please don't blindly 'fix' crypto code without reading it carefully
> and without cc'ing the author.
>
ok, thanks.
> The correct fix is to add the missing assignment of 'err', like so
>
> 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))
>
> Does that make the warning go away?
>
yes, warning has go way.
>
>> ---
>> 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..7b342db428b0 100644
>> --- a/arch/arm64/crypto/aes-neonbs-glue.c
>> +++ b/arch/arm64/crypto/aes-neonbs-glue.c
>> @@ -387,7 +387,7 @@ static int __xts_crypt(struct skcipher_request *req, bool encrypt,
>> skcipher_walk_done(&walk, nbytes);
>> }
>>
>> - if (err || likely(!tail))
>> + if (likely(!tail))
>> return err;
>>
>> /* handle ciphertext stealing */
>> --
>> 2.7.4.3
>>
>>
>> _______________________________________________
>> linux-arm-kernel mailing list
>> linux-arm-kernel@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
> .
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-22 7:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-22 6:42 [PATCH] crypto: arm64/aes-neonbs - remove redundant code in __xts_crypt() Yunfeng Ye
2019-10-22 6:52 ` Ard Biesheuvel
2019-10-22 7:14 ` Yunfeng Ye
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®