AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

libceph: introduce ceph_x_authorizer_cleanup()

Browse Source 
Commit ae385eaf24 ("libceph: store session key in cephx authorizer")
introduced ceph_x_authorizer::session_key, but didn't update all the
exit/error paths.  Introduce ceph_x_authorizer_cleanup() to encapsulate
ceph_x_authorizer cleanup and switch to it.  This fixes ceph_x_destroy(),
which currently always leaks key and ceph_x_build_authorizer() error
paths.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
This commit is contained in:
Ilya Dryomov 2015-10-26 11:03:46 +01:00
parent 5e804ac482
commit cbf99a11fb
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
net/ceph/auth_x.c
View File

@ -279,6 +279,15 @@ static int ceph_x_proc_ticket_reply(struct ceph_auth_client *ac,
return -EINVAL; return -EINVAL;
} }
static void ceph_x_authorizer_cleanup(struct ceph_x_authorizer *au)
{
ceph_crypto_key_destroy(&au->session_key);
if (au->buf) {
ceph_buffer_put(au->buf);
au->buf = NULL;
}
}
static int ceph_x_build_authorizer(struct ceph_auth_client *ac, static int ceph_x_build_authorizer(struct ceph_auth_client *ac,
struct ceph_x_ticket_handler *th, struct ceph_x_ticket_handler *th,
struct ceph_x_authorizer *au) struct ceph_x_authorizer *au)
@ -297,7 +306,7 @@ static int ceph_x_build_authorizer(struct ceph_auth_client *ac,
ceph_crypto_key_destroy(&au->session_key); ceph_crypto_key_destroy(&au->session_key);
ret = ceph_crypto_key_clone(&au->session_key, &th->session_key); ret = ceph_crypto_key_clone(&au->session_key, &th->session_key);
if (ret) if (ret)
return ret; goto out_au;
maxlen = sizeof(*msg_a) + sizeof(msg_b) + maxlen = sizeof(*msg_a) + sizeof(msg_b) +
ceph_x_encrypt_buflen(ticket_blob_len); ceph_x_encrypt_buflen(ticket_blob_len);
@ -309,8 +318,8 @@ static int ceph_x_build_authorizer(struct ceph_auth_client *ac,
if (!au->buf) { if (!au->buf) {
au->buf = ceph_buffer_new(maxlen, GFP_NOFS); au->buf = ceph_buffer_new(maxlen, GFP_NOFS);
if (!au->buf) { if (!au->buf) {
ceph_crypto_key_destroy(&au->session_key); ret = -ENOMEM;
return -ENOMEM; goto out_au;
} }
} }
au->service = th->service; au->service = th->service;
@ -340,7 +349,7 @@ static int ceph_x_build_authorizer(struct ceph_auth_client *ac,
ret = ceph_x_encrypt(&au->session_key, &msg_b, sizeof(msg_b), ret = ceph_x_encrypt(&au->session_key, &msg_b, sizeof(msg_b),
p, end - p); p, end - p);
if (ret < 0) if (ret < 0)
goto out_buf; goto out_au;
p += ret; p += ret;
au->buf->vec.iov_len = p - au->buf->vec.iov_base; au->buf->vec.iov_len = p - au->buf->vec.iov_base;
dout(" built authorizer nonce %llx len %d\n", au->nonce, dout(" built authorizer nonce %llx len %d\n", au->nonce,
@ -348,9 +357,8 @@ static int ceph_x_build_authorizer(struct ceph_auth_client *ac,
BUG_ON(au->buf->vec.iov_len > maxlen); BUG_ON(au->buf->vec.iov_len > maxlen);
return 0; return 0;
out_buf: out_au:
ceph_buffer_put(au->buf); ceph_x_authorizer_cleanup(au);
au->buf = NULL;
return ret; return ret;
} }
@ -624,8 +632,7 @@ static void ceph_x_destroy_authorizer(struct ceph_auth_client *ac,
{ {
struct ceph_x_authorizer *au = (void *)a; struct ceph_x_authorizer *au = (void *)a;
ceph_crypto_key_destroy(&au->session_key); ceph_x_authorizer_cleanup(au);
ceph_buffer_put(au->buf);
kfree(au); kfree(au);
} }
@ -653,8 +660,7 @@ static void ceph_x_destroy(struct ceph_auth_client *ac)
remove_ticket_handler(ac, th); remove_ticket_handler(ac, th);
} }
if (xi->auth_authorizer.buf) ceph_x_authorizer_cleanup(&xi->auth_authorizer);
ceph_buffer_put(xi->auth_authorizer.buf);
kfree(ac->private); kfree(ac->private);
ac->private = NULL; ac->private = NULL;

4
net/ceph/crypto.h
View File

@ -16,8 +16,10 @@ struct ceph_crypto_key {
static inline void ceph_crypto_key_destroy(struct ceph_crypto_key *key) static inline void ceph_crypto_key_destroy(struct ceph_crypto_key *key)
{ {
if (key) if (key) {
kfree(key->key); kfree(key->key);
key->key = NULL;
}
} }
int ceph_crypto_key_clone(struct ceph_crypto_key *dst, int ceph_crypto_key_clone(struct ceph_crypto_key *dst,