| Message ID | 20240712060312.1905013-1-cuigaosheng1@huawei.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [-next] gss_krb5: refactor code to return correct PTR_ERR in krb5_DK | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Guessing tree name failed - patch did not apply |
On 2024-07-12 at 11:33:12, Gaosheng Cui (cuigaosheng1@huawei.com) wrote: > Refactor the code in krb5_DK to return PTR_ERR when an error occurs. > > Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com> > --- > 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..b809e646329f 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 = IS_ERR(cipher); need to use PTR_ERR? Thanks, Hariprasad k
yeah, thanks very much. On 2024/7/12 15:09, Hariprasad Kelam wrote: > On 2024-07-12 at 11:33:12, Gaosheng Cui (cuigaosheng1@huawei.com) wrote: >> Refactor the code in krb5_DK to return PTR_ERR when an error occurs. >> >> Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com> >> --- >> 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..b809e646329f 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 = IS_ERR(cipher); > need to use PTR_ERR? > > Thanks, > Hariprasad k > > > .
diff --git a/net/sunrpc/auth_gss/gss_krb5_keys.c b/net/sunrpc/auth_gss/gss_krb5_keys.c index 4eb19c3a54c7..b809e646329f 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 = IS_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;
Refactor the code in krb5_DK to return PTR_ERR when an error occurs. Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com> --- net/sunrpc/auth_gss/gss_krb5_keys.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)