crypto: arm64/aes-neonbs - add return value of skcipher_walk_done() in __xts_crypt()

yeyunfeng-dev · herbertx · commit 9b537997b669 · 2019-11-01T13:33:42.000+08:00
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: 67cfa5d ("crypto: arm64/aes-neonbs - implement ciphertext stealing for XTS") Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com> Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
diff --git 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))

Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,7 @@ static int __xts_crypt(struct skcipher_request *req, bool encrypt,`
`384`	`384`	`goto xts_tail;`
`385`	`385`
`386`	`386`	`kernel_neon_end();`
`387`		`- skcipher_walk_done(&walk, nbytes);`
	`387`	`+ err = skcipher_walk_done(&walk, nbytes);`
`388`	`388`	`}`
`389`	`389`
`390`	`390`	`if (err \|\| likely(!tail))`