diff options
Diffstat (limited to 'net/sunrpc')
| -rw-r--r-- | net/sunrpc/auth_gss/auth_gss.c | 1 | ||||
| -rw-r--r-- | net/sunrpc/auth_gss/gss_krb5_crypto.c | 11 | ||||
| -rw-r--r-- | net/sunrpc/stats.c | 3 |
3 files changed, 5 insertions, 10 deletions
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c index 900ef31f5a..519ebc17c0 100644 --- a/net/sunrpc/auth_gss/auth_gss.c +++ b/net/sunrpc/auth_gss/auth_gss.c | |||
| @@ -794,7 +794,6 @@ gss_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags) | |||
| 794 | 794 | ||
| 795 | out_err: | 795 | out_err: |
| 796 | dprintk("RPC: gss_create_cred failed with error %d\n", err); | 796 | dprintk("RPC: gss_create_cred failed with error %d\n", err); |
| 797 | if (cred) gss_destroy_cred(&cred->gc_base); | ||
| 798 | return ERR_PTR(err); | 797 | return ERR_PTR(err); |
| 799 | } | 798 | } |
| 800 | 799 | ||
diff --git a/net/sunrpc/auth_gss/gss_krb5_crypto.c b/net/sunrpc/auth_gss/gss_krb5_crypto.c index 97c981fa6b..76b969e690 100644 --- a/net/sunrpc/auth_gss/gss_krb5_crypto.c +++ b/net/sunrpc/auth_gss/gss_krb5_crypto.c | |||
| @@ -212,7 +212,6 @@ make_checksum(s32 cksumtype, char *header, int hdrlen, struct xdr_buf *body, | |||
| 212 | char *cksumname; | 212 | char *cksumname; |
| 213 | struct crypto_tfm *tfm = NULL; /* XXX add to ctx? */ | 213 | struct crypto_tfm *tfm = NULL; /* XXX add to ctx? */ |
| 214 | struct scatterlist sg[1]; | 214 | struct scatterlist sg[1]; |
| 215 | u32 code = GSS_S_FAILURE; | ||
| 216 | 215 | ||
| 217 | switch (cksumtype) { | 216 | switch (cksumtype) { |
| 218 | case CKSUMTYPE_RSA_MD5: | 217 | case CKSUMTYPE_RSA_MD5: |
| @@ -221,13 +220,11 @@ make_checksum(s32 cksumtype, char *header, int hdrlen, struct xdr_buf *body, | |||
| 221 | default: | 220 | default: |
| 222 | dprintk("RPC: krb5_make_checksum:" | 221 | dprintk("RPC: krb5_make_checksum:" |
| 223 | " unsupported checksum %d", cksumtype); | 222 | " unsupported checksum %d", cksumtype); |
| 224 | goto out; | 223 | return GSS_S_FAILURE; |
| 225 | } | 224 | } |
| 226 | if (!(tfm = crypto_alloc_tfm(cksumname, CRYPTO_TFM_REQ_MAY_SLEEP))) | 225 | if (!(tfm = crypto_alloc_tfm(cksumname, CRYPTO_TFM_REQ_MAY_SLEEP))) |
| 227 | goto out; | 226 | return GSS_S_FAILURE; |
| 228 | cksum->len = crypto_tfm_alg_digestsize(tfm); | 227 | cksum->len = crypto_tfm_alg_digestsize(tfm); |
| 229 | if ((cksum->data = kmalloc(cksum->len, GFP_KERNEL)) == NULL) | ||
| 230 | goto out; | ||
| 231 | 228 | ||
| 232 | crypto_digest_init(tfm); | 229 | crypto_digest_init(tfm); |
| 233 | sg_set_buf(sg, header, hdrlen); | 230 | sg_set_buf(sg, header, hdrlen); |
| @@ -235,10 +232,8 @@ make_checksum(s32 cksumtype, char *header, int hdrlen, struct xdr_buf *body, | |||
| 235 | process_xdr_buf(body, body_offset, body->len - body_offset, | 232 | process_xdr_buf(body, body_offset, body->len - body_offset, |
| 236 | checksummer, tfm); | 233 | checksummer, tfm); |
| 237 | crypto_digest_final(tfm, cksum->data); | 234 | crypto_digest_final(tfm, cksum->data); |
| 238 | code = 0; | ||
| 239 | out: | ||
| 240 | crypto_free_tfm(tfm); | 235 | crypto_free_tfm(tfm); |
| 241 | return code; | 236 | return 0; |
| 242 | } | 237 | } |
| 243 | 238 | ||
| 244 | EXPORT_SYMBOL(make_checksum); | 239 | EXPORT_SYMBOL(make_checksum); |
diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c index dea529666d..15c2db2676 100644 --- a/net/sunrpc/stats.c +++ b/net/sunrpc/stats.c | |||
| @@ -176,7 +176,8 @@ void rpc_count_iostats(struct rpc_task *task) | |||
| 176 | op_metrics->om_execute += execute; | 176 | op_metrics->om_execute += execute; |
| 177 | } | 177 | } |
| 178 | 178 | ||
| 179 | void _print_name(struct seq_file *seq, unsigned int op, struct rpc_procinfo *procs) | 179 | static void _print_name(struct seq_file *seq, unsigned int op, |
| 180 | struct rpc_procinfo *procs) | ||
| 180 | { | 181 | { |
| 181 | if (procs[op].p_name) | 182 | if (procs[op].p_name) |
| 182 | seq_printf(seq, "\t%12s: ", procs[op].p_name); | 183 | seq_printf(seq, "\t%12s: ", procs[op].p_name); |