On Fri, Jul 12, 2024 at 03:24:23PM +0800, Gaosheng Cui wrote:
> Refactor the code in krb5_DK to return PTR_ERR when an error occurs.
My understanding of the current code is that if either
crypto_alloc_sync_skcipher() or crypto_sync_skcipher_blocksize()
fails, then krb5_DK() returns -EINVAL. At the only call site for
krb5_DK(), that return code is unconditionally discarded. Thus I
don't see that the proposed change is necessary or improves
anything.
> Signed-off-by: Gaosheng Cui <cuigaosheng1@xxxxxxxxxx>
> ---
> v2: Update IS_ERR to PTR_ERR, thanks very much!
> net/sunrpc/auth_gss/gss_krb5_keys.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/net/sunrpc/auth_gss/gss_krb5_keys.c b/net/sunrpc/auth_gss/gss_krb5_keys.c
> index 4eb19c3a54c7..5ac8d06ab2c0 100644
> --- a/net/sunrpc/auth_gss/gss_krb5_keys.c
> +++ b/net/sunrpc/auth_gss/gss_krb5_keys.c
> @@ -164,10 +164,14 @@ static int krb5_DK(const struct gss_krb5_enctype *gk5e,
> goto err_return;
>
> cipher = crypto_alloc_sync_skcipher(gk5e->encrypt_name, 0, 0);
> - if (IS_ERR(cipher))
> + if (IS_ERR(cipher)) {
> + ret = PTR_ERR(cipher);
> goto err_return;
> + }
> +
> blocksize = crypto_sync_skcipher_blocksize(cipher);
> - if (crypto_sync_skcipher_setkey(cipher, inkey->data, inkey->len))
> + ret = crypto_sync_skcipher_setkey(cipher, inkey->data, inkey->len);
> + if (ret)
> goto err_free_cipher;
>
> ret = -ENOMEM;
> --
> 2.25.1
>
--
Chuck Lever
